3D Compositing in <browser>, first draft.

content/browser/browser_plugin/browser_plugin_host.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_host.h"
 
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_plugin/browser_plugin_host_helper.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 24 matching lines @@
       damage_buffer_(NULL),
       pending_update_counter_(0) {
   // Listen to visibility changes so that an embedder hides its guests
   // as well.
   registrar_.Add(this,
                  NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED,
                  Source<WebContents>(web_contents));
   // Construct plumbing helpers when a new RenderViewHost is created for
   // this BrowserPluginHost's WebContentsImpl.
   registrar_.Add(this,
-                 NOTIFICATION_WEB_CONTENTS_RENDER_VIEW_HOST_CREATED,
+                 NOTIFICATION_WILL_CREATE_RENDER_VIEW,
                  Source<WebContents>(web_contents));
 }
 
 BrowserPluginHost::~BrowserPluginHost() {
   if (damage_buffer_)
     delete damage_buffer_;
 }
 
 BrowserPluginHost* BrowserPluginHost::GetGuestByInstanceID(
     int container_id) const {
   ContainerInstanceMap::const_iterator it =
       guests_by_instance_id_.find(container_id);
   if (it != guests_by_instance_id_.end())
     return it->second;
   return NULL;
 }
 
 void BrowserPluginHost::AddGuest(int instance_id,
                                  BrowserPluginHost* guest,
                                  int64 frame_id) {
   DCHECK(guests_by_instance_id_.find(instance_id) ==
       guests_by_instance_id_.end());
   guests_by_instance_id_[instance_id] = guest;
   guests_[guest->web_contents()] = frame_id;
 }
 
-bool BrowserPluginHost::TakeFocus(bool reverse) {
+bool BrowserPluginHost::TakeFocus(WebContents* source, bool reverse) {
   embedder_render_process_host()->Send(
       new BrowserPluginMsg_AdvanceFocus(instance_id(), reverse));
   return true;
 }
 
 void BrowserPluginHost::RendererUnresponsive(WebContents* source) {
   base::ProcessHandle process_handle =
       web_contents()->GetRenderProcessHost()->GetHandle();
   base::KillProcess(process_handle, RESULT_CODE_HUNG, false);
 }
 
 bool BrowserPluginHost::OnMessageReceived(const IPC::Message& message) {
   return false;
 }
 
 void BrowserPluginHost::NavigateOrCreateGuest(
     RenderViewHost* render_view_host,
     int instance_id,
     long long frame_id,
-    const std::string& src) {
+    const std::string& src,
+    const BrowserPluginHostMsg_Surface_Params& params) {
   BrowserPluginHost* guest =
       GetGuestByInstanceID(instance_id);
   WebContentsImpl* guest_web_contents =
       guest ?
           static_cast<WebContentsImpl*>(guest->web_contents()): NULL;
+  surface_params_ = params;
   GURL url(src);
   if (!guest) {
     std::string host = render_view_host->GetSiteInstance()->GetSite().host();
     GURL guest_url(
         base::StringPrintf("%s://%s", chrome::kGuestScheme, host.c_str()));
     // The SiteInstance of a given guest is based on the fact that it's a guest
     // in addition to which platform application the guest belongs to, rather
     // than the URL that the guest is being navigated to.
     SiteInstance* guest_site_instance =
         SiteInstance::CreateForURL(web_contents()->GetBrowserContext(),
         guest_url);
     guest_web_contents =
         static_cast<WebContentsImpl*>(
             WebContents::Create(
                 web_contents()->GetBrowserContext(),
                 guest_site_instance,
                 MSG_ROUTING_NONE,
                 NULL, // base WebContents
                 NULL  // session storage namespace
             ));
     guest = guest_web_contents->browser_plugin_host();
+    guest->set_surface_params(params);
     guest->set_embedder_render_process_host(
         render_view_host->GetProcess());
     guest->set_instance_id(instance_id);
     guest_web_contents->GetMutableRendererPrefs()->
         throttle_input_events = false;
     AddGuest(instance_id, guest, frame_id);
   }
   guest->web_contents()->SetDelegate(guest);
   guest->web_contents()->GetController().LoadURL(
       url,
@@ skipping 21 matching lines @@
   WebContentsImpl* guest_web_contents =
       guest ? static_cast<WebContentsImpl*>(guest->web_contents()): NULL;
   guest->SetDamageBuffer(damage_buffer, gfx::Size(width, height), scale_factor);
   if (!resize_pending)
     guest_web_contents->GetView()->SizeContents(gfx::Size(width, height));
 }
 
 void BrowserPluginHost::UpdateRect(
     RenderViewHost* render_view_host,
     const ViewHostMsg_UpdateRect_Params& params) {
-  // 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.
   if (params.view_size.width() == damage_buffer_size().width() &&
       params.view_size.height() == damage_buffer_size().height() &&
       params.scale_factor == damage_buffer_scale_factor()) {
     TransportDIB* dib = render_view_host->GetProcess()->
         GetTransportDIB(params.bitmap);
     if (dib) {
       void* guest_memory = dib->memory();
       void* embedder_memory = damage_buffer_->memory();
       int size = std::min(dib->size(), damage_buffer_->size());
       memcpy(embedder_memory, guest_memory, size);
     }
   }
   DCHECK(embedder_render_process_host());
   BrowserPluginMsg_UpdateRect_Params relay_params;
   relay_params.bitmap_rect = params.bitmap_rect;
   relay_params.dx = params.dx;
   relay_params.dy = params.dy;
   relay_params.scroll_rect = params.scroll_rect;
   relay_params.copy_rects = params.copy_rects;
   relay_params.view_size = params.view_size;
   relay_params.scale_factor = params.scale_factor;
   relay_params.is_resize_ack = ViewHostMsg_UpdateRect_Flags::is_resize_ack(
       params.flags);
+  relay_params.needs_ack = params.needs_ack;
 
   // We need to send the ACK to the same render_view_host that issued
   // the UpdateRect. We keep track of this correspondence via a message_id.
   int message_id = pending_update_counter_++;
   pending_updates_.AddWithID(render_view_host, message_id);
 
   embedder_render_process_host()->Send(
       new BrowserPluginMsg_UpdateRect(instance_id(),
                                       message_id,
                                       relay_params));
@@ skipping 49 matching lines @@
 void BrowserPluginHost::HandleInputEventAck(RenderViewHost* render_view_host,
                                             bool handled) {
   DCHECK(pending_input_event_reply_.get());
   IPC::Message* reply_message = pending_input_event_reply_.release();
   BrowserPluginHostMsg_HandleInputEvent::WriteReplyParams(reply_message,
                                                           handled,
                                                           cursor_);
   embedder_render_process_host()->Send(reply_message);
   RenderViewHostImpl* guest_rvh =
       static_cast<RenderViewHostImpl*>(render_view_host);
-  if (guest_rvh->decrement_in_flight_event_count() == 0)
+  if (guest_rvh->decrement_in_flight_event_count() == 0) {

[scshunt, 2012/08/12 01:42:45]

Unnecessary.

[scshunt, 2012/08/17 17:30:28]

Done.

     guest_rvh->StopHangMonitorTimeout();
+  }
 }
 
 void BrowserPluginHost::SetFocus(bool focused) {
   RenderViewHost* render_view_host = web_contents()->GetRenderViewHost();
   render_view_host->Send(
       new ViewMsg_SetFocus(render_view_host->GetRoutingID(), focused));
 }
 
+void BrowserPluginHost::SendBuffersSwappedToEmbedder(
+    uint64 surface_handle,
+    const BrowserPlugin_SwapInfo& info) {
+  DCHECK(embedder_render_process_host());
+  embedder_render_process_host()->Send(
+      new BrowserPluginMsg_BuffersSwapped(instance_id_, surface_handle, info));
+}
+
+void BrowserPluginHost::SendSurfaceResizeToEmbedder(const gfx::Size& size) {
+  DCHECK(embedder_render_process_host());
+  embedder_render_process_host()->Send(
+      new BrowserPluginMsg_SurfaceResize(instance_id_, size));
+}
+
 void BrowserPluginHost::ShowWidget(RenderViewHost* render_view_host,
                                    int route_id,
                                    const gfx::Rect& initial_pos) {
   RenderWidgetHostView* popup_rwhv =
       static_cast<WebContentsImpl*>(web_contents())->
           GetCreatedWidget(route_id);
 
   RenderWidgetHostViewPort* widget_host_view =
       RenderWidgetHostViewPort::FromRWHV(popup_rwhv);
   if (!widget_host_view)
@@ skipping 90 matching lines @@
       iter.Advance();
     }
   }
 }
 
 void BrowserPluginHost::Observe(
     int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   switch (type) {
-    case NOTIFICATION_WEB_CONTENTS_RENDER_VIEW_HOST_CREATED: {
+    case NOTIFICATION_WILL_CREATE_RENDER_VIEW: {
       RenderViewHost* render_view_host =
           Details<RenderViewHost>(details).ptr();
       // BrowserPluginHostHelper is destroyed when its associated RenderViewHost
       // is destroyed.
-      new BrowserPluginHostHelper(this, render_view_host);
+      new BrowserPluginHostHelper(this, render_view_host, surface_params_);
       break;
     }
     case NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED: {
       bool visible = *Details<bool>(details).ptr();
       // If the embedder is hidden we need to hide the guests as well.
       for (GuestMap::const_iterator it = guests_.begin();
           it != guests_.end(); ++it) {
         WebContents* web_contents = it->first;
         if (visible)
           web_contents->WasShown();
         else
           web_contents->WasHidden();
       }
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification type: " << type;
   }
 }
 
 }  // namespace content