Browser Plugin: Implement AutoSize

content/browser/browser_plugin/browser_plugin_guest.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/browser/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "base/string_util.h"
 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
@@ skipping 176 matching lines @@
       host->DragTargetDragLeave();
       break;
     case WebKit::WebDragStatusDrop:
       host->DragTargetDrop(location, location, 0);
       break;
     case WebKit::WebDragStatusUnknown:
       NOTREACHED();
   }
 }
 
+void BrowserPluginGuest::SetAutoSize(
+    const BrowserPluginHostMsg_AutoSize_Params& auto_size_params,
+    const BrowserPluginHostMsg_ResizeGuest_Params& resize_guest_params) {
+  auto_size_ = auto_size_params.enable;
+  max_height_ = auto_size_params.max_height;
+  max_width_ = auto_size_params.max_width;
+  min_height_ = auto_size_params.min_height;
+  min_width_ = auto_size_params.min_width;
+  if (auto_size_) {
+    web_contents()->GetRenderViewHost()->EnableAutoResize(
+        gfx::Size(min_width_, min_height_), gfx::Size(max_width_, max_height_));

[lazyboy, 2012/11/06 22:22:35]

probably easier to keep these as gfx::Size min_auto_size_ and gfx::Size
max_auto_size_

[Fady Samuel, 2012/11/06 23:52:34]

Done.

+  } else {
+    web_contents()->GetRenderViewHost()->DisableAutoResize(
+        gfx::Size(resize_guest_params.width, resize_guest_params.height));
+  }
+  // We call resize here to update the damage buffer.
+  Resize(embedder_web_contents_->GetRenderViewHost(), resize_guest_params);
+}
+
 void BrowserPluginGuest::UpdateDragCursor(WebKit::WebDragOperation operation) {
   RenderViewHostImpl* embedder_render_view_host =
       static_cast<RenderViewHostImpl*>(
           embedder_web_contents_->GetRenderViewHost());
   CHECK(embedder_render_view_host);
   RenderViewHostDelegateView* view =
       embedder_render_view_host->GetDelegate()->GetDelegateView();
   if (view)
     view->UpdateDragCursor(operation);
 }
@@ skipping 72 matching lines @@
   // between the embedder and browser processes.
   DCHECK(*static_cast<unsigned int*>(damage_buffer->memory()) == 0xdeadbeef);
   damage_buffer_.reset(damage_buffer);
 #if defined(OS_WIN)
   damage_buffer_size_ = damage_buffer_size;
 #endif
   damage_view_size_ = damage_view_size;
   damage_buffer_scale_factor_ = scale_factor;
 }
 
+bool BrowserPluginGuest::InAutoSizeBounds(const gfx::Size& size) const {
+  return size.width() <= max_width_ && size.height() <= max_height_;
+}
+
 void BrowserPluginGuest::UpdateRect(
     RenderViewHost* render_view_host,
     const ViewHostMsg_UpdateRect_Params& params) {
   RenderWidgetHostImpl* render_widget_host =
       RenderWidgetHostImpl::From(render_view_host);
   render_widget_host->ResetSizeAndRepaintPendingFlags();
   // This handler is only of interest to us for the 2D software rendering path.
   // needs_ack should always be true for the 2D path.
   // TODO(fsamuel): Do we need to do something different in the 3D case?
   if (!params.needs_ack)
     return;
 
-  // Only copy damage if the guest's view size is equal to the damage buffer's
-  // size and the guest's scale factor is equal to the damage buffer's scale
-  // factor.
+  // Only copy damage if the guest is in autosize mode and the guest's view size
+  // is less than the maximum size or the guest's view size is equal to the
+  // damage buffer's size and the guest's scale factor is equal to the damage
+  // buffer's scale factor.
   // The scaling change can happen due to asynchronous updates of the DPI on a
   // resolution change.
-  if (params.view_size.width() == damage_view_size().width() &&
-      params.view_size.height() == damage_view_size().height() &&
-      params.scale_factor == damage_buffer_scale_factor()) {
+  if ((auto_size_ && InAutoSizeBounds(params.view_size)) ||

[lazyboy, 2012/11/06 22:22:35]

Do we need to handle the case where auto_size is set and scale_factor changes?

[Fady Samuel, 2012/11/06 23:52:34]

Good catch. In this case, we still want to drop the change.

Speaking of which, we probably need some high-DPI testing. I'll file a bug for
that.

+      (params.view_size.width() == damage_view_size().width() &&
+       params.view_size.height() == damage_view_size().height() &&
+       params.scale_factor == damage_buffer_scale_factor())) {
     TransportDIB* dib = render_view_host->GetProcess()->
         GetTransportDIB(params.bitmap);
     if (dib) {
 #if defined(OS_WIN)
       size_t guest_damage_buffer_size = params.bitmap_rect.width() *
                                         params.bitmap_rect.height() * 4;
       size_t embedder_damage_buffer_size = damage_buffer_size_;
 #else
       size_t guest_damage_buffer_size = dib->size();
       size_t embedder_damage_buffer_size = damage_buffer_->size();
@@ skipping 200 matching lines @@
 
 void BrowserPluginGuest::RenderViewReady() {
   // TODO(fsamuel): Investigate whether it's possible to update state earlier
   // here (see http://www.crbug.com/158151).
   RenderViewHost* render_view_host = web_contents()->GetRenderViewHost();
   render_view_host->Send(
       new ViewMsg_SetFocus(render_view_host->GetRoutingID(), focused_));
   bool embedder_visible =
       embedder_web_contents_->GetBrowserPluginEmbedder()->visible();
   SetVisibility(embedder_visible, visible());
+  if (auto_size_) {
+    web_contents()->GetRenderViewHost()->EnableAutoResize(
+        gfx::Size(min_width_, min_height_), gfx::Size(max_width_, max_height_));
+  } else {
+    web_contents()->GetRenderViewHost()->DisableAutoResize(damage_view_size_);
+  }
 }
 
 void BrowserPluginGuest::RenderViewGone(base::TerminationStatus status) {
   if (pending_input_event_reply_.get()) {
     IPC::Message* reply_message = pending_input_event_reply_.release();
     BrowserPluginHostMsg_HandleInputEvent::WriteReplyParams(reply_message,
                                                             false,
                                                             cursor_);
     SendMessageToEmbedder(reply_message);
   }
@@ skipping 20 matching lines @@
     default:
       break;
   }
 }
 
 void BrowserPluginGuest::SendMessageToEmbedder(IPC::Message* msg) {
   embedder_web_contents_->GetRenderProcessHost()->Send(msg);
 }
 
 }  // namespace content