Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: Ifa868e6d63fe87d2338d9388aa5ea81f746d485f
diff --git a/Source/core/css/resolver/ElementResolveContext.h b/Source/core/css/resolver/ElementResolveContext.h
index ebbe1cf..f255e89 100644
--- a/Source/core/css/resolver/ElementResolveContext.h
+++ b/Source/core/css/resolver/ElementResolveContext.h
@@ -45,14 +45,11 @@
{
}
- explicit ElementResolveContext(Element*);
-
- Document& document() const { return m_element->document(); }
- bool isDocumentElement() const { return m_element && m_element == m_element->document().documentElement(); }
+ explicit ElementResolveContext(Element&);
Element* element() const { return m_element; }
const ContainerNode* parentNode() const { return m_parentNode; }
- RenderStyle* rootElementStyle() const { return m_rootElementStyle; }
+ const RenderStyle* rootElementStyle() const { return m_rootElementStyle; }
EInsideLink elementLinkState() const { return m_elementLinkState; }
bool distributedToInsertionPoint() const { return m_distributedToInsertionPoint; }
bool resetStyleInheritance() const { return m_resetStyleInheritance; }