| 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 <public/WebLayerTreeView.h> | 7 #include <public/WebLayerTreeView.h> |
| 8 | 8 |
| 9 #include "CompositorFakeWebGraphicsContext3D.h" | 9 #include "CompositorFakeWebGraphicsContext3D.h" |
| 10 #include "FakeWebCompositorOutputSurface.h" | 10 #include "FakeWebCompositorOutputSurface.h" |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 m_cancelableTask->runIfNotCanceled(); | 95 m_cancelableTask->runIfNotCanceled(); |
| 96 } | 96 } |
| 97 | 97 |
| 98 RefPtr<CancelableTaskWrapper> m_cancelableTask; | 98 RefPtr<CancelableTaskWrapper> m_cancelableTask; |
| 99 }; | 99 }; |
| 100 | 100 |
| 101 public: | 101 public: |
| 102 CancelableTaskWrapper(PassOwnPtr<WebThread::Task> task) | 102 CancelableTaskWrapper(PassOwnPtr<WebThread::Task> task) |
| 103 : m_task(task) | 103 : m_task(task) |
| 104 { | 104 { |
| 105 turnOffVerifier(); |
| 105 } | 106 } |
| 106 | 107 |
| 107 void cancel() | 108 void cancel() |
| 108 { | 109 { |
| 109 m_task.clear(); | 110 m_task.clear(); |
| 110 } | 111 } |
| 111 | 112 |
| 112 WebThread::Task* createTask() | 113 WebThread::Task* createTask() |
| 113 { | 114 { |
| 114 ASSERT(m_task); | 115 ASSERT(m_task); |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 | 179 |
| 179 EXPECT_CALL(m_client, willBeginFrame()); | 180 EXPECT_CALL(m_client, willBeginFrame()); |
| 180 EXPECT_CALL(m_client, willCommit()); | 181 EXPECT_CALL(m_client, willCommit()); |
| 181 EXPECT_CALL(m_client, didCommit()); | 182 EXPECT_CALL(m_client, didCommit()); |
| 182 EXPECT_CALL(m_client, didBeginFrame()); | 183 EXPECT_CALL(m_client, didBeginFrame()); |
| 183 | 184 |
| 184 composite(); | 185 composite(); |
| 185 } | 186 } |
| 186 | 187 |
| 187 } // namespace | 188 } // namespace |
| OLD | NEW |