- Revision
- 155823
- Author
- wei...@apple.com
- Date
- 2013-09-15 12:19:32 -0700 (Sun, 15 Sep 2013)
Log Message
CTTE: ContentData::createRenderer() should take references
https://bugs.webkit.org/show_bug.cgi?id=121399
Reviewed by Andreas Kling.
- Convert createRenderer(Document*, RenderStyle*) to createRenderer(Document&, RenderStyle&)
- Do a drive by final-ing of ContentData derived classes.
* dom/PseudoElement.cpp:
(WebCore::PseudoElement::didAttachRenderers):
* rendering/RenderImage.cpp:
(WebCore::RenderImage::createAnonymous):
* rendering/RenderImage.h:
* rendering/style/ContentData.cpp:
(WebCore::ImageContentData::createRenderer):
(WebCore::TextContentData::createRenderer):
(WebCore::CounterContentData::createRenderer):
(WebCore::QuoteContentData::createRenderer):
* rendering/style/ContentData.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (155822 => 155823)
--- trunk/Source/WebCore/ChangeLog 2013-09-15 19:10:19 UTC (rev 155822)
+++ trunk/Source/WebCore/ChangeLog 2013-09-15 19:19:32 UTC (rev 155823)
@@ -1,3 +1,25 @@
+2013-09-15 Sam Weinig <s...@webkit.org>
+
+ CTTE: ContentData::createRenderer() should take references
+ https://bugs.webkit.org/show_bug.cgi?id=121399
+
+ Reviewed by Andreas Kling.
+
+ - Convert createRenderer(Document*, RenderStyle*) to createRenderer(Document&, RenderStyle&)
+ - Do a drive by final-ing of ContentData derived classes.
+
+ * dom/PseudoElement.cpp:
+ (WebCore::PseudoElement::didAttachRenderers):
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::createAnonymous):
+ * rendering/RenderImage.h:
+ * rendering/style/ContentData.cpp:
+ (WebCore::ImageContentData::createRenderer):
+ (WebCore::TextContentData::createRenderer):
+ (WebCore::CounterContentData::createRenderer):
+ (WebCore::QuoteContentData::createRenderer):
+ * rendering/style/ContentData.h:
+
2013-09-15 Andreas Kling <akl...@apple.com>
CTTE: RenderFrameSet is never anonymous.
Modified: trunk/Source/WebCore/dom/PseudoElement.cpp (155822 => 155823)
--- trunk/Source/WebCore/dom/PseudoElement.cpp 2013-09-15 19:10:19 UTC (rev 155822)
+++ trunk/Source/WebCore/dom/PseudoElement.cpp 2013-09-15 19:19:32 UTC (rev 155823)
@@ -86,7 +86,7 @@
ASSERT(style->contentData());
for (const ContentData* content = style->contentData(); content; content = content->next()) {
- RenderObject* child = content->createRenderer(&document(), style);
+ RenderObject* child = content->createRenderer(document(), *style);
if (renderer->isChildAllowed(child, style)) {
renderer->addChild(child);
if (child->isQuote())
Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (155822 => 155823)
--- trunk/Source/WebCore/rendering/RenderImage.cpp 2013-09-15 19:10:19 UTC (rev 155822)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2013-09-15 19:19:32 UTC (rev 155823)
@@ -62,10 +62,10 @@
updateAltText();
}
-RenderImage* RenderImage::createAnonymous(Document* document)
+RenderImage* RenderImage::createAnonymous(Document& document)
{
- RenderImage* image = new (document->renderArena()) RenderImage(0);
- image->setDocumentForAnonymous(document);
+ RenderImage* image = new (document.renderArena()) RenderImage(0);
+ image->setDocumentForAnonymous(&document);
return image;
}
Modified: trunk/Source/WebCore/rendering/RenderImage.h (155822 => 155823)
--- trunk/Source/WebCore/rendering/RenderImage.h 2013-09-15 19:10:19 UTC (rev 155822)
+++ trunk/Source/WebCore/rendering/RenderImage.h 2013-09-15 19:19:32 UTC (rev 155823)
@@ -38,7 +38,7 @@
RenderImage(Element*);
virtual ~RenderImage();
- static RenderImage* createAnonymous(Document*);
+ static RenderImage* createAnonymous(Document&);
void setImageResource(PassOwnPtr<RenderImageResource>);
Modified: trunk/Source/WebCore/rendering/style/ContentData.cpp (155822 => 155823)
--- trunk/Source/WebCore/rendering/style/ContentData.cpp 2013-09-15 19:10:19 UTC (rev 155822)
+++ trunk/Source/WebCore/rendering/style/ContentData.cpp 2013-09-15 19:19:32 UTC (rev 155823)
@@ -67,10 +67,10 @@
return result.release();
}
-RenderObject* ImageContentData::createRenderer(Document* doc, RenderStyle* pseudoStyle) const
+RenderObject* ImageContentData::createRenderer(Document& document, RenderStyle& pseudoStyle) const
{
- RenderImage* image = RenderImage::createAnonymous(doc);
- image->setPseudoStyle(pseudoStyle);
+ RenderImage* image = RenderImage::createAnonymous(document);
+ image->setPseudoStyle(&pseudoStyle);
if (m_image)
image->setImageResource(RenderImageResourceStyleImage::create(m_image.get()));
else
@@ -78,24 +78,24 @@
return image;
}
-RenderObject* TextContentData::createRenderer(Document* doc, RenderStyle* pseudoStyle) const
+RenderObject* TextContentData::createRenderer(Document& document, RenderStyle& pseudoStyle) const
{
- RenderObject* renderer = new (doc->renderArena()) RenderTextFragment(doc, m_text.impl());
- renderer->setPseudoStyle(pseudoStyle);
+ RenderObject* renderer = new (document.renderArena()) RenderTextFragment(&document, m_text.impl());
+ renderer->setPseudoStyle(&pseudoStyle);
return renderer;
}
-RenderObject* CounterContentData::createRenderer(Document* doc, RenderStyle* pseudoStyle) const
+RenderObject* CounterContentData::createRenderer(Document& document, RenderStyle& pseudoStyle) const
{
- RenderObject* renderer = new (doc->renderArena()) RenderCounter(doc, *m_counter);
- renderer->setPseudoStyle(pseudoStyle);
+ RenderObject* renderer = new (document.renderArena()) RenderCounter(&document, *m_counter);
+ renderer->setPseudoStyle(&pseudoStyle);
return renderer;
}
-RenderObject* QuoteContentData::createRenderer(Document* doc, RenderStyle* pseudoStyle) const
+RenderObject* QuoteContentData::createRenderer(Document& document, RenderStyle& pseudoStyle) const
{
- RenderObject* renderer = new (doc->renderArena()) RenderQuote(doc, m_quote);
- renderer->setPseudoStyle(pseudoStyle);
+ RenderObject* renderer = new (document.renderArena()) RenderQuote(&document, m_quote);
+ renderer->setPseudoStyle(&pseudoStyle);
return renderer;
}
Modified: trunk/Source/WebCore/rendering/style/ContentData.h (155822 => 155823)
--- trunk/Source/WebCore/rendering/style/ContentData.h 2013-09-15 19:10:19 UTC (rev 155822)
+++ trunk/Source/WebCore/rendering/style/ContentData.h 2013-09-15 19:19:32 UTC (rev 155823)
@@ -51,7 +51,7 @@
virtual bool isQuote() const { return false; }
virtual bool isText() const { return false; }
- virtual RenderObject* createRenderer(Document*, RenderStyle*) const = 0;
+ virtual RenderObject* createRenderer(Document&, RenderStyle&) const = 0;
virtual PassOwnPtr<ContentData> clone() const;
@@ -66,7 +66,7 @@
OwnPtr<ContentData> m_next;
};
-class ImageContentData : public ContentData {
+class ImageContentData FINAL : public ContentData {
friend class ContentData;
public:
const StyleImage* image() const { return m_image.get(); }
@@ -74,7 +74,7 @@
void setImage(PassRefPtr<StyleImage> image) { m_image = image; }
virtual bool isImage() const OVERRIDE { return true; }
- virtual RenderObject* createRenderer(Document*, RenderStyle*) const OVERRIDE;
+ virtual RenderObject* createRenderer(Document&, RenderStyle&) const OVERRIDE;
virtual bool equals(const ContentData& data) const OVERRIDE
{
@@ -98,14 +98,14 @@
RefPtr<StyleImage> m_image;
};
-class TextContentData : public ContentData {
+class TextContentData FINAL : public ContentData {
friend class ContentData;
public:
const String& text() const { return m_text; }
void setText(const String& text) { m_text = text; }
virtual bool isText() const OVERRIDE { return true; }
- virtual RenderObject* createRenderer(Document*, RenderStyle*) const OVERRIDE;
+ virtual RenderObject* createRenderer(Document&, RenderStyle&) const OVERRIDE;
virtual bool equals(const ContentData& data) const OVERRIDE
{
@@ -125,14 +125,14 @@
String m_text;
};
-class CounterContentData : public ContentData {
+class CounterContentData FINAL : public ContentData {
friend class ContentData;
public:
const CounterContent* counter() const { return m_counter.get(); }
void setCounter(PassOwnPtr<CounterContent> counter) { m_counter = counter; }
virtual bool isCounter() const OVERRIDE { return true; }
- virtual RenderObject* createRenderer(Document*, RenderStyle*) const OVERRIDE;
+ virtual RenderObject* createRenderer(Document&, RenderStyle&) const OVERRIDE;
private:
CounterContentData(PassOwnPtr<CounterContent> counter)
@@ -156,14 +156,14 @@
OwnPtr<CounterContent> m_counter;
};
-class QuoteContentData : public ContentData {
+class QuoteContentData FINAL : public ContentData {
friend class ContentData;
public:
QuoteType quote() const { return m_quote; }
void setQuote(QuoteType quote) { m_quote = quote; }
virtual bool isQuote() const OVERRIDE { return true; }
- virtual RenderObject* createRenderer(Document*, RenderStyle*) const OVERRIDE;
+ virtual RenderObject* createRenderer(Document&, RenderStyle&) const OVERRIDE;
virtual bool equals(const ContentData& data) const OVERRIDE
{
