| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
Y | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
Y |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
Y | 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
Y |
| 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
N | 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
N |
| 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
| 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 23 */ | 23 */ |
| 24 | 24 |
| 25 #include "platform/graphics/GraphicsLayer.h" | 25 #include "platform/graphics/GraphicsLayer.h" |
| 26 | 26 |
| 27 #include "platform/CompositorFactory.h" |
| 27 #include "platform/RuntimeEnabledFeatures.h" | 28 #include "platform/RuntimeEnabledFeatures.h" |
| 29 #include "platform/animation/WebFloatAnimationCurve.h" |
| 28 #include "platform/scroll/ScrollableArea.h" | 30 #include "platform/scroll/ScrollableArea.h" |
| 29 #include "platform/transforms/Matrix3DTransformOperation.h" | 31 #include "platform/transforms/Matrix3DTransformOperation.h" |
| 30 #include "platform/transforms/RotateTransformOperation.h" | 32 #include "platform/transforms/RotateTransformOperation.h" |
| 31 #include "platform/transforms/TranslateTransformOperation.h" | 33 #include "platform/transforms/TranslateTransformOperation.h" |
| 32 #include "public/platform/Platform.h" | 34 #include "public/platform/Platform.h" |
| 33 #include "public/platform/WebCompositorAnimationPlayer.h" | 35 #include "public/platform/WebCompositorAnimationPlayer.h" |
| 34 #include "public/platform/WebCompositorAnimationPlayerClient.h" | 36 #include "public/platform/WebCompositorAnimationPlayerClient.h" |
| 35 #include "public/platform/WebCompositorAnimationTimeline.h" | 37 #include "public/platform/WebCompositorAnimationTimeline.h" |
| 36 #include "public/platform/WebCompositorSupport.h" | 38 #include "public/platform/WebCompositorSupport.h" |
| 37 #include "public/platform/WebFloatAnimationCurve.h" | |
| 38 #include "public/platform/WebGraphicsContext3D.h" | 39 #include "public/platform/WebGraphicsContext3D.h" |
| 39 #include "public/platform/WebLayer.h" | 40 #include "public/platform/WebLayer.h" |
| 40 #include "public/platform/WebLayerTreeView.h" | 41 #include "public/platform/WebLayerTreeView.h" |
| 41 #include "public/platform/WebUnitTestSupport.h" | 42 #include "public/platform/WebUnitTestSupport.h" |
| 42 #include "testing/gtest/include/gtest/gtest.h" | 43 #include "testing/gtest/include/gtest/gtest.h" |
| 43 #include "wtf/PassOwnPtr.h" | 44 #include "wtf/PassOwnPtr.h" |
| 44 | 45 |
| 45 namespace blink { | 46 namespace blink { |
| 46 | 47 |
| 47 namespace { | 48 namespace { |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 return m_compositorPlayer.get(); | 113 return m_compositorPlayer.get(); |
| 113 } | 114 } |
| 114 | 115 |
| 115 OwnPtr<WebCompositorAnimationPlayer> m_compositorPlayer; | 116 OwnPtr<WebCompositorAnimationPlayer> m_compositorPlayer; |
| 116 }; | 117 }; |
| 117 | 118 |
| 118 TEST_F(GraphicsLayerTest, updateLayerShouldFlattenTransformWithAnimations) | 119 TEST_F(GraphicsLayerTest, updateLayerShouldFlattenTransformWithAnimations) |
| 119 { | 120 { |
| 120 ASSERT_FALSE(m_platformLayer->hasActiveAnimation()); | 121 ASSERT_FALSE(m_platformLayer->hasActiveAnimation()); |
| 121 | 122 |
| 122 OwnPtr<WebFloatAnimationCurve> curve = adoptPtr(Platform::current()->composi
torSupport()->createFloatAnimationCurve()); | 123 OwnPtr<WebFloatAnimationCurve> curve = adoptPtr(CompositorFactory::current()
.createFloatAnimationCurve()); |
| 123 curve->add(WebFloatKeyframe(0.0, 0.0)); | 124 curve->add(WebFloatKeyframe(0.0, 0.0)); |
| 124 OwnPtr<WebCompositorAnimation> floatAnimation(adoptPtr(Platform::current()->
compositorSupport()->createAnimation(*curve, WebCompositorAnimation::TargetPrope
rtyOpacity))); | 125 OwnPtr<WebCompositorAnimation> floatAnimation(adoptPtr(Platform::current()->
compositorSupport()->createAnimation(*curve, WebCompositorAnimation::TargetPrope
rtyOpacity))); |
| 125 int animationId = floatAnimation->id(); | 126 int animationId = floatAnimation->id(); |
| 126 | 127 |
| 127 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) { | 128 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) { |
| 128 OwnPtr<WebCompositorAnimationTimeline> compositorTimeline = adoptPtr(Pla
tform::current()->compositorSupport()->createAnimationTimeline()); | 129 OwnPtr<WebCompositorAnimationTimeline> compositorTimeline = adoptPtr(Pla
tform::current()->compositorSupport()->createAnimationTimeline()); |
| 129 AnimationPlayerForTesting player; | 130 AnimationPlayerForTesting player; |
| 130 | 131 |
| 131 layerTreeView()->attachCompositorAnimationTimeline(compositorTimeline.ge
t()); | 132 layerTreeView()->attachCompositorAnimationTimeline(compositorTimeline.ge
t()); |
| 132 compositorTimeline->playerAttached(player); | 133 compositorTimeline->playerAttached(player); |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 | 231 |
| 231 WebDoublePoint scrollPosition(7, 9); | 232 WebDoublePoint scrollPosition(7, 9); |
| 232 m_platformLayer->setScrollPositionDouble(scrollPosition); | 233 m_platformLayer->setScrollPositionDouble(scrollPosition); |
| 233 m_graphicsLayer->didScroll(); | 234 m_graphicsLayer->didScroll(); |
| 234 | 235 |
| 235 EXPECT_FLOAT_EQ(scrollPosition.x, scrollableArea->scrollPositionDouble().x()
); | 236 EXPECT_FLOAT_EQ(scrollPosition.x, scrollableArea->scrollPositionDouble().x()
); |
| 236 EXPECT_FLOAT_EQ(scrollPosition.y, scrollableArea->scrollPositionDouble().y()
); | 237 EXPECT_FLOAT_EQ(scrollPosition.y, scrollableArea->scrollPositionDouble().y()
); |
| 237 } | 238 } |
| 238 | 239 |
| 239 } // namespace blink | 240 } // namespace blink |
| OLD | NEW |