Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1077)

Unified Diff: Source/core/rendering/style/ContentData.h

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/VerticalPositionCache.h ('k') | Source/core/rendering/style/ContentData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/ContentData.h
diff --git a/Source/core/rendering/style/ContentData.h b/Source/core/rendering/style/ContentData.h
index fe28e2e7685792925173662a8b6a48b63f0c4ebc..1c32de9b203433b765a0bd05c2f00aa2ea7a1d14 100644
--- a/Source/core/rendering/style/ContentData.h
+++ b/Source/core/rendering/style/ContentData.h
@@ -33,7 +33,7 @@
namespace blink {
class Document;
-class RenderObject;
+class LayoutObject;
class RenderStyle;
class ContentData {
@@ -51,7 +51,7 @@ public:
virtual bool isQuote() const { return false; }
virtual bool isText() const { return false; }
- virtual RenderObject* createRenderer(Document&, RenderStyle*) const = 0;
+ virtual LayoutObject* createRenderer(Document&, RenderStyle*) const = 0;
virtual PassOwnPtr<ContentData> clone() const;
@@ -77,7 +77,7 @@ public:
void setImage(PassRefPtr<StyleImage> image) { m_image = image; }
virtual bool isImage() const override { return true; }
- virtual RenderObject* createRenderer(Document&, RenderStyle*) const override;
+ virtual LayoutObject* createRenderer(Document&, RenderStyle*) const override;
virtual bool equals(const ContentData& data) const override
{
@@ -110,7 +110,7 @@ public:
void setText(const String& text) { m_text = text; }
virtual bool isText() const override { return true; }
- virtual RenderObject* createRenderer(Document&, RenderStyle*) const override;
+ virtual LayoutObject* createRenderer(Document&, RenderStyle*) const override;
virtual bool equals(const ContentData& data) const override
{
@@ -139,7 +139,7 @@ public:
void setCounter(PassOwnPtr<CounterContent> counter) { m_counter = counter; }
virtual bool isCounter() const override { return true; }
- virtual RenderObject* createRenderer(Document&, RenderStyle*) const override;
+ virtual LayoutObject* createRenderer(Document&, RenderStyle*) const override;
private:
CounterContentData(PassOwnPtr<CounterContent> counter)
@@ -172,7 +172,7 @@ public:
void setQuote(QuoteType quote) { m_quote = quote; }
virtual bool isQuote() const override { return true; }
- virtual RenderObject* createRenderer(Document&, RenderStyle*) const override;
+ virtual LayoutObject* createRenderer(Document&, RenderStyle*) const override;
virtual bool equals(const ContentData& data) const override
{
« no previous file with comments | « Source/core/rendering/VerticalPositionCache.h ('k') | Source/core/rendering/style/ContentData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698