Chromium Code Reviews| Index: Source/core/css/resolver/StyleResolverState.cpp |
| diff --git a/Source/core/css/resolver/StyleResolverState.cpp b/Source/core/css/resolver/StyleResolverState.cpp |
| index 7c76ccaf3a0e95b8f636a161d1153111e4ce57ba..ddf47db68f28001100eda4303a2d030d44d09fee 100644 |
| --- a/Source/core/css/resolver/StyleResolverState.cpp |
| +++ b/Source/core/css/resolver/StyleResolverState.cpp |
| @@ -33,6 +33,7 @@ StyleResolverState::StyleResolverState(Document& document, Element* element, Ren |
| : m_elementContext(element ? ElementResolveContext(*element) : ElementResolveContext()) |
| , m_document(document) |
| , m_style(0) |
| + , m_cssToLengthConversionData(0, 0) |
| , m_parentStyle(parentStyle) |
| , m_regionForStyling(regionForStyling) |
| , m_applyPropertyToRegularStyle(true) |
| @@ -46,6 +47,8 @@ StyleResolverState::StyleResolverState(Document& document, Element* element, Ren |
| else if (!parentStyle && m_elementContext.parentNode()) |
| m_parentStyle = m_elementContext.parentNode()->renderStyle(); |
| + m_cssToLengthConversionData.setRootStyle(rootElementStyle()); |
|
alancutter (OOO until 2018)
2013/11/27 09:30:58
This can be moved into the constructor list (as di
Timothy Loh
2013/11/28 03:41:53
Done.
|
| + |
| // FIXME: How can we not have a page here? |
| if (Page* page = document.page()) |
| m_elementStyleResources.setDeviceScaleFactor(page->deviceScaleFactor()); |