| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_THREADED_CHANNEL_H_ | 5 #ifndef CC_TREES_THREADED_CHANNEL_H_ |
| 6 #define CC_TREES_THREADED_CHANNEL_H_ | 6 #define CC_TREES_THREADED_CHANNEL_H_ |
| 7 | 7 |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 bool success, | 125 bool success, |
| 126 const RendererCapabilities& capabilities) override; | 126 const RendererCapabilities& capabilities) override; |
| 127 void DidCompletePageScaleAnimation() override; | 127 void DidCompletePageScaleAnimation() override; |
| 128 void PostFrameTimingEventsOnMain( | 128 void PostFrameTimingEventsOnMain( |
| 129 scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events, | 129 scoped_ptr<FrameTimingTracker::CompositeTimingSet> composite_events, |
| 130 scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) | 130 scoped_ptr<FrameTimingTracker::MainFrameTimingSet> main_frame_events) |
| 131 override; | 131 override; |
| 132 void BeginMainFrame( | 132 void BeginMainFrame( |
| 133 scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) override; | 133 scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state) override; |
| 134 | 134 |
| 135 // Should be called on impl thread only. | |
| 136 ProxyImpl* GetProxyImplForTesting() const; | |
| 137 | |
| 138 protected: | 135 protected: |
| 139 ThreadedChannel(ProxyMain* proxy_main, | 136 ThreadedChannel(ProxyMain* proxy_main, |
| 140 TaskRunnerProvider* task_runner_provider); | 137 TaskRunnerProvider* task_runner_provider); |
| 141 | 138 |
| 142 // Virtual for testing. | 139 // Virtual for testing. |
| 143 virtual scoped_ptr<ProxyImpl> CreateProxyImpl( | 140 virtual scoped_ptr<ProxyImpl> CreateProxyImpl( |
| 144 ChannelImpl* channel_impl, | 141 ChannelImpl* channel_impl, |
| 145 LayerTreeHost* layer_tree_host, | 142 LayerTreeHost* layer_tree_host, |
| 146 TaskRunnerProvider* task_runner_provider, | 143 TaskRunnerProvider* task_runner_provider, |
| 147 scoped_ptr<BeginFrameSource> external_begin_frame_source); | 144 scoped_ptr<BeginFrameSource> external_begin_frame_source); |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 // Used on the main thread to safely queue calls to ProxyImpl to be run on the | 207 // Used on the main thread to safely queue calls to ProxyImpl to be run on the |
| 211 // impl thread. | 208 // impl thread. |
| 212 base::WeakPtr<ProxyImpl> proxy_impl_weak_ptr_; | 209 base::WeakPtr<ProxyImpl> proxy_impl_weak_ptr_; |
| 213 | 210 |
| 214 DISALLOW_COPY_AND_ASSIGN(ThreadedChannel); | 211 DISALLOW_COPY_AND_ASSIGN(ThreadedChannel); |
| 215 }; | 212 }; |
| 216 | 213 |
| 217 } // namespace cc | 214 } // namespace cc |
| 218 | 215 |
| 219 #endif // CC_TREES_THREADED_CHANNEL_H_ | 216 #endif // CC_TREES_THREADED_CHANNEL_H_ |
| OLD | NEW |