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

Unified Diff: Source/core/css/resolver/ElementResolveContext.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/css/resolver/CSSToStyleMap.h ('k') | Source/core/css/resolver/ElementResolveContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/ElementResolveContext.h
diff --git a/Source/core/css/resolver/ElementResolveContext.h b/Source/core/css/resolver/ElementResolveContext.h
index 81672879a0445cac00f49a6c651303c421e72d5a..e2450fa1605465d87ee242aa9c2d8b2f08e58687 100644
--- a/Source/core/css/resolver/ElementResolveContext.h
+++ b/Source/core/css/resolver/ElementResolveContext.h
@@ -23,14 +23,14 @@
#define ElementResolveContext_h
#include "core/dom/Element.h"
-#include "core/layout/style/LayoutStyleConstants.h"
+#include "core/layout/style/ComputedStyleConstants.h"
namespace blink {
class ContainerNode;
class Document;
class Element;
-class LayoutStyle;
+class ComputedStyle;
// ElementResolveContext is immutable and serves as an input to the style resolve process.
class ElementResolveContext {
@@ -42,15 +42,15 @@ public:
Element* element() const { return m_element; }
const ContainerNode* parentNode() const { return m_parentNode; }
- const LayoutStyle* rootElementStyle() const { return m_rootElementStyle; }
- const LayoutStyle* parentStyle() const { return parentNode() ? parentNode()->layoutStyle() : nullptr; }
+ const ComputedStyle* rootElementStyle() const { return m_rootElementStyle; }
+ const ComputedStyle* parentStyle() const { return parentNode() ? parentNode()->computedStyle() : nullptr; }
EInsideLink elementLinkState() const { return m_elementLinkState; }
bool distributedToInsertionPoint() const { return m_distributedToInsertionPoint; }
private:
RawPtrWillBeMember<Element> m_element;
RawPtrWillBeMember<ContainerNode> m_parentNode;
- const LayoutStyle* m_rootElementStyle;
+ const ComputedStyle* m_rootElementStyle;
EInsideLink m_elementLinkState;
bool m_distributedToInsertionPoint;
};
« no previous file with comments | « Source/core/css/resolver/CSSToStyleMap.h ('k') | Source/core/css/resolver/ElementResolveContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698