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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 9 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/layout/style/ComputedStyleTest.cpp ('k') | Source/core/layout/style/ContentData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/style/ContentData.h
diff --git a/Source/core/layout/style/ContentData.h b/Source/core/layout/style/ContentData.h
index 9f78727d5f3c5e002711945af65be7baf382f688..21fbd87ff7b6b52391acfdfcc5af1a110e312d55 100644
--- a/Source/core/layout/style/ContentData.h
+++ b/Source/core/layout/style/ContentData.h
@@ -34,7 +34,7 @@ namespace blink {
class Document;
class LayoutObject;
-class LayoutStyle;
+class ComputedStyle;
class ContentData {
WTF_MAKE_FAST_ALLOCATED(ContentData);
@@ -51,7 +51,7 @@ public:
virtual bool isQuote() const { return false; }
virtual bool isText() const { return false; }
- virtual LayoutObject* createLayoutObject(Document&, LayoutStyle&) const = 0;
+ virtual LayoutObject* createLayoutObject(Document&, ComputedStyle&) 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 LayoutObject* createLayoutObject(Document&, LayoutStyle&) const override;
+ virtual LayoutObject* createLayoutObject(Document&, ComputedStyle&) 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 LayoutObject* createLayoutObject(Document&, LayoutStyle&) const override;
+ virtual LayoutObject* createLayoutObject(Document&, ComputedStyle&) 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 LayoutObject* createLayoutObject(Document&, LayoutStyle&) const override;
+ virtual LayoutObject* createLayoutObject(Document&, ComputedStyle&) 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 LayoutObject* createLayoutObject(Document&, LayoutStyle&) const override;
+ virtual LayoutObject* createLayoutObject(Document&, ComputedStyle&) const override;
virtual bool equals(const ContentData& data) const override
{
« no previous file with comments | « Source/core/layout/style/ComputedStyleTest.cpp ('k') | Source/core/layout/style/ContentData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698