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

Unified Diff: content/renderer/gpu/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; add comment about race 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/gpu/compositor_output_surface.cc
diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc
index dd9d632bad46c66dc8511325b244b8bda55b1356..c6424415e1add67e3d71ffdea014a592ab89492e 100644
--- a/content/renderer/gpu/compositor_output_surface.cc
+++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -157,7 +157,7 @@ void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
} else {
base::MessageLoopProxy::current()->PostTask(FROM_HERE, closure);
}
- DidSwapBuffers();
+ client_->DidSwapBuffers();
return;
}
@@ -165,7 +165,7 @@ void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
Send(new ViewHostMsg_SwapCompositorFrame(routing_id_,
output_surface_id_,
*frame));
- DidSwapBuffers();
+ client_->DidSwapBuffers();
return;
}
@@ -207,14 +207,12 @@ void CompositorOutputSurface::OnUpdateVSyncParametersFromBrowser(
#if defined(OS_ANDROID)
void CompositorOutputSurface::SetNeedsBeginFrame(bool enable) {
DCHECK(CalledOnValidThread());
- if (needs_begin_frame_ != enable)
- Send(new ViewHostMsg_SetNeedsBeginFrame(routing_id_, enable));
- OutputSurface::SetNeedsBeginFrame(enable);
+ Send(new ViewHostMsg_SetNeedsBeginFrame(routing_id_, enable));
}
void CompositorOutputSurface::OnBeginFrame(const cc::BeginFrameArgs& args) {
DCHECK(CalledOnValidThread());
- BeginFrame(args);
+ client_->BeginFrame(args);
}
#endif // defined(OS_ANDROID)
@@ -225,7 +223,7 @@ void CompositorOutputSurface::OnSwapAck(uint32 output_surface_id,
if (output_surface_id != output_surface_id_)
return;
ReclaimResources(&ack);
- OnSwapBuffersComplete();
+ client_->DidSwapBuffersComplete();
}
void CompositorOutputSurface::OnReclaimResources(
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_android.cc ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698