Source/core/css/CSSComputedStyleDeclaration.cpp - Issue 24921002: Make compositingState explicit

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/css/CSSComputedStyleDeclaration.cpp

Issue 24921002: Make compositingState explicit (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: path for re-landing try #2 with removed unnecessary comment Created 7 years, 2 months 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

Index: Source/core/css/CSSComputedStyleDeclaration.cpp

diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp

index 21292957e729a63ee0a74ce7a2f1434b975c96ad..ba075145bf0e8f9e6743dc8d587b2373346962eb 100644

--- a/Source/core/css/CSSComputedStyleDeclaration.cpp

+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp

@@ -1616,7 +1616,8 @@ PassRefPtr<RenderStyle> CSSComputedStyleDeclaration::computeRenderStyle(CSSPrope

Node* styledNode = this->styledNode();

ASSERT(styledNode);

RenderObject* renderer = styledNode->renderer();

- if (renderer && renderer->isComposited() && !RuntimeEnabledFeatures::webAnimationsCSSEnabled() && AnimationController::supportsAcceleratedAnimationOfProperty(propertyID)) {

+ if (renderer && renderer->compositingState() == PaintsIntoOwnBacking

+ && !RuntimeEnabledFeatures::webAnimationsCSSEnabled() && AnimationController::supportsAcceleratedAnimationOfProperty(propertyID)) {

AnimationUpdateBlock animationUpdateBlock(renderer->animation());

if (m_pseudoElementSpecifier && !styledNode->isPseudoElement()) {

// FIXME: This cached pseudo style will only exist if the animation has been run at least once.

« no previous file with comments | « no previous file | Source/core/inspector/InspectorLayerTreeAgent.cpp » ('j') | no next file with comments »