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

Unified Diff: Source/core/css/resolver/ElementResolveContext.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/ElementResolveContext.h ('k') | Source/core/css/resolver/FontBuilder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/ElementResolveContext.cpp
diff --git a/Source/core/css/resolver/ElementResolveContext.cpp b/Source/core/css/resolver/ElementResolveContext.cpp
index e40565d54e157e1fbc1798d7ce3b1698d3279fd2..77f56f8957fc0dd0562ccc4885310e8ad75b23c2 100644
--- a/Source/core/css/resolver/ElementResolveContext.cpp
+++ b/Source/core/css/resolver/ElementResolveContext.cpp
@@ -23,7 +23,7 @@
#include "core/css/resolver/ElementResolveContext.h"
#include "core/dom/Node.h"
-#include "core/dom/NodeLayoutStyle.h"
+#include "core/dom/NodeComputedStyle.h"
#include "core/dom/NodeRenderingTraversal.h"
#include "core/dom/VisitedLinkState.h"
@@ -32,7 +32,7 @@ namespace blink {
ElementResolveContext::ElementResolveContext(const Document& document)
: m_element(nullptr)
, m_parentNode(nullptr)
- , m_rootElementStyle(document.documentElement() ? document.documentElement()->layoutStyle() : document.layoutStyle())
+ , m_rootElementStyle(document.documentElement() ? document.documentElement()->computedStyle() : document.computedStyle())
, m_elementLinkState(NotInsideLink)
, m_distributedToInsertionPoint(false)
{
@@ -49,8 +49,8 @@ ElementResolveContext::ElementResolveContext(Element& element)
const Document& document = element.document();
Node* documentElement = document.documentElement();
- const LayoutStyle* documentStyle = document.layoutStyle();
- m_rootElementStyle = documentElement && element != documentElement ? documentElement->layoutStyle() : documentStyle;
+ const ComputedStyle* documentStyle = document.computedStyle();
+ m_rootElementStyle = documentElement && element != documentElement ? documentElement->computedStyle() : documentStyle;
if (!m_rootElementStyle)
m_rootElementStyle = documentStyle;
}
« no previous file with comments | « Source/core/css/resolver/ElementResolveContext.h ('k') | Source/core/css/resolver/FontBuilder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698