| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "WebLayerImpl.h" | |
| 8 #include "WebLayerTreeViewImpl.h" | |
| 9 #include "WebLayerTreeViewTestCommon.h" | |
| 10 #include "base/memory/ref_counted.h" | 7 #include "base/memory/ref_counted.h" |
| 11 #include "cc/test/compositor_fake_web_graphics_context_3d.h" | 8 #include "cc/test/compositor_fake_web_graphics_context_3d.h" |
| 12 #include "cc/test/fake_web_compositor_output_surface.h" | 9 #include "cc/test/fake_web_compositor_output_surface.h" |
| 13 #include "testing/gmock/include/gmock/gmock.h" | 10 #include "testing/gmock/include/gmock/gmock.h" |
| 14 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" | 11 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" |
| 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSuppor
t.h" | 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSuppor
t.h" |
| 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" | 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" |
| 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewCli
ent.h" |
| 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" | 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" |
| 18 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewCli
ent.h" | |
| 19 #include "third_party/WebKit/Source/Platform/chromium/public/WebThread.h" | 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebThread.h" |
| 17 #include "web_layer_impl.h" |
| 18 #include "web_layer_tree_view_impl.h" |
| 19 #include "web_layer_tree_view_test_common.h" |
| 20 | 20 |
| 21 using namespace WebKit; | 21 using namespace WebKit; |
| 22 using testing::Mock; | 22 using testing::Mock; |
| 23 using testing::Test; | 23 using testing::Test; |
| 24 | 24 |
| 25 namespace { | 25 namespace { |
| 26 | 26 |
| 27 class MockWebLayerTreeViewClientForThreadedTests : public MockWebLayerTreeViewCl
ient { | 27 class MockWebLayerTreeViewClientForThreadedTests : public MockWebLayerTreeViewCl
ient { |
| 28 public: | 28 public: |
| 29 virtual void didBeginFrame() OVERRIDE | 29 virtual void didBeginFrame() OVERRIDE |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 | 183 |
| 184 EXPECT_CALL(m_client, willBeginFrame()); | 184 EXPECT_CALL(m_client, willBeginFrame()); |
| 185 EXPECT_CALL(m_client, willCommit()); | 185 EXPECT_CALL(m_client, willCommit()); |
| 186 EXPECT_CALL(m_client, didCommit()); | 186 EXPECT_CALL(m_client, didCommit()); |
| 187 EXPECT_CALL(m_client, didBeginFrame()); | 187 EXPECT_CALL(m_client, didBeginFrame()); |
| 188 | 188 |
| 189 composite(); | 189 composite(); |
| 190 } | 190 } |
| 191 | 191 |
| 192 } // namespace | 192 } // namespace |
| OLD | NEW |