| 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 #ifndef CC_TREES_SINGLE_THREAD_PROXY_H_ | 5 #ifndef CC_TREES_SINGLE_THREAD_PROXY_H_ |
| 6 #define CC_TREES_SINGLE_THREAD_PROXY_H_ | 6 #define CC_TREES_SINGLE_THREAD_PROXY_H_ |
| 7 | 7 |
| 8 #include <limits> | 8 #include <limits> |
| 9 | 9 |
| 10 #include "base/cancelable_callback.h" | 10 #include "base/cancelable_callback.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 void DidCompletePageScaleAnimationOnImplThread() override; | 109 void DidCompletePageScaleAnimationOnImplThread() override; |
| 110 void OnDrawForOutputSurface() override; | 110 void OnDrawForOutputSurface() override; |
| 111 void PostFrameTimingEventsOnImplThread( | 111 void PostFrameTimingEventsOnImplThread( |
| 112 scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events, | 112 scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events, |
| 113 scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) | 113 scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) |
| 114 override; | 114 override; |
| 115 | 115 |
| 116 void RequestNewOutputSurface(); | 116 void RequestNewOutputSurface(); |
| 117 | 117 |
| 118 // Called by the legacy path where RenderWidget does the scheduling. | 118 // Called by the legacy path where RenderWidget does the scheduling. |
| 119 void LayoutAndUpdateLayers(); | |
| 120 void CompositeImmediately(base::TimeTicks frame_begin_time); | 119 void CompositeImmediately(base::TimeTicks frame_begin_time); |
| 121 | 120 |
| 122 protected: | 121 protected: |
| 123 SingleThreadProxy( | 122 SingleThreadProxy( |
| 124 LayerTreeHost* layer_tree_host, | 123 LayerTreeHost* layer_tree_host, |
| 125 LayerTreeHostSingleThreadClient* client, | 124 LayerTreeHostSingleThreadClient* client, |
| 126 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, | 125 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |
| 127 scoped_ptr<BeginFrameSource> external_begin_frame_source); | 126 scoped_ptr<BeginFrameSource> external_begin_frame_source); |
| 128 | 127 |
| 129 private: | 128 private: |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 private: | 236 private: |
| 238 DebugScopedSetImplThread impl_thread_; | 237 DebugScopedSetImplThread impl_thread_; |
| 239 DebugScopedSetMainThreadBlocked main_thread_blocked_; | 238 DebugScopedSetMainThreadBlocked main_thread_blocked_; |
| 240 | 239 |
| 241 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); | 240 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked); |
| 242 }; | 241 }; |
| 243 | 242 |
| 244 } // namespace cc | 243 } // namespace cc |
| 245 | 244 |
| 246 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ | 245 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_ |
| OLD | NEW |