Source/core/animation/css/CSSAnimations.cpp - Issue 751593002: Removed add/removeScopedStyleResolver from StyleEngine

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/animation/css/CSSAnimations.cpp

Issue 751593002: Removed add/removeScopedStyleResolver from StyleEngine (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/fast/dom/shadow/make-marquee-bold-by-exec-command-crash-expected.html ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/css/CSSAnimations.cpp

diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp

index 20a667eeaddd581f0a92db2d6913efab13be805b..877b6bb9866c69a62ff3defd278689127da39d69 100644

--- a/Source/core/animation/css/CSSAnimations.cpp

+++ b/Source/core/animation/css/CSSAnimations.cpp

@@ -199,8 +199,11 @@ static void resolveKeyframes(StyleResolver* resolver, const Element* animatingEl

const StyleRuleKeyframes* CSSAnimations::matchScopedKeyframesRule(StyleResolver* resolver, const Element* element, const StringImpl* animationName)

{

// FIXME: This is all implementation detail of style resolver, CSSAnimations shouldn't be reaching into any of it.

- if (element->document().styleEngine()->hasOnlyScopedResolverForDocument())

- return element->document().scopedStyleResolver()->keyframeStylesForAnimation(animationName);

+ if (element->document().styleEngine()->onlyDocumentHasStyles()) {

+ if (ScopedStyleResolver* resolver = element->document().scopedStyleResolver())

+ return resolver->keyframeStylesForAnimation(animationName);

+ return nullptr;

+ }

WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8> stack;

resolver->styleTreeResolveScopedKeyframesRules(element, stack);