Chromium Code Reviews| Index: Source/core/css/resolver/StyleResolver.cpp |
| diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp |
| index d025b389d881b8c6cabe58b730294e6ee77bb719..d20d78bc13534313e1e5fb71f2701df1f352d915 100644 |
| --- a/Source/core/css/resolver/StyleResolver.cpp |
| +++ b/Source/core/css/resolver/StyleResolver.cpp |
| @@ -64,6 +64,7 @@ |
| #include "core/css/resolver/MediaQueryResult.h" |
| #include "core/css/resolver/SharedStyleFinder.h" |
| #include "core/css/resolver/StyleAdjuster.h" |
| +#include "core/css/resolver/StyleResolverParentScope.h" |
| #include "core/css/resolver/StyleResolverStats.h" |
| #include "core/css/resolver/ViewportStyleResolver.h" |
| #include "core/dom/CSSSelectorWatch.h" |
| @@ -72,10 +73,10 @@ |
| #include "core/dom/Text.h" |
| #include "core/dom/shadow/ElementShadow.h" |
| #include "core/dom/shadow/ShadowRoot.h" |
| -#include "core/html/HTMLIFrameElement.h" |
| -#include "core/inspector/InspectorInstrumentation.h" |
| #include "core/frame/Frame.h" |
| #include "core/frame/FrameView.h" |
| +#include "core/html/HTMLIFrameElement.h" |
| +#include "core/inspector/InspectorInstrumentation.h" |
| #include "core/rendering/RenderView.h" |
| #include "core/rendering/style/KeyframeList.h" |
| #include "core/rendering/style/StyleCustomFilterProgramCache.h" |
| @@ -682,6 +683,8 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS |
| return sharedStyle.release(); |
| } |
| + StyleResolverParentScope::pushScopes(); |
|
eseidel
2013/12/09 18:18:36
This is really "ensure scopes are pushed" or somet
|
| + |
| if (state.parentStyle()) { |
| state.setStyle(RenderStyle::create()); |
| state.style()->inheritFrom(state.parentStyle(), isAtShadowBoundary(element) ? RenderStyle::AtShadowBoundary : RenderStyle::NotAtShadowBoundary); |
| @@ -882,6 +885,8 @@ PassRefPtr<RenderStyle> StyleResolver::pseudoStyleForElement(Element* element, c |
| if (!element) |
| return 0; |
| + StyleResolverParentScope::pushScopes(); |
| + |
| StyleResolverState state(document(), element, parentStyle); |
| if (pseudoStyleRequest.allowsInheritance(state.parentStyle())) { |