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

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

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/ContentData.h ('k') | Source/core/layout/style/CounterContent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/style/ContentData.cpp
diff --git a/Source/core/layout/style/ContentData.cpp b/Source/core/layout/style/ContentData.cpp
index 811bcaf9457f266a5d737be51199f4929ff91632..caccfcb61e1b507d7f9af7951bfaa1e698a4cc35 100644
--- a/Source/core/layout/style/ContentData.cpp
+++ b/Source/core/layout/style/ContentData.cpp
@@ -28,7 +28,7 @@
#include "core/layout/LayoutImageResourceStyleImage.h"
#include "core/layout/LayoutQuote.h"
#include "core/layout/LayoutTextFragment.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
namespace blink {
@@ -66,7 +66,7 @@ PassOwnPtr<ContentData> ContentData::clone() const
return result.release();
}
-LayoutObject* ImageContentData::createLayoutObject(Document& doc, LayoutStyle& pseudoStyle) const
+LayoutObject* ImageContentData::createLayoutObject(Document& doc, ComputedStyle& pseudoStyle) const
{
LayoutImage* image = LayoutImage::createAnonymous(&doc);
image->setPseudoStyle(&pseudoStyle);
@@ -77,21 +77,21 @@ LayoutObject* ImageContentData::createLayoutObject(Document& doc, LayoutStyle& p
return image;
}
-LayoutObject* TextContentData::createLayoutObject(Document& doc, LayoutStyle& pseudoStyle) const
+LayoutObject* TextContentData::createLayoutObject(Document& doc, ComputedStyle& pseudoStyle) const
{
LayoutObject* layoutObject = new LayoutTextFragment(&doc, m_text.impl());
layoutObject->setPseudoStyle(&pseudoStyle);
return layoutObject;
}
-LayoutObject* CounterContentData::createLayoutObject(Document& doc, LayoutStyle& pseudoStyle) const
+LayoutObject* CounterContentData::createLayoutObject(Document& doc, ComputedStyle& pseudoStyle) const
{
LayoutObject* layoutObject = new LayoutCounter(&doc, *m_counter);
layoutObject->setPseudoStyle(&pseudoStyle);
return layoutObject;
}
-LayoutObject* QuoteContentData::createLayoutObject(Document& doc, LayoutStyle& pseudoStyle) const
+LayoutObject* QuoteContentData::createLayoutObject(Document& doc, ComputedStyle& pseudoStyle) const
{
LayoutObject* layoutObject = new LayoutQuote(&doc, m_quote);
layoutObject->setPseudoStyle(&pseudoStyle);
« no previous file with comments | « Source/core/layout/style/ContentData.h ('k') | Source/core/layout/style/CounterContent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698