| 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 "base/cancelable_callback.h" | 5 #include "base/cancelable_callback.h" |
| 6 #include "base/memory/ref_counted.h" | 6 #include "base/memory/ref_counted.h" |
| 7 #include "base/threading/thread.h" | 7 #include "base/threading/thread.h" |
| 8 #include "cc/proxy.h" | 8 #include "cc/proxy.h" |
| 9 #include "cc/thread_impl.h" | 9 #include "cc/thread_impl.h" |
| 10 #include "cc/test/compositor_fake_web_graphics_context_3d.h" | 10 #include "cc/test/compositor_fake_web_graphics_context_3d.h" |
| 11 #include "cc/test/fake_web_compositor_output_surface.h" | |
| 12 #include "testing/gmock/include/gmock/gmock.h" | 11 #include "testing/gmock/include/gmock/gmock.h" |
| 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" | 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" |
| 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewCli
ent.h" | 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewCli
ent.h" |
| 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" | 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" |
| 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebThread.h" | 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebThread.h" |
| 17 #include "webkit/compositor_bindings/test/web_layer_tree_view_test_common.h" | 16 #include "webkit/compositor_bindings/test/web_layer_tree_view_test_common.h" |
| 18 #include "webkit/compositor_bindings/web_layer_impl.h" | 17 #include "webkit/compositor_bindings/web_layer_impl.h" |
| 19 #include "webkit/compositor_bindings/web_layer_tree_view_impl.h" | 18 #include "webkit/compositor_bindings/web_layer_tree_view_impl.h" |
| 20 | 19 |
| 21 using namespace WebKit; | 20 using namespace WebKit; |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 | 135 |
| 137 EXPECT_CALL(m_client, willBeginFrame()); | 136 EXPECT_CALL(m_client, willBeginFrame()); |
| 138 EXPECT_CALL(m_client, willCommit()); | 137 EXPECT_CALL(m_client, willCommit()); |
| 139 EXPECT_CALL(m_client, didCommit()); | 138 EXPECT_CALL(m_client, didCommit()); |
| 140 EXPECT_CALL(m_client, didBeginFrame()); | 139 EXPECT_CALL(m_client, didBeginFrame()); |
| 141 | 140 |
| 142 composite(); | 141 composite(); |
| 143 } | 142 } |
| 144 | 143 |
| 145 } // namespace | 144 } // namespace |
| OLD | NEW |