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

Unified Diff: Source/core/css/resolver/StyleResolverState.cpp

Issue 126443005: Use TreeScope::completeURL and baseURL instead of the Document versions (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased again, passes tests Created 6 years, 11 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/dom/Element.cpp » ('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 a08f3988704fe5cfb9842f6d4d9f9bfdf4af8564..9233e07f1bac5d9be4213f4c025c1fbbf0ed6a0a 100644
--- a/Source/core/css/resolver/StyleResolverState.cpp
+++ b/Source/core/css/resolver/StyleResolverState.cpp
@@ -28,11 +28,11 @@
namespace WebCore {
-StyleResolverState::StyleResolverState(Document& document, Element* element, RenderStyle* parentStyle, RenderRegion* regionForStyling)
+StyleResolverState::StyleResolverState(TreeScope& treeScope, Element* element, RenderStyle* parentStyle, RenderRegion* regionForStyling)
: m_elementContext(element ? ElementResolveContext(*element) : ElementResolveContext())
- , m_document(document)
+ , m_treeScope(treeScope)
, m_style(0)
- , m_cssToLengthConversionData(0, rootElementStyle(), document.renderView())
+ , m_cssToLengthConversionData(0, rootElementStyle(), treeScope.document().renderView())
, m_parentStyle(parentStyle)
, m_regionForStyling(regionForStyling)
, m_applyPropertyToRegularStyle(true)
@@ -49,9 +49,9 @@ StyleResolverState::StyleResolverState(Document& document, Element* element, Ren
// FIXME: Animation unitests will start animations on non-active documents!
// http://crbug.com/330095
// ASSERT(document.isActive());
- if (!document.isActive())
+ if (!document().isActive())
return;
- m_elementStyleResources.setDeviceScaleFactor(document.frameHost()->deviceScaleFactor());
+ m_elementStyleResources.setDeviceScaleFactor(document().frameHost()->deviceScaleFactor());
}
} // namespace WebCore
« no previous file with comments | « Source/core/css/resolver/StyleResolverState.h ('k') | Source/core/dom/Element.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698