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

Unified Diff: content/renderer/render_widget.cc

Issue 12090051: Revert 178746 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1397/src/
Patch Set: Created 7 years, 11 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
« no previous file with comments | « content/renderer/render_widget.h ('k') | content/renderer/render_widget_fullscreen_pepper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
===================================================================
--- content/renderer/render_widget.cc (revision 179370)
+++ content/renderer/render_widget.cc (working copy)
@@ -1145,7 +1145,7 @@
// If it needs to (e.g. composited UI), the GPU process does its own ACK
// with the browser for the GPU surface.
pending_update_params_->needs_ack = false;
- Composite();
+ webwidget_->composite(false);
}
// If we're holding a pending input event ACK, send the ACK before sending the
@@ -1155,7 +1155,7 @@
if (pending_input_event_ack_.get())
Send(pending_input_event_ack_.release());
- // If Composite() called SwapBuffers, pending_update_params_ will be reset (in
+ // If composite() called SwapBuffers, pending_update_params_ will be reset (in
// OnSwapBuffersPosted), meaning a message has been added to the
// updates_pending_swap_ queue, that will be sent later. Otherwise, we send
// the message now.
@@ -1171,12 +1171,6 @@
DidInitiatePaint();
}
-void RenderWidget::Composite() {
- DCHECK(is_accelerated_compositing_active_);
- DCHECK(web_layer_tree_view_);
- web_layer_tree_view_->composite();
-}
-
///////////////////////////////////////////////////////////////////////////////
// WebWidgetClient
« no previous file with comments | « content/renderer/render_widget.h ('k') | content/renderer/render_widget_fullscreen_pepper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698