| 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 "core/animation/AnimationTranslationUtil.h" | 25 #include "core/animation/AnimationTranslationUtil.h" |
| 26 | 26 |
| 27 #include "platform/animation/CompositorTransformOperations.h" |
| 28 #include "platform/graphics/CompositorFilterOperations.h" |
| 27 #include "platform/graphics/filters/FilterOperations.h" | 29 #include "platform/graphics/filters/FilterOperations.h" |
| 28 #include "platform/transforms/Matrix3DTransformOperation.h" | 30 #include "platform/transforms/Matrix3DTransformOperation.h" |
| 29 #include "platform/transforms/RotateTransformOperation.h" | 31 #include "platform/transforms/RotateTransformOperation.h" |
| 30 #include "platform/transforms/ScaleTransformOperation.h" | 32 #include "platform/transforms/ScaleTransformOperation.h" |
| 31 #include "platform/transforms/TransformOperations.h" | 33 #include "platform/transforms/TransformOperations.h" |
| 32 #include "platform/transforms/TranslateTransformOperation.h" | 34 #include "platform/transforms/TranslateTransformOperation.h" |
| 33 #include "public/platform/WebFilterOperations.h" | |
| 34 #include "public/platform/WebTransformOperations.h" | |
| 35 #include "testing/gmock/include/gmock/gmock.h" | 35 #include "testing/gmock/include/gmock/gmock.h" |
| 36 #include "testing/gtest/include/gtest/gtest.h" | 36 #include "testing/gtest/include/gtest/gtest.h" |
| 37 #include "wtf/RefPtr.h" | 37 #include "wtf/RefPtr.h" |
| 38 | 38 |
| 39 namespace blink { | 39 namespace blink { |
| 40 | 40 |
| 41 class WebTransformOperationsMock : public WebTransformOperations { | 41 class WebTransformOperationsMock : public CompositorTransformOperations { |
| 42 public: | 42 public: |
| 43 MOCK_CONST_METHOD1(canBlendWith, bool(const WebTransformOperations&)); | 43 MOCK_CONST_METHOD1(canBlendWith, bool(const CompositorTransformOperations&))
; |
| 44 MOCK_METHOD3(appendTranslate, void(double, double, double)); | 44 MOCK_METHOD3(appendTranslate, void(double, double, double)); |
| 45 MOCK_METHOD4(appendRotate, void(double, double, double, double)); | 45 MOCK_METHOD4(appendRotate, void(double, double, double, double)); |
| 46 MOCK_METHOD3(appendScale, void(double, double, double)); | 46 MOCK_METHOD3(appendScale, void(double, double, double)); |
| 47 MOCK_METHOD2(appendSkew, void(double, double)); | 47 MOCK_METHOD2(appendSkew, void(double, double)); |
| 48 MOCK_METHOD1(appendPerspective, void(double)); | 48 MOCK_METHOD1(appendPerspective, void(double)); |
| 49 MOCK_METHOD1(appendMatrix, void(const SkMatrix44&)); | 49 MOCK_METHOD1(appendMatrix, void(const SkMatrix44&)); |
| 50 MOCK_METHOD0(appendIdentity, void()); | 50 MOCK_METHOD0(appendIdentity, void()); |
| 51 MOCK_CONST_METHOD0(isIdentity, bool()); | 51 MOCK_CONST_METHOD0(isIdentity, bool()); |
| 52 }; | 52 }; |
| 53 | 53 |
| 54 class WebFilterOperationsMock : public WebFilterOperations { | 54 class WebFilterOperationsMock : public CompositorFilterOperations { |
| 55 public: | 55 public: |
| 56 MOCK_METHOD1(appendGrayscaleFilter, void(float)); | 56 MOCK_METHOD1(appendGrayscaleFilter, void(float)); |
| 57 MOCK_METHOD1(appendSepiaFilter, void(float)); | 57 MOCK_METHOD1(appendSepiaFilter, void(float)); |
| 58 MOCK_METHOD1(appendSaturateFilter, void(float)); | 58 MOCK_METHOD1(appendSaturateFilter, void(float)); |
| 59 MOCK_METHOD1(appendHueRotateFilter, void(float)); | 59 MOCK_METHOD1(appendHueRotateFilter, void(float)); |
| 60 MOCK_METHOD1(appendInvertFilter, void(float)); | 60 MOCK_METHOD1(appendInvertFilter, void(float)); |
| 61 MOCK_METHOD1(appendBrightnessFilter, void(float)); | 61 MOCK_METHOD1(appendBrightnessFilter, void(float)); |
| 62 MOCK_METHOD1(appendContrastFilter, void(float)); | 62 MOCK_METHOD1(appendContrastFilter, void(float)); |
| 63 MOCK_METHOD1(appendOpacityFilter, void(float)); | 63 MOCK_METHOD1(appendOpacityFilter, void(float)); |
| 64 MOCK_METHOD1(appendBlurFilter, void(float)); | 64 MOCK_METHOD1(appendBlurFilter, void(float)); |
| 65 MOCK_METHOD3(appendDropShadowFilter, void(WebPoint, float, WebColor)); | 65 MOCK_METHOD3(appendDropShadowFilter, void(IntPoint, float, Color)); |
| 66 MOCK_METHOD1(appendColorMatrixFilter, void(SkScalar[20])); | 66 MOCK_METHOD1(appendColorMatrixFilter, void(SkScalar[20])); |
| 67 MOCK_METHOD2(appendZoomFilter, void(float, int)); | 67 MOCK_METHOD2(appendZoomFilter, void(float, int)); |
| 68 MOCK_METHOD1(appendSaturatingBrightnessFilter, void(float)); | 68 MOCK_METHOD1(appendSaturatingBrightnessFilter, void(float)); |
| 69 MOCK_METHOD1(appendReferenceFilter, void(SkImageFilter*)); | 69 MOCK_METHOD1(appendReferenceFilter, void(SkImageFilter*)); |
| 70 MOCK_METHOD0(clear, void()); | 70 MOCK_METHOD0(clear, void()); |
| 71 MOCK_CONST_METHOD0(isEmpty, bool()); | 71 MOCK_CONST_METHOD0(isEmpty, bool()); |
| 72 }; | 72 }; |
| 73 | 73 |
| 74 TEST(AnimationTranslationUtilTest, transformsWork) | 74 TEST(AnimationTranslationUtilTest, transformsWork) |
| 75 { | 75 { |
| 76 TransformOperations ops; | 76 TransformOperations ops; |
| 77 WebTransformOperationsMock outOps; | 77 WebTransformOperationsMock outOps; |
| 78 | 78 |
| 79 EXPECT_CALL(outOps, appendTranslate(2, 0, 0)); | 79 EXPECT_CALL(outOps, appendTranslate(2, 0, 0)); |
| 80 EXPECT_CALL(outOps, appendRotate(0.1, 0.2, 0.3, 200000.4)); | 80 EXPECT_CALL(outOps, appendRotate(0.1, 0.2, 0.3, 200000.4)); |
| 81 EXPECT_CALL(outOps, appendScale(50.2, 100, -4)); | 81 EXPECT_CALL(outOps, appendScale(50.2, 100, -4)); |
| 82 | 82 |
| 83 ops.operations().append(TranslateTransformOperation::create(Length(2, Fixed)
, Length(0, Fixed), TransformOperation::TranslateX)); | 83 ops.operations().append(TranslateTransformOperation::create(Length(2, Fixed)
, Length(0, Fixed), TransformOperation::TranslateX)); |
| 84 ops.operations().append(RotateTransformOperation::create(0.1, 0.2, 0.3, 2000
00.4, TransformOperation::Rotate3D)); | 84 ops.operations().append(RotateTransformOperation::create(0.1, 0.2, 0.3, 2000
00.4, TransformOperation::Rotate3D)); |
| 85 ops.operations().append(ScaleTransformOperation::create(50.2, 100, -4, Trans
formOperation::Scale3D)); | 85 ops.operations().append(ScaleTransformOperation::create(50.2, 100, -4, Trans
formOperation::Scale3D)); |
| 86 toWebTransformOperations(ops, &outOps); | 86 toCompositorTransformOperations(ops, &outOps); |
| 87 } | 87 } |
| 88 | 88 |
| 89 TEST(AnimationTranslationUtilTest, filtersWork) | 89 TEST(AnimationTranslationUtilTest, filtersWork) |
| 90 { | 90 { |
| 91 FilterOperations ops; | 91 FilterOperations ops; |
| 92 WebFilterOperationsMock outOps; | 92 WebFilterOperationsMock outOps; |
| 93 | 93 |
| 94 EXPECT_CALL(outOps, appendSaturateFilter(0.5)); | 94 EXPECT_CALL(outOps, appendSaturateFilter(0.5)); |
| 95 EXPECT_CALL(outOps, appendGrayscaleFilter(0.2f)); | 95 EXPECT_CALL(outOps, appendGrayscaleFilter(0.2f)); |
| 96 EXPECT_CALL(outOps, appendSepiaFilter(0.8f)); | 96 EXPECT_CALL(outOps, appendSepiaFilter(0.8f)); |
| 97 EXPECT_CALL(outOps, appendOpacityFilter(0.1f)); | 97 EXPECT_CALL(outOps, appendOpacityFilter(0.1f)); |
| 98 | 98 |
| 99 ops.operations().append(BasicColorMatrixFilterOperation::create(0.5, FilterO
peration::SATURATE)); | 99 ops.operations().append(BasicColorMatrixFilterOperation::create(0.5, FilterO
peration::SATURATE)); |
| 100 ops.operations().append(BasicColorMatrixFilterOperation::create(0.2, FilterO
peration::GRAYSCALE)); | 100 ops.operations().append(BasicColorMatrixFilterOperation::create(0.2, FilterO
peration::GRAYSCALE)); |
| 101 ops.operations().append(BasicColorMatrixFilterOperation::create(0.8, FilterO
peration::SEPIA)); | 101 ops.operations().append(BasicColorMatrixFilterOperation::create(0.8, FilterO
peration::SEPIA)); |
| 102 ops.operations().append(BasicComponentTransferFilterOperation::create(0.1, F
ilterOperation::OPACITY)); | 102 ops.operations().append(BasicComponentTransferFilterOperation::create(0.1, F
ilterOperation::OPACITY)); |
| 103 toWebFilterOperations(ops, &outOps); | 103 toCompositorFilterOperations(ops, &outOps); |
| 104 } | 104 } |
| 105 | 105 |
| 106 } // namespace blink | 106 } // namespace blink |
| OLD | NEW |