BrowserPlugin: Remove dependency upon ViewHostMsg_UpdateRect

content/renderer/browser_plugin/browser_plugin.cc

 // Copyright 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/browser_plugin/browser_plugin.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 32 matching lines @@
 namespace content {
 
 BrowserPlugin::BrowserPlugin(RenderViewImpl* render_view,
                              blink::WebFrame* frame,
                              bool auto_navigate)
     : attached_(false),
       attach_pending_(false),
       render_view_(render_view->AsWeakPtr()),
       render_view_routing_id_(render_view->GetRoutingID()),
       container_(NULL),
-      paint_ack_received_(true),
       last_device_scale_factor_(GetDeviceScaleFactor()),
       sad_guest_(NULL),
       guest_crashed_(false),
       content_window_routing_id_(MSG_ROUTING_NONE),
       plugin_focused_(false),
       visible_(true),
       auto_navigate_(auto_navigate),
       mouse_locked_(false),
       browser_plugin_manager_(render_view->GetBrowserPluginManager()),
       browser_plugin_instance_id_(browser_plugin::kInstanceIDNone),
@@ skipping 21 matching lines @@
                                 OnCompositorFrameSwapped(message))
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_CopyFromCompositingSurface,
                         OnCopyFromCompositingSurface)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestContentWindowReady,
                         OnGuestContentWindowReady)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestGone, OnGuestGone)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_SetCursor, OnSetCursor)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_SetMouseLock, OnSetMouseLock)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_ShouldAcceptTouchEvents,
                         OnShouldAcceptTouchEvents)
-    IPC_MESSAGE_HANDLER(BrowserPluginMsg_UpdateRect, OnUpdateRect)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void BrowserPlugin::UpdateDOMAttribute(const std::string& attribute_name,
                                        const std::string& attribute_value) {
   if (!container())
     return;
 
@@ skipping 64 matching lines @@
   }
 
   // TODO(fsamuel): Add support for reattachment.
   BrowserPluginHostMsg_Attach_Params attach_params;
   attach_params.focused = ShouldGuestBeFocused();
   attach_params.visible = visible_;
   attach_params.opaque = !GetAllowTransparencyAttribute();
   attach_params.origin = plugin_rect().origin();
   gfx::Size view_size(width(), height());
   if (!view_size.IsEmpty()) {
-    paint_ack_received_ = false;
     PopulateResizeGuestParameters(view_size,
                                   &attach_params.resize_guest_params);
   }
   browser_plugin_manager()->Send(new BrowserPluginHostMsg_Attach(
       render_view_routing_id_,
       browser_plugin_instance_id_,
       attach_params));
 
   attach_pending_ = true;
 }
@@ skipping 24 matching lines @@
                                         params.mailbox,
                                         params.gpu_route_id,
                                         params.gpu_host_id,
                                         GetDeviceScaleFactor());
 }
 
 void BrowserPlugin::OnCompositorFrameSwapped(const IPC::Message& message) {
   BrowserPluginMsg_CompositorFrameSwapped::Param param;
   if (!BrowserPluginMsg_CompositorFrameSwapped::Read(&message, &param))
     return;
+
+  // Note that there is no need to send ACK for this message.
+  // If the guest has updated pixels then it is no longer crashed.
+  guest_crashed_ = false;
+
   scoped_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
   param.b.frame.AssignTo(frame.get());
 
   EnableCompositing(true);
   compositing_helper_->OnCompositorFrameSwapped(frame.Pass(),
                                                 param.b.producing_route_id,
                                                 param.b.output_surface_id,
                                                 param.b.producing_host_id,
                                                 param.b.shared_memory_handle);
 }
@@ skipping 60 matching lines @@
 
 void BrowserPlugin::OnShouldAcceptTouchEvents(int browser_plugin_instance_id,
                                               bool accept) {
   if (container()) {
     container()->requestTouchEventType(
         accept ? WebPluginContainer::TouchEventRequestTypeRaw
                : WebPluginContainer::TouchEventRequestTypeNone);
   }
 }
 
-void BrowserPlugin::OnUpdateRect(
-    int browser_plugin_instance_id,
-    const BrowserPluginMsg_UpdateRect_Params& params) {
-  // Note that there is no need to send ACK for this message.
-  // If the guest has updated pixels then it is no longer crashed.
-  guest_crashed_ = false;
-
-  // We receive a resize ACK in regular mode, but not in autosize.
-  // In Compositing mode, we need to do it here so we can continue sending
-  // resize messages when needed.
-  if (params.is_resize_ack)
-    paint_ack_received_ = true;
-
-  if (params.view_size.width() == width() &&
-      params.view_size.height() == height()) {
-    return;
-  }
-
-  BrowserPluginHostMsg_ResizeGuest_Params resize_params;
-  PopulateResizeGuestParameters(plugin_size(), &resize_params);
-  paint_ack_received_ = false;
-  browser_plugin_manager()->Send(new BrowserPluginHostMsg_ResizeGuest(
-      render_view_routing_id_,
-      browser_plugin_instance_id_,
-      resize_params));
-}
-
 NPObject* BrowserPlugin::GetContentWindow() const {
   if (content_window_routing_id_ == MSG_ROUTING_NONE)
     return NULL;
   RenderViewImpl* guest_render_view = RenderViewImpl::FromRoutingID(
       content_window_routing_id_);
   if (!guest_render_view)
     return NULL;
   blink::WebFrame* guest_frame = guest_render_view->GetWebView()->mainFrame();
   return guest_frame->windowObject();
 }
 
 void BrowserPlugin::ShowSadGraphic() {
   // If the BrowserPlugin is scheduled to be deleted, then container_ will be
   // NULL so we shouldn't attempt to access it.
   if (container_)
     container_->invalidate();
 }
 
 float BrowserPlugin::GetDeviceScaleFactor() const {
   if (!render_view_)
     return 1.0f;
   return render_view_->GetWebView()->deviceScaleFactor();
 }
 
 void BrowserPlugin::UpdateDeviceScaleFactor() {
-  if (!paint_ack_received_ ||
-      last_device_scale_factor_ == GetDeviceScaleFactor()) {
+  if (last_device_scale_factor_ == GetDeviceScaleFactor())
     return;
-  }
 
   BrowserPluginHostMsg_ResizeGuest_Params params;
   PopulateResizeGuestParameters(plugin_size(), &params);
   browser_plugin_manager()->Send(new BrowserPluginHostMsg_ResizeGuest(
       render_view_routing_id_,
       browser_plugin_instance_id_,
       params));
 }
 
 void BrowserPlugin::UpdateGuestFocusState() {
@@ skipping 142 matching lines @@
     case BrowserPluginMsg_Attach_ACK::ID:
     case BrowserPluginMsg_AdvanceFocus::ID:
     case BrowserPluginMsg_BuffersSwapped::ID:
     case BrowserPluginMsg_CompositorFrameSwapped::ID:
     case BrowserPluginMsg_CopyFromCompositingSurface::ID:
     case BrowserPluginMsg_GuestContentWindowReady::ID:
     case BrowserPluginMsg_GuestGone::ID:
     case BrowserPluginMsg_SetCursor::ID:
     case BrowserPluginMsg_SetMouseLock::ID:
     case BrowserPluginMsg_ShouldAcceptTouchEvents::ID:
-    case BrowserPluginMsg_UpdateRect::ID:
       return true;
     default:
       break;
   }
   return false;
 }
 
 void BrowserPlugin::updateGeometry(
     const WebRect& window_rect,
     const WebRect& clip_rect,
     const WebVector<WebRect>& cut_outs_rects,
     bool is_visible) {
   int old_width = width();
   int old_height = height();
   plugin_rect_ = window_rect;
   if (!attached())
     return;
 
-  // In AutoSize mode, guests don't care when the BrowserPlugin container is
-  // resized. If |!paint_ack_received_|, then we are still waiting on a
-  // previous resize to be ACK'ed and so we don't issue additional resizes
-  // until the previous one is ACK'ed.
-  // TODO(mthiesse): Assess the performance of calling GetAutoSizeAttribute() on
-  // resize.
-  if (!paint_ack_received_ ||
-      (old_width == window_rect.width && old_height == window_rect.height)) {
+  if (old_width == window_rect.width && old_height == window_rect.height) {
     // Let the browser know about the updated view rect.
     browser_plugin_manager()->Send(new BrowserPluginHostMsg_UpdateGeometry(
         render_view_routing_id_, browser_plugin_instance_id_, plugin_rect_));
     return;
   }
 
   BrowserPluginHostMsg_ResizeGuest_Params params;
   PopulateResizeGuestParameters(plugin_size(), &params);
-  paint_ack_received_ = false;
   browser_plugin_manager()->Send(new BrowserPluginHostMsg_ResizeGuest(
       render_view_routing_id_,
       browser_plugin_instance_id_,
       params));
 }
 
 void BrowserPlugin::PopulateResizeGuestParameters(
     const gfx::Size& view_size,
     BrowserPluginHostMsg_ResizeGuest_Params* params) {
-  params->size_changed = true;
   params->view_size = view_size;
   params->scale_factor = GetDeviceScaleFactor();
   if (last_device_scale_factor_ != params->scale_factor) {
     last_device_scale_factor_ = params->scale_factor;
     params->repaint = true;
   }
 }
 
 void BrowserPlugin::updateFocus(bool focused) {
   plugin_focused_ = focused;
@@ skipping 224 matching lines @@
     const blink::WebMouseEvent& event) {
   browser_plugin_manager()->Send(
       new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_,
                                                 browser_plugin_instance_id_,
                                                 plugin_rect_,
                                                 &event));
   return true;
 }
 
 }  // namespace content