third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp - Issue 1375833003: Chrome currently doesn't ignore transitions when using "@media print"

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: third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp

Issue 1375833003: Chrome currently doesn't ignore transitions when using "@media print" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Space issues Created 5 years, 3 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

« no previous file with comments | « third_party/WebKit/LayoutTests/printing/printing-transition-ignore-media-print.html ('k') | third_party/WebKit/Source/core/dom/Document.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9569be47afe786ef7e81aefb6cbf7f2de367eb62..b38de39e7ebba95fce91d9d9fcb4235e929f60bc 100644

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

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

@@ -543,6 +543,9 @@ void CSSAnimations::calculateTransitionUpdate(CSSAnimationUpdate& update, const

if (!animatingElement)

return;

+ if (animatingElement->document().printing() || animatingElement->document().wasPrinting())

+ return;

ElementAnimations* elementAnimations = animatingElement->elementAnimations();

const TransitionMap* activeTransitions = elementAnimations ? &elementAnimations->cssAnimations().m_transitions : nullptr;

const CSSTransitionData* transitionData = style.transitions();