third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp - Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation

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/platform/graphics/GraphicsLayerTest.cpp

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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

« cc/blink/web_layer_impl.cc ('K') | « third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp ('k') | third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp

index 79ba3f09ef10b021a901e7d2ad9909e42d778619..52168d1355442f7f71613542dd211dcdb6641de4 100644

--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp

+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp

@@ -24,7 +24,9 @@

#include "platform/graphics/GraphicsLayer.h"

+#include "platform/CompositorFactory.h"

#include "platform/RuntimeEnabledFeatures.h"

+#include "platform/animation/WebFloatAnimationCurve.h"

#include "platform/scroll/ScrollableArea.h"

#include "platform/transforms/Matrix3DTransformOperation.h"

#include "platform/transforms/RotateTransformOperation.h"

@@ -34,7 +36,6 @@

#include "public/platform/WebCompositorAnimationPlayerClient.h"

#include "public/platform/WebCompositorAnimationTimeline.h"

#include "public/platform/WebCompositorSupport.h"

-#include "public/platform/WebFloatAnimationCurve.h"

#include "public/platform/WebGraphicsContext3D.h"

#include "public/platform/WebLayer.h"

#include "public/platform/WebLayerTreeView.h"

@@ -119,7 +120,7 @@ TEST_F(GraphicsLayerTest, updateLayerShouldFlattenTransformWithAnimations)

{

ASSERT_FALSE(m_platformLayer->hasActiveAnimation());

- OwnPtr<WebFloatAnimationCurve> curve = adoptPtr(Platform::current()->compositorSupport()->createFloatAnimationCurve());

+ OwnPtr<WebFloatAnimationCurve> curve = adoptPtr(CompositorFactory::current().createFloatAnimationCurve());

curve->add(WebFloatKeyframe(0.0, 0.0));

OwnPtr<WebCompositorAnimation> floatAnimation(adoptPtr(Platform::current()->compositorSupport()->createAnimation(*curve, WebCompositorAnimation::TargetPropertyOpacity)));

int animationId = floatAnimation->id();