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

Unified Diff: Source/core/layout/LayoutListMarker.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/LayoutListMarker.h ('k') | Source/core/layout/LayoutMedia.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutListMarker.cpp
diff --git a/Source/core/layout/LayoutListMarker.cpp b/Source/core/layout/LayoutListMarker.cpp
index 2fec09abf792b8018966bb3cd4f96efa676d6e5f..57e75c776c7165f2bcaa42985a8e1d60de2c88d8 100644
--- a/Source/core/layout/LayoutListMarker.cpp
+++ b/Source/core/layout/LayoutListMarker.cpp
@@ -1076,7 +1076,7 @@ LayoutListMarker* LayoutListMarker::createAnonymous(LayoutListItem* item)
return renderer;
}
-void LayoutListMarker::styleWillChange(StyleDifference diff, const LayoutStyle& newStyle)
+void LayoutListMarker::styleWillChange(StyleDifference diff, const ComputedStyle& newStyle)
{
if (style() && (newStyle.listStylePosition() != style()->listStylePosition() || newStyle.listStyleType() != style()->listStyleType()))
setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
@@ -1084,7 +1084,7 @@ void LayoutListMarker::styleWillChange(StyleDifference diff, const LayoutStyle&
LayoutBox::styleWillChange(diff, newStyle);
}
-void LayoutListMarker::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
+void LayoutListMarker::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
{
LayoutBox::styleDidChange(diff, oldStyle);
@@ -1636,7 +1636,7 @@ LayoutRect LayoutListMarker::selectionRectForPaintInvalidation(const LayoutBoxMo
void LayoutListMarker::listItemStyleDidChange()
{
- RefPtr<LayoutStyle> newStyle = LayoutStyle::create();
+ RefPtr<ComputedStyle> newStyle = ComputedStyle::create();
// The marker always inherits from the list item, regardless of where it might end
// up (e.g., in some deeply nested line box). See CSS3 spec.
newStyle->inheritFrom(m_listItem->styleRef());
« no previous file with comments | « Source/core/layout/LayoutListMarker.h ('k') | Source/core/layout/LayoutMedia.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698