Source/core/css/resolver/StyleAdjuster.cpp - Issue 26382004: Web Animations CSS: Implement CSS Transitions backed on Web Animations model

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/resolver/StyleAdjuster.cpp

Issue 26382004: Web Animations CSS: Implement CSS Transitions backed on Web Animations model (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master

Patch Set: fix logic for elapsedTime in event 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

« Source/core/animation/css/CSSAnimations.cpp ('K') | « Source/core/animation/css/CSSAnimations.cpp ('k') | Source/core/css/resolver/StyleResolver.h » ('j') | Source/core/css/resolver/StyleResolver.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/resolver/StyleAdjuster.cpp

diff --git a/Source/core/css/resolver/StyleAdjuster.cpp b/Source/core/css/resolver/StyleAdjuster.cpp

index 10f572ff437fdc7b23a68314eddb2ef1f4af7f41..8d4136909266da98f3f125baabcb13c40ab46940 100644

--- a/Source/core/css/resolver/StyleAdjuster.cpp

+++ b/Source/core/css/resolver/StyleAdjuster.cpp

@@ -336,10 +336,6 @@ void StyleAdjuster::adjustRenderStyle(RenderStyle* style, RenderStyle* parentSty

style->adjustBackgroundLayers();

style->adjustMaskLayers();

- // Do the same for animations and transitions.

dstockwell 2013/10/08 21:02:59 this should stay here and be guarded by !enable we

Timothy Loh 2013/10/09 01:33:07 This should work fine for both old/new with it mov

- style->adjustAnimations();

- style->adjustTransitions();

// Important: Intrinsic margins get added to controls before the theme has adjusted the style, since the theme will

// alter fonts and heights/widths.

if (e && e->isFormControlElement() && style->fontSize() >= 11) {