Source/core/animation/DocumentAnimations.cpp - Issue 1033943002: Rename LayoutStyle to papayawhip

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/DocumentAnimations.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: ensureComputedStyle Created 5 years, 9 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:

Index: Source/core/animation/DocumentAnimations.cpp

diff --git a/Source/core/animation/DocumentAnimations.cpp b/Source/core/animation/DocumentAnimations.cpp

index 30e547b606a3c0580975d071fd5c54f0d4dd546e..e6d6c8c28806439985f3dfdef2fc0392dd3c8596 100644

--- a/Source/core/animation/DocumentAnimations.cpp

+++ b/Source/core/animation/DocumentAnimations.cpp

@@ -36,7 +36,7 @@

#include "core/dom/Document.h"

#include "core/dom/Element.h"

#include "core/dom/Node.h"

-#include "core/dom/NodeLayoutStyle.h"

+#include "core/dom/NodeComputedStyle.h"

#include "core/frame/FrameView.h"

#include "core/frame/LocalFrame.h"

#include "core/layout/LayoutView.h"

@@ -69,7 +69,7 @@ void DocumentAnimations::updateAnimationTimingForGetComputedStyle(Node& node, CS

if (!node.isElementNode())

return;

const Element& element = toElement(node);

- if (const LayoutStyle* style = element.layoutStyle()) {

+ if (const ComputedStyle* style = element.computedStyle()) {

if ((property == CSSPropertyOpacity && style->isRunningOpacityAnimationOnCompositor())

|| ((property == CSSPropertyTransform || property == CSSPropertyWebkitTransform) && style->isRunningTransformAnimationOnCompositor())

|| (property == CSSPropertyWebkitFilter && style->isRunningFilterAnimationOnCompositor())) {

« no previous file with comments | « Source/core/animation/Animation.cpp ('k') | Source/core/animation/EffectInput.cpp » ('j') | no next file with comments »