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

Unified Diff: Source/core/css/resolver/StyleResolverState.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/css/resolver/StyleResolverState.h ('k') | Source/core/css/resolver/StyleResourceLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleResolverState.cpp
diff --git a/Source/core/css/resolver/StyleResolverState.cpp b/Source/core/css/resolver/StyleResolverState.cpp
index 7aff9c4ef5e89ba017859687cc0829a4067f40f1..d883d7cf5ad09cfa353b0324eff7b2f3fb371b5b 100644
--- a/Source/core/css/resolver/StyleResolverState.cpp
+++ b/Source/core/css/resolver/StyleResolverState.cpp
@@ -24,17 +24,17 @@
#include "core/animation/css/CSSAnimations.h"
#include "core/dom/Node.h"
-#include "core/dom/NodeLayoutStyle.h"
+#include "core/dom/NodeComputedStyle.h"
#include "core/frame/FrameHost.h"
namespace blink {
-StyleResolverState::StyleResolverState(Document& document, const ElementResolveContext& elementContext, const LayoutStyle* parentStyle)
+StyleResolverState::StyleResolverState(Document& document, const ElementResolveContext& elementContext, const ComputedStyle* parentStyle)
: m_elementContext(elementContext)
, m_document(document)
, m_style(nullptr)
// TODO(jchaffraix): We should make m_parentStyle const (https://crbug.com/468152)
- , m_parentStyle(const_cast<LayoutStyle*>(parentStyle))
+ , m_parentStyle(const_cast<ComputedStyle*>(parentStyle))
, m_applyPropertyToRegularStyle(true)
, m_applyPropertyToVisitedLinkStyle(false)
, m_hasDirAutoAttribute(false)
@@ -42,14 +42,14 @@ StyleResolverState::StyleResolverState(Document& document, const ElementResolveC
{
if (!m_parentStyle) {
// TODO(jchaffraix): We should make m_parentStyle const (https://crbug.com/468152)
- m_parentStyle = const_cast<LayoutStyle*>(m_elementContext.parentStyle());
+ m_parentStyle = const_cast<ComputedStyle*>(m_elementContext.parentStyle());
}
ASSERT(document.isActive());
m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceScaleFactor());
}
-StyleResolverState::StyleResolverState(Document& document, Element* element, const LayoutStyle* parentStyle)
+StyleResolverState::StyleResolverState(Document& document, Element* element, const ComputedStyle* parentStyle)
: StyleResolverState(document, element ? ElementResolveContext(*element) : ElementResolveContext(document), parentStyle)
{
}
« no previous file with comments | « Source/core/css/resolver/StyleResolverState.h ('k') | Source/core/css/resolver/StyleResourceLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698