Merge 187602 "ScopedStyleResolver should be cleared when ShadowR..."

Source/core/css/resolver/StyleResolver.cpp

Index: Source/core/css/resolver/StyleResolver.cpp
===================================================================
--- Source/core/css/resolver/StyleResolver.cpp	(revision 187668)
+++ Source/core/css/resolver/StyleResolver.cpp	(working copy)
@@ -256,13 +256,14 @@
 
 void StyleResolver::resetAuthorStyle(TreeScope& treeScope)
 {
+    m_treeBoundaryCrossingRules.reset(&treeScope.rootNode());
+    resetRuleFeatures();
+
     ScopedStyleResolver* resolver = treeScope.scopedStyleResolver();
     if (!resolver)
         return;
 
-    m_treeBoundaryCrossingRules.reset(&treeScope.rootNode());
     resolver->resetAuthorStyle();
-    resetRuleFeatures();
     if (treeScope.rootNode().isDocumentNode())
         return;