Revert 178746

content/renderer/render_widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_widget.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 1127 matching lines @@
   } else {  // Accelerated compositing path
     // Begin painting.
     // If painting is done via the gpu process then we don't set any damage
     // rects to save the browser process from doing unecessary work.
     pending_update_params_->bitmap_rect = bounds;
     pending_update_params_->scroll_rect = gfx::Rect();
     // We don't need an ack, because we're not sharing a DIB with the browser.
     // 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
   // UpdateReply message so we can receive another input event before the
   // UpdateRect_ACK on platforms where the UpdateRect_ACK is sent from within
   // the UpdateRect IPC message handler.
   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.
   if (pending_update_params_.get()) {
     // sending an ack to browser process that the paint is complete...
     update_reply_pending_ = pending_update_params_->needs_ack;
     Send(new ViewHostMsg_UpdateRect(routing_id_, *pending_update_params_));
     pending_update_params_.reset();
   }
 
   // If we're software rendering then we're done initiating the paint.
   if (!is_accelerated_compositing_active_)
     DidInitiatePaint();
 }
 
-void RenderWidget::Composite() {
-  DCHECK(is_accelerated_compositing_active_);
-  DCHECK(web_layer_tree_view_);
-  web_layer_tree_view_->composite();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // WebWidgetClient
 
 void RenderWidget::didInvalidateRect(const WebRect& rect) {
   TRACE_EVENT2("renderer", "RenderWidget::didInvalidateRect",
                "width", rect.width, "height", rect.height);
   // The invalidated rect might be outside the bounds of the view.
   gfx::Rect view_rect(size_);
   gfx::Rect damaged_rect = gfx::IntersectRects(view_rect, rect);
   if (damaged_rect.IsEmpty())
@@ skipping 920 matching lines @@
 
 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const {
   return false;
 }
 
 bool RenderWidget::HasTouchEventHandlersAt(const gfx::Point& point) const {
   return true;
 }
 
 }  // namespace content