| 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
|
|
|