OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/browser/android/in_process/synchronous_compositor_factory_impl
.h" | 5 #include "content/browser/android/in_process/synchronous_compositor_factory_impl
.h" |
6 | 6 |
7 #include "content/browser/android/in_process/synchronous_compositor_output_surfa
ce.h" | 7 #include "content/browser/android/in_process/synchronous_compositor_output_surfa
ce.h" |
8 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
| 9 #include "content/renderer/gpu/frame_swap_message_queue.h" |
9 #include "gpu/command_buffer/client/gl_in_process_context.h" | 10 #include "gpu/command_buffer/client/gl_in_process_context.h" |
10 #include "ui/gl/android/surface_texture.h" | 11 #include "ui/gl/android/surface_texture.h" |
11 #include "ui/gl/gl_surface.h" | 12 #include "ui/gl/gl_surface.h" |
12 #include "ui/gl/gl_surface_stub.h" | 13 #include "ui/gl/gl_surface_stub.h" |
13 #include "webkit/common/gpu/context_provider_in_process.h" | 14 #include "webkit/common/gpu/context_provider_in_process.h" |
14 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.
h" | 15 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.
h" |
15 | 16 |
16 using webkit::gpu::ContextProviderWebContext; | 17 using webkit::gpu::ContextProviderWebContext; |
17 | 18 |
18 namespace content { | 19 namespace content { |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 SynchronousCompositorFactoryImpl::GetCompositorMessageLoop() { | 147 SynchronousCompositorFactoryImpl::GetCompositorMessageLoop() { |
147 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI); | 148 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI); |
148 } | 149 } |
149 | 150 |
150 bool | 151 bool |
151 SynchronousCompositorFactoryImpl::RecordFullLayer() { | 152 SynchronousCompositorFactoryImpl::RecordFullLayer() { |
152 return record_full_layer_; | 153 return record_full_layer_; |
153 } | 154 } |
154 | 155 |
155 scoped_ptr<cc::OutputSurface> | 156 scoped_ptr<cc::OutputSurface> |
156 SynchronousCompositorFactoryImpl::CreateOutputSurface(int routing_id) { | 157 SynchronousCompositorFactoryImpl::CreateOutputSurface( |
| 158 int routing_id, |
| 159 scoped_refptr<content::FrameSwapMessageQueue> frame_swap_message_queue) { |
157 scoped_ptr<SynchronousCompositorOutputSurface> output_surface( | 160 scoped_ptr<SynchronousCompositorOutputSurface> output_surface( |
158 new SynchronousCompositorOutputSurface(routing_id)); | 161 new SynchronousCompositorOutputSurface(routing_id, |
| 162 frame_swap_message_queue)); |
159 return output_surface.PassAs<cc::OutputSurface>(); | 163 return output_surface.PassAs<cc::OutputSurface>(); |
160 } | 164 } |
161 | 165 |
162 InputHandlerManagerClient* | 166 InputHandlerManagerClient* |
163 SynchronousCompositorFactoryImpl::GetInputHandlerManagerClient() { | 167 SynchronousCompositorFactoryImpl::GetInputHandlerManagerClient() { |
164 return synchronous_input_event_filter(); | 168 return synchronous_input_event_filter(); |
165 } | 169 } |
166 | 170 |
167 scoped_refptr<ContextProviderWebContext> SynchronousCompositorFactoryImpl:: | 171 scoped_refptr<ContextProviderWebContext> SynchronousCompositorFactoryImpl:: |
168 GetSharedOffscreenContextProviderForMainThread() { | 172 GetSharedOffscreenContextProviderForMainThread() { |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
258 DCHECK(!service_); | 262 DCHECK(!service_); |
259 service_ = service; | 263 service_ = service; |
260 } | 264 } |
261 | 265 |
262 void SynchronousCompositorFactoryImpl::SetRecordFullDocument( | 266 void SynchronousCompositorFactoryImpl::SetRecordFullDocument( |
263 bool record_full_document) { | 267 bool record_full_document) { |
264 record_full_layer_ = record_full_document; | 268 record_full_layer_ = record_full_document; |
265 } | 269 } |
266 | 270 |
267 } // namespace content | 271 } // namespace content |
OLD | NEW |