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

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

Issue 221833009: cc: Move scheduling logic out of OutputSurface (Closed) Base URL: http://git.chromium.org/chromium/src.git@swapAck2Sched11
Patch Set: rebase; sami's comments Created 6 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_output_surfa ce.h" 5 #include "content/browser/android/in_process/synchronous_compositor_output_surfa ce.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "cc/output/begin_frame_args.h" 9 #include "cc/output/begin_frame_args.h"
10 #include "cc/output/compositor_frame.h" 10 #include "cc/output/compositor_frame.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 void SynchronousCompositorOutputSurface::SwapBuffers( 135 void SynchronousCompositorOutputSurface::SwapBuffers(
136 cc::CompositorFrame* frame) { 136 cc::CompositorFrame* frame) {
137 DCHECK(CalledOnValidThread()); 137 DCHECK(CalledOnValidThread());
138 if (!ForcedDrawToSoftwareDevice()) { 138 if (!ForcedDrawToSoftwareDevice()) {
139 DCHECK(context_provider_); 139 DCHECK(context_provider_);
140 context_provider_->ContextGL()->ShallowFlushCHROMIUM(); 140 context_provider_->ContextGL()->ShallowFlushCHROMIUM();
141 } 141 }
142 UpdateFrameMetaData(frame->metadata); 142 UpdateFrameMetaData(frame->metadata);
143 143
144 did_swap_buffer_ = true; 144 did_swap_buffer_ = true;
145 DidSwapBuffers(); 145 client_->DidSwapBuffers();
146 } 146 }
147 147
148 void SynchronousCompositorOutputSurface::UpdateFrameMetaData( 148 void SynchronousCompositorOutputSurface::UpdateFrameMetaData(
149 const cc::CompositorFrameMetadata& frame_info) { 149 const cc::CompositorFrameMetadata& frame_info) {
150 if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) { 150 if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
151 BrowserThread::PostTask( 151 BrowserThread::PostTask(
152 BrowserThread::UI, 152 BrowserThread::UI,
153 FROM_HERE, 153 FROM_HERE,
154 base::Bind(&SynchronousCompositorOutputSurface::UpdateFrameMetaData, 154 base::Bind(&SynchronousCompositorOutputSurface::UpdateFrameMetaData,
155 weak_ptr_factory_.GetWeakPtr(), 155 weak_ptr_factory_.GetWeakPtr(),
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 if (valid_for_tile_management) { 246 if (valid_for_tile_management) {
247 cached_hw_transform_ = adjusted_transform; 247 cached_hw_transform_ = adjusted_transform;
248 cached_hw_viewport_ = viewport; 248 cached_hw_viewport_ = viewport;
249 cached_hw_clip_ = clip; 249 cached_hw_clip_ = clip;
250 } else { 250 } else {
251 SetExternalDrawConstraints( 251 SetExternalDrawConstraints(
252 cached_hw_transform_, cached_hw_viewport_, cached_hw_clip_, true); 252 cached_hw_transform_, cached_hw_viewport_, cached_hw_clip_, true);
253 } 253 }
254 254
255 if (did_swap_buffer_) 255 if (did_swap_buffer_)
256 OnSwapBuffersComplete(); 256 client_->OnSwapBuffersComplete();
257 257
258 SynchronousCompositorOutputSurfaceDelegate* delegate = GetDelegate(); 258 SynchronousCompositorOutputSurfaceDelegate* delegate = GetDelegate();
259 if (delegate) 259 if (delegate)
260 delegate->SetContinuousInvalidate(needs_begin_frame_); 260 delegate->SetContinuousInvalidate(needs_begin_frame_);
261 } 261 }
262 262
263 void SynchronousCompositorOutputSurface::PostCheckForRetroactiveBeginFrame() { 263 void SynchronousCompositorOutputSurface::PostCheckForRetroactiveBeginFrame() {
264 // Synchronous compositor cannot perform retroactive BeginFrames, so 264 // Synchronous compositor cannot perform retroactive BeginFrames, so
265 // intentionally no-op here. 265 // intentionally no-op here.
266 } 266 }
(...skipping 14 matching lines...) Expand all
281 bool SynchronousCompositorOutputSurface::CalledOnValidThread() const { 281 bool SynchronousCompositorOutputSurface::CalledOnValidThread() const {
282 return BrowserThread::CurrentlyOn(BrowserThread::UI); 282 return BrowserThread::CurrentlyOn(BrowserThread::UI);
283 } 283 }
284 284
285 SynchronousCompositorOutputSurfaceDelegate* 285 SynchronousCompositorOutputSurfaceDelegate*
286 SynchronousCompositorOutputSurface::GetDelegate() { 286 SynchronousCompositorOutputSurface::GetDelegate() {
287 return SynchronousCompositorImpl::FromRoutingID(routing_id_); 287 return SynchronousCompositorImpl::FromRoutingID(routing_id_);
288 } 288 }
289 289
290 } // namespace content 290 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698