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

Unified Diff: Source/core/layout/LayoutCounter.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/LayoutCounter.h ('k') | Source/core/layout/LayoutDeprecatedFlexibleBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutCounter.cpp
diff --git a/Source/core/layout/LayoutCounter.cpp b/Source/core/layout/LayoutCounter.cpp
index 61866ba0db16af010f1ceffadda5ad0855a45634..6f8d874f2b868ffb910c638f9402a723d4f9a79b 100644
--- a/Source/core/layout/LayoutCounter.cpp
+++ b/Source/core/layout/LayoutCounter.cpp
@@ -30,7 +30,7 @@
#include "core/layout/LayoutListItem.h"
#include "core/layout/LayoutListMarker.h"
#include "core/layout/LayoutView.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
#include "wtf/StdLibExtras.h"
#ifndef NDEBUG
@@ -111,7 +111,7 @@ static bool planCounter(LayoutObject& object, const AtomicString& identifier, bo
// We must have a generating node or else we cannot have a counter.
if (!generatingNode)
return false;
- const LayoutStyle& style = object.styleRef();
+ const ComputedStyle& style = object.styleRef();
switch (style.styleType()) {
case NOPSEUDO:
@@ -541,7 +541,7 @@ void LayoutCounter::rendererSubtreeAttached(LayoutObject* renderer)
updateCounters(*descendant);
}
-void LayoutCounter::rendererStyleChanged(LayoutObject& renderer, const LayoutStyle* oldStyle, const LayoutStyle& newStyle)
+void LayoutCounter::rendererStyleChanged(LayoutObject& renderer, const ComputedStyle* oldStyle, const ComputedStyle& newStyle)
{
Node* node = renderer.generatingNode();
if (!node || node->needsAttach())
« no previous file with comments | « Source/core/layout/LayoutCounter.h ('k') | Source/core/layout/LayoutDeprecatedFlexibleBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698