| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "cc/layer.h" | 7 #include "cc/layer.h" |
| 8 | 8 |
| 9 #include "cc/keyframed_animation_curve.h" | 9 #include "cc/keyframed_animation_curve.h" |
| 10 #include "cc/layer_impl.h" | 10 #include "cc/layer_impl.h" |
| 11 #include "cc/layer_painter.h" | 11 #include "cc/layer_painter.h" |
| 12 #include "cc/layer_tree_host.h" | 12 #include "cc/layer_tree_host.h" |
| 13 #include "cc/settings.h" | 13 #include "cc/settings.h" |
| 14 #include "cc/single_thread_proxy.h" | 14 #include "cc/single_thread_proxy.h" |
| 15 #include "cc/thread.h" | 15 #include "cc/thread.h" |
| 16 #include "cc/test/fake_layer_tree_host_client.h" | 16 #include "cc/test/fake_layer_tree_host_client.h" |
| 17 #include "cc/test/geometry_test_utils.h" | 17 #include "cc/test/geometry_test_utils.h" |
| 18 #include "cc/test/test_common.h" | 18 #include "cc/test/test_common.h" |
| 19 #include "testing/gmock/include/gmock/gmock.h" | 19 #include "testing/gmock/include/gmock/gmock.h" |
| 20 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
| 21 #include <public/WebTransformationMatrix.h> | 21 #include <public/WebTransformationMatrix.h> |
| 22 | 22 |
| 23 using namespace cc; | |
| 24 using namespace WebKitTests; | 23 using namespace WebKitTests; |
| 25 using WebKit::WebTransformationMatrix; | 24 using WebKit::WebTransformationMatrix; |
| 26 using ::testing::Mock; | 25 using ::testing::Mock; |
| 27 using ::testing::_; | 26 using ::testing::_; |
| 28 using ::testing::AtLeast; | 27 using ::testing::AtLeast; |
| 29 using ::testing::AnyNumber; | 28 using ::testing::AnyNumber; |
| 30 | 29 |
| 31 #define EXECUTE_AND_VERIFY_SET_NEEDS_COMMIT_BEHAVIOR(numTimesExpectedSetNeedsCom
mit, codeToTest) do { \ | 30 #define EXECUTE_AND_VERIFY_SET_NEEDS_COMMIT_BEHAVIOR(numTimesExpectedSetNeedsCom
mit, codeToTest) do { \ |
| 32 EXPECT_CALL(*m_layerTreeHost, setNeedsCommit()).Times((numTimesExpectedS
etNeedsCommit)); \ | 31 EXPECT_CALL(*m_layerTreeHost, setNeedsCommit()).Times((numTimesExpectedS
etNeedsCommit)); \ |
| 33 codeToTest;
\ | 32 codeToTest;
\ |
| 34 Mock::VerifyAndClearExpectations(m_layerTreeHost.get());
\ | 33 Mock::VerifyAndClearExpectations(m_layerTreeHost.get());
\ |
| 35 } while (0) | 34 } while (0) |
| 36 | 35 |
| 36 namespace cc { |
| 37 namespace { | 37 namespace { |
| 38 | 38 |
| 39 class MockLayerImplTreeHost : public LayerTreeHost { | 39 class MockLayerImplTreeHost : public LayerTreeHost { |
| 40 public: | 40 public: |
| 41 MockLayerImplTreeHost() | 41 MockLayerImplTreeHost() |
| 42 : LayerTreeHost(&m_fakeClient, LayerTreeSettings()) | 42 : LayerTreeHost(&m_fakeClient, LayerTreeSettings()) |
| 43 { | 43 { |
| 44 initialize(scoped_ptr<Thread>(NULL)); | 44 initialize(scoped_ptr<Thread>(NULL)); |
| 45 } | 45 } |
| 46 | 46 |
| (...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 TEST(LayerTestWithoutFixture, setBoundsTriggersSetNeedsRedrawAfterGettingNonEmpt
yBounds) | 790 TEST(LayerTestWithoutFixture, setBoundsTriggersSetNeedsRedrawAfterGettingNonEmpt
yBounds) |
| 791 { | 791 { |
| 792 scoped_refptr<MockLayer> layer(new MockLayer); | 792 scoped_refptr<MockLayer> layer(new MockLayer); |
| 793 EXPECT_FALSE(layer->needsDisplay()); | 793 EXPECT_FALSE(layer->needsDisplay()); |
| 794 layer->setBounds(gfx::Size(0, 10)); | 794 layer->setBounds(gfx::Size(0, 10)); |
| 795 EXPECT_FALSE(layer->needsDisplay()); | 795 EXPECT_FALSE(layer->needsDisplay()); |
| 796 layer->setBounds(gfx::Size(10, 10)); | 796 layer->setBounds(gfx::Size(10, 10)); |
| 797 EXPECT_TRUE(layer->needsDisplay()); | 797 EXPECT_TRUE(layer->needsDisplay()); |
| 798 } | 798 } |
| 799 | 799 |
| 800 | 800 } // namespace |
| 801 } // anonymous namespace | 801 } // namespace cc |
| OLD | NEW |