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 <stdint.h> | 7 #include <stdint.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 SynchronousCompositorFactoryImpl::~SynchronousCompositorFactoryImpl() {} | 97 SynchronousCompositorFactoryImpl::~SynchronousCompositorFactoryImpl() {} |
98 | 98 |
99 scoped_refptr<base::SingleThreadTaskRunner> | 99 scoped_refptr<base::SingleThreadTaskRunner> |
100 SynchronousCompositorFactoryImpl::GetCompositorTaskRunner() { | 100 SynchronousCompositorFactoryImpl::GetCompositorTaskRunner() { |
101 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI); | 101 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI); |
102 } | 102 } |
103 | 103 |
104 scoped_ptr<cc::OutputSurface> | 104 scoped_ptr<cc::OutputSurface> |
105 SynchronousCompositorFactoryImpl::CreateOutputSurface( | 105 SynchronousCompositorFactoryImpl::CreateOutputSurface( |
106 int routing_id, | 106 int routing_id, |
| 107 uint32_t output_surface_id, |
107 const scoped_refptr<FrameSwapMessageQueue>& frame_swap_message_queue, | 108 const scoped_refptr<FrameSwapMessageQueue>& frame_swap_message_queue, |
108 const scoped_refptr<cc::ContextProvider>& onscreen_context, | 109 const scoped_refptr<cc::ContextProvider>& onscreen_context, |
109 const scoped_refptr<cc::ContextProvider>& worker_context) { | 110 const scoped_refptr<cc::ContextProvider>& worker_context) { |
110 return make_scoped_ptr(new SynchronousCompositorOutputSurface( | 111 return make_scoped_ptr(new SynchronousCompositorOutputSurface( |
111 onscreen_context, worker_context, routing_id, | 112 onscreen_context, worker_context, routing_id, output_surface_id, |
112 SynchronousCompositorRegistryInProc::GetInstance(), | 113 SynchronousCompositorRegistryInProc::GetInstance(), |
113 frame_swap_message_queue)); | 114 frame_swap_message_queue)); |
114 } | 115 } |
115 | 116 |
116 InputHandlerManagerClient* | 117 InputHandlerManagerClient* |
117 SynchronousCompositorFactoryImpl::GetInputHandlerManagerClient() { | 118 SynchronousCompositorFactoryImpl::GetInputHandlerManagerClient() { |
118 return synchronous_input_event_filter(); | 119 return synchronous_input_event_filter(); |
119 } | 120 } |
120 | 121 |
121 SynchronousInputHandlerProxyClient* | 122 SynchronousInputHandlerProxyClient* |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
272 DCHECK(!android_view_service_.get()); | 273 DCHECK(!android_view_service_.get()); |
273 android_view_service_ = service; | 274 android_view_service_ = service; |
274 | 275 |
275 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 276 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
276 switches::kSingleProcess)) { | 277 switches::kSingleProcess)) { |
277 RenderThreadImpl::SetStreamTextureFactory(CreateStreamTextureFactory()); | 278 RenderThreadImpl::SetStreamTextureFactory(CreateStreamTextureFactory()); |
278 } | 279 } |
279 } | 280 } |
280 | 281 |
281 } // namespace content | 282 } // namespace content |
OLD | NEW |