[BrowserTag] Send dib info with NavigateGuest message,

content/browser/browser_plugin/browser_plugin_embedder.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_embedder.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/time.h"
 #include "content/browser/browser_plugin/browser_plugin_embedder_helper.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
+#include "content/common/browser_plugin_messages.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/url_constants.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/gfx/size.h"
 #include "ui/surface/transport_dib.h"
 
@@ skipping 43 matching lines @@
 }
 
 void BrowserPluginEmbedder::AddGuest(int instance_id,
                                      WebContents* guest_web_contents,
                                      int64 frame_id) {
   DCHECK(guest_web_contents_by_instance_id_.find(instance_id) ==
          guest_web_contents_by_instance_id_.end());
   guest_web_contents_by_instance_id_[instance_id] = guest_web_contents;
 }
 
-void BrowserPluginEmbedder::NavigateGuest(RenderViewHost* render_view_host,
-                                          int instance_id,
-                                          int64 frame_id,
-                                          const std::string& src,
-                                          const gfx::Size& size) {
+void BrowserPluginEmbedder::NavigateGuest(
+    RenderViewHost* render_view_host,
+    int instance_id,
+    int64 frame_id,
+    const std::string& src,
+    const BrowserPluginHostMsg_ResizeGuest_Params& resize_params) {
   BrowserPluginGuest* guest = GetGuestByInstanceID(instance_id);
   WebContentsImpl* guest_web_contents = NULL;
   GURL url(src);
   if (!guest) {
     const std::string& host =
         render_view_host->GetSiteInstance()->GetSite().host();
     guest_web_contents = WebContentsImpl::CreateGuest(
         web_contents()->GetBrowserContext(),
         host,
         instance_id);
@@ skipping 16 matching lines @@
   // non-empty page, the action is considered no-op.
   // TODO(lazyboy): The js shim for browser-plugin might need to reflect empty
   // src ignoring in the shadow DOM element: http://crbug.com/149001.
   if (!src.empty()) {
     guest_web_contents->GetController().LoadURL(url,
                                                 Referrer(),
                                                 PAGE_TRANSITION_AUTO_SUBFRAME,
                                                 std::string());
   }
 
-  if (!size.IsEmpty())
-    guest_web_contents->GetView()->SizeContents(size);
+  // Resize the guest if the resize parameter was set from the renderer.
+  ResizeGuest(instance_id, resize_params);
 }
 
 void BrowserPluginEmbedder::UpdateRectACK(int instance_id,
                                           int message_id,
                                           const gfx::Size& size) {
   BrowserPluginGuest* guest = GetGuestByInstanceID(instance_id);
   if (guest)
     guest->UpdateRectACK(message_id, size);
 }
 
-void BrowserPluginEmbedder::ResizeGuest(int instance_id,
-                                        TransportDIB* damage_buffer,
-#if defined(OS_WIN)
-                                        int damage_buffer_size,
-#endif
-                                        int width,
-                                        int height,
-                                        bool resize_pending,
-                                        float scale_factor) {
+void BrowserPluginEmbedder::ResizeGuest(
+    int instance_id,
+    const BrowserPluginHostMsg_ResizeGuest_Params& params) {
+  // TODO(fsamuel): Schedule this later so that we don't stall the embedder for
+  // too long.
   BrowserPluginGuest* guest = GetGuestByInstanceID(instance_id);
   if (!guest)
     return;
   WebContentsImpl* guest_web_contents =
       static_cast<WebContentsImpl*>(guest->GetWebContents());
+
+  if (!TransportDIB::is_valid_id(params.damage_buffer_id)) {
+    // Invalid transport dib, just resize the WebContents.
+    if (params.width && params.height) {
+      guest_web_contents->GetView()->SizeContents(gfx::Size(params.width,
+                                                            params.height));
+    }
+    return;
+  }
+
+  TransportDIB* damage_buffer = NULL;

[Fady Samuel, 2012/09/24 22:16:58]

This makes this method a lot harder to read. Could you please factor out
TransportDIB mapping into a separate method.

[lazyboy, 2012/09/25 17:57:22]

Done.

+#if defined(OS_WIN)
+  // On Windows we need to duplicate the handle from the remote process.
+  HANDLE section;
+  DuplicateHandle(render_view_host()->GetProcess()->GetHandle(),
+                  params.damage_buffer_id.handle,
+                  GetCurrentProcess(),
+                  &section,
+                  STANDARD_RIGHTS_REQUIRED | FILE_MAP_READ | FILE_MAP_WRITE,
+                  FALSE, 0);
+  damage_buffer = TransportDIB::Map(section);
+#elif defined(OS_MACOSX)
+  // On OSX, the browser allocates all DIBs and keeps a file descriptor around
+  // for each.
+  damage_buffer = render_view_host()->GetProcess()->
+      GetTransportDIB(params.damage_buffer_id);
+#elif defined(OS_ANDROID)
+  damage_buffer = TransportDIB::Map(params.damage_buffer_id);
+#elif defined(OS_POSIX)
+  damage_buffer = TransportDIB::Map(params.damage_buffer_id.shmkey);
+#endif  // defined(OS_POSIX)
+  DCHECK(damage_buffer);
+
   guest->SetDamageBuffer(damage_buffer,
 #if defined(OS_WIN)
-                         damage_buffer_size,
+                         params.damage_buffer_size,
 #endif
-                         gfx::Size(width, height),
-                         scale_factor);
-  if (!resize_pending)
-    guest_web_contents->GetView()->SizeContents(gfx::Size(width, height));
+                         gfx::Size(params.width, params.height),
+                         params.scale_factor);
+  if (!params.resize_pending) {
+    guest_web_contents->GetView()->SizeContents(gfx::Size(params.width,
+                                                          params.height));
+  }
 }
 
 void BrowserPluginEmbedder::SetFocus(int instance_id,
                                      bool focused) {
   BrowserPluginGuest* guest = GetGuestByInstanceID(instance_id);
   if (guest)
     guest->SetFocus(focused);
 }
 
 void BrowserPluginEmbedder::DestroyGuests() {
@@ skipping 70 matching lines @@
       bool visible = *Details<bool>(details).ptr();
       WebContentsVisibilityChanged(visible);
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification type: " << type;
   }
 }
 
 }  // namespace content