Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Unified Diff: third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp

Issue 1973083002: Use element id's for animations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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: 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 6464d428168cbab41a7cb96eb70d01288b26f49e..73432861608ed4e3a306b7411466f9380caaa867 100644
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
@@ -31,6 +31,7 @@
#include "platform/animation/CompositorAnimationTimeline.h"
#include "platform/animation/CompositorFloatAnimationCurve.h"
#include "platform/animation/CompositorTargetProperty.h"
+#include "platform/graphics/CompositorElementId.h"
#include "platform/scroll/ScrollableArea.h"
#include "platform/testing/FakeGraphicsLayer.h"
#include "platform/testing/FakeGraphicsLayerClient.h"
@@ -117,8 +118,10 @@ TEST_F(GraphicsLayerTest, updateLayerShouldFlattenTransformWithAnimations)
layerTreeView()->attachCompositorAnimationTimeline(compositorTimeline->animationTimeline());
compositorTimeline->playerAttached(player);
- player.compositorPlayer()->attachLayer(m_platformLayer);
- ASSERT_TRUE(player.compositorPlayer()->isLayerAttached());
+ m_platformLayer->setElementId(CompositorElementId(m_platformLayer->id(), 0));
+
+ player.compositorPlayer()->attachElement(m_platformLayer->elementId());
+ ASSERT_TRUE(player.compositorPlayer()->isElementAttached());
player.compositorPlayer()->addAnimation(floatAnimation.release());
@@ -140,8 +143,8 @@ TEST_F(GraphicsLayerTest, updateLayerShouldFlattenTransformWithAnimations)
ASSERT_FALSE(m_platformLayer->hasActiveAnimationForTesting());
- player.compositorPlayer()->detachLayer();
- ASSERT_FALSE(player.compositorPlayer()->isLayerAttached());
+ player.compositorPlayer()->detachElement();
+ ASSERT_FALSE(player.compositorPlayer()->isElementAttached());
compositorTimeline->playerDestroyed(player);
layerTreeView()->detachCompositorAnimationTimeline(compositorTimeline->animationTimeline());

Powered by Google App Engine
This is Rietveld 408576698