diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/css/CSSStyleSelector.h')
-rw-r--r-- | src/3rdparty/webkit/WebCore/css/CSSStyleSelector.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/css/CSSStyleSelector.h b/src/3rdparty/webkit/WebCore/css/CSSStyleSelector.h index c9df8765d..d86dd8c8c 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSStyleSelector.h +++ b/src/3rdparty/webkit/WebCore/css/CSSStyleSelector.h @@ -78,7 +78,7 @@ public: }; // This class selects a RenderStyle for a given element based on a collection of stylesheets. - class CSSStyleSelector : Noncopyable { + class CSSStyleSelector : public Noncopyable { public: CSSStyleSelector(Document*, const String& userStyleSheet, StyleSheetList*, CSSStyleSheet*, bool strictParsing, bool matchAuthorAndUserStyles); ~CSSStyleSelector(); @@ -152,7 +152,7 @@ public: void addKeyframeStyle(PassRefPtr<WebKitCSSKeyframesRule> rule); - static bool createTransformOperations(CSSValue* inValue, RenderStyle* inStyle, TransformOperations& outOperations); + static bool createTransformOperations(CSSValue* inValue, RenderStyle* inStyle, RenderStyle* rootStyle, TransformOperations& outOperations); private: enum SelectorMatch { SelectorMatches, SelectorFailsLocally, SelectorFailsCompletely }; @@ -266,6 +266,7 @@ public: RefPtr<RenderStyle> m_style; RenderStyle* m_parentStyle; + RenderStyle* m_rootElementStyle; Element* m_element; StyledElement* m_styledElement; Node* m_parentNode; |