Make ScopedStyleResolver use apply-author-styles of a given element's treescope.

Source/core/css/resolver/StyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 434 matching lines @@
 }
 
 void StyleResolver::matchScopedAuthorRules(ElementRuleCollector& collector, bool includeEmptyRules)
 {
     // fast path
     if (m_styleTree.hasOnlyScopeResolverForDocument()) {
         m_styleTree.scopedStyleResolverForDocument()->matchAuthorRules(collector, includeEmptyRules, true);
         return;
     }
 
-    Vector<std::pair<ScopedStyleResolver*, bool>, 8> stack;
+    Vector<ScopedStyleResolver*, 8> stack;
     m_styleTree.resolveScopeStyles(m_state.element(), stack);
     if (stack.isEmpty())
         return;
 
-    for (int i = stack.size() - 1; i >= 0; --i) {
-        ScopedStyleResolver* scopeResolver = stack.at(i).first;
-        bool applyAuthorStyles = stack.at(i).second;
-        scopeResolver->matchAuthorRules(collector, includeEmptyRules, applyAuthorStyles);
-    }
-    matchHostRules(stack.first().first, collector, includeEmptyRules);
+    bool applyAuthorStyles = m_state.element()->treeScope()->applyAuthorStyles();
+    for (int i = stack.size() - 1; i >= 0; --i)
+        stack.at(i)->matchAuthorRules(collector, includeEmptyRules, applyAuthorStyles);
+
+    matchHostRules(stack.first(), collector, includeEmptyRules);
 }
 
 void StyleResolver::matchAuthorRules(ElementRuleCollector& collector, bool includeEmptyRules)
 {
     matchScopedAuthorRules(collector, includeEmptyRules);
     matchShadowDistributedRules(collector, includeEmptyRules);
 }
 
 void StyleResolver::matchUserRules(ElementRuleCollector& collector, bool includeEmptyRules)
 {
@@ skipping 3252 matching lines @@
     info.addMember(m_state, "state");
 
     // FIXME: move this to a place where it would be called only once?
     info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle");
     info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyle");
     info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle");
     info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSourceStyle");
 }
 
 } // namespace WebCore