Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Side by Side Diff: content/browser/android/in_process/synchronous_compositor_factory_impl.cc

Issue 1126963006: Move VISUAL_STATE promise to activation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Current state (presubmit warnings, cc_unittests tests failing) Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/observer_list.h" 8 #include "base/observer_list.h"
9 #include "content/browser/android/in_process/context_provider_in_process.h" 9 #include "content/browser/android/in_process/context_provider_in_process.h"
10 #include "content/browser/android/in_process/synchronous_compositor_external_beg in_frame_source.h" 10 #include "content/browser/android/in_process/synchronous_compositor_external_beg in_frame_source.h"
11 #include "content/browser/android/in_process/synchronous_compositor_impl.h" 11 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
12 #include "content/browser/android/in_process/synchronous_compositor_output_surfa ce.h" 12 #include "content/browser/android/in_process/synchronous_compositor_output_surfa ce.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "content/renderer/gpu/frame_swap_message_queue.h" 14 #include "content/renderer/gpu/frame_update_message_queue.h"
15 #include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" 15 #include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h"
16 #include "gpu/command_buffer/client/gl_in_process_context.h" 16 #include "gpu/command_buffer/client/gl_in_process_context.h"
17 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 17 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
18 #include "gpu/command_buffer/service/gpu_switches.h" 18 #include "gpu/command_buffer/service/gpu_switches.h"
19 #include "ui/gl/android/surface_texture.h" 19 #include "ui/gl/android/surface_texture.h"
20 #include "ui/gl/gl_surface.h" 20 #include "ui/gl/gl_surface.h"
21 #include "ui/gl/gl_surface_stub.h" 21 #include "ui/gl/gl_surface_stub.h"
22 22
23 using cc_blink::ContextProviderWebContext; 23 using cc_blink::ContextProviderWebContext;
24 using gpu_blink::WebGraphicsContext3DImpl; 24 using gpu_blink::WebGraphicsContext3DImpl;
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 } 141 }
142 142
143 bool 143 bool
144 SynchronousCompositorFactoryImpl::RecordFullLayer() { 144 SynchronousCompositorFactoryImpl::RecordFullLayer() {
145 return record_full_layer_; 145 return record_full_layer_;
146 } 146 }
147 147
148 scoped_ptr<cc::OutputSurface> 148 scoped_ptr<cc::OutputSurface>
149 SynchronousCompositorFactoryImpl::CreateOutputSurface( 149 SynchronousCompositorFactoryImpl::CreateOutputSurface(
150 int routing_id, 150 int routing_id,
151 scoped_refptr<content::FrameSwapMessageQueue> frame_swap_message_queue) { 151 scoped_refptr<content::FrameUpdateMessageQueue> frame_update_message_queue) {
152 scoped_refptr<cc::ContextProvider> onscreen_context = 152 scoped_refptr<cc::ContextProvider> onscreen_context =
153 CreateContextProviderForCompositor(); 153 CreateContextProviderForCompositor();
154 scoped_refptr<cc::ContextProvider> worker_context = 154 scoped_refptr<cc::ContextProvider> worker_context =
155 CreateContextProviderForCompositor(); 155 CreateContextProviderForCompositor();
156 156
157 return make_scoped_ptr(new SynchronousCompositorOutputSurface( 157 return make_scoped_ptr(new SynchronousCompositorOutputSurface(
158 onscreen_context, worker_context, routing_id, frame_swap_message_queue)); 158 onscreen_context, worker_context, routing_id, frame_update_message_queue)) ;
159 } 159 }
160 160
161 InputHandlerManagerClient* 161 InputHandlerManagerClient*
162 SynchronousCompositorFactoryImpl::GetInputHandlerManagerClient() { 162 SynchronousCompositorFactoryImpl::GetInputHandlerManagerClient() {
163 return synchronous_input_event_filter(); 163 return synchronous_input_event_filter();
164 } 164 }
165 165
166 scoped_ptr<cc::BeginFrameSource> 166 scoped_ptr<cc::BeginFrameSource>
167 SynchronousCompositorFactoryImpl::CreateExternalBeginFrameSource( 167 SynchronousCompositorFactoryImpl::CreateExternalBeginFrameSource(
168 int routing_id) { 168 int routing_id) {
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 DCHECK(!service_.get()); 280 DCHECK(!service_.get());
281 service_ = service; 281 service_ = service;
282 } 282 }
283 283
284 void SynchronousCompositorFactoryImpl::SetRecordFullDocument( 284 void SynchronousCompositorFactoryImpl::SetRecordFullDocument(
285 bool record_full_document) { 285 bool record_full_document) {
286 record_full_layer_ = record_full_document; 286 record_full_layer_ = record_full_document;
287 } 287 }
288 288
289 } // namespace content 289 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698