Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / resolver / ScopedStyleResolver.h

diff --git a/src/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h b/src/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h
index c509875..06056c6 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h
+++ b/src/third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h
@@ -43,7 +43,7 @@ class StyleResolver;
 class StyleSheetContents;
 
 // This class selects a RenderStyle for a given element based on a collection of stylesheets.
-class ScopedStyleResolver FINAL : public NoBaseWillBeGarbageCollected<ScopedStyleResolver> {
+class ScopedStyleResolver final : public NoBaseWillBeGarbageCollected<ScopedStyleResolver> {
     WTF_MAKE_NONCOPYABLE(ScopedStyleResolver);
     WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
@@ -61,9 +61,9 @@ public:
     const StyleRuleKeyframes* keyframeStylesForAnimation(const StringImpl* animationName);
     void addKeyframeStyle(PassRefPtrWillBeRawPtr<StyleRuleKeyframes>);
 
+    unsigned appendCSSStyleSheet(CSSStyleSheet*);
     void collectMatchingAuthorRules(ElementRuleCollector&, bool includeEmptyRules, CascadeScope, CascadeOrder = ignoreCascadeOrder);
     void matchPageRules(PageRuleCollector&);
-    void addRulesFromSheet(CSSStyleSheet*, const MediaQueryEvaluator&, StyleResolver*);
     void collectFeaturesTo(RuleFeatureSet&, HashSet<const StyleSheetContents*>& visitedSharedStyleSheetContents) const;
     void resetAuthorStyle();
     void collectViewportRulesTo(StyleResolver*) const;