3D Compositing in <browser>, first draft.

content/browser/browser_plugin/browser_plugin_host.h

 // 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.
 
 #ifndef CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_HOST_H__
 #define CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_HOST_H__
 
 #include <map>
 
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
+#include "content/common/browser_plugin_info.h"

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

This header seems really bad. How do other clients handle structs that they need
both to pass around, and that they need to IPC?

 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ppapi/c/pp_instance.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/surface/transport_dib.h"
 #include "webkit/glue/webcursor.h"
 
 class WebContentsImpl;
+struct BrowserPlugin_SwapInfo;
 struct BrowserPluginHostMsg_PostMessage_Params;
 struct ViewHostMsg_UpdateRect_Params;
 
 namespace IPC {
 struct ChannelHandle;
 }
 
 namespace content {
 
 class RenderProcessHost;
@@ skipping 12 matching lines @@
   // BrowserPluginHost is owned by a WebContentsImpl. Here it takes in its
   // owner. The owner can be either a guest or embedder WebContents.
   explicit BrowserPluginHost(WebContentsImpl* web_contents);
 
   virtual ~BrowserPluginHost();
 
   // This is called on the first navigation of the browser plugin. It creates
   // a new WebContentsImpl for the guest, associates it with its embedder, sets
   // its size and navigates it to the src URL.
   void NavigateOrCreateGuest(RenderViewHost* render_view_host,
-                                 int instance_id,
-                                 long long frame_id,
-                                 const std::string& src);
+      int instance_id,
+      long long frame_id,
+      const std::string& src,
+      const BrowserPluginHostMsg_Surface_Params& params);
 
   void ResizeGuest(int instance_id,
                    TransportDIB* damage_buffer,
                    int width,
                    int height,
                    bool resize_pending,
                    float scale_factor);
 
   void UpdateRect(RenderViewHost* render_view_host,
                   const ViewHostMsg_UpdateRect_Params& params);
@@ skipping 13 matching lines @@
 
   RenderProcessHost* embedder_render_process_host() const {
     return embedder_render_process_host_;
   }
   int instance_id() const { return instance_id_; }
   void SetDamageBuffer(TransportDIB* damage_buffer,
                        const gfx::Size& size,
                        float scale_factor);
   TransportDIB* damage_buffer() const { return damage_buffer_; }
   const gfx::Size& damage_buffer_size() const { return damage_buffer_size_; }
+
+  void SendBuffersSwappedToEmbedder(
+      uint64 surface_handle,
+      const BrowserPlugin_SwapInfo& info);
+  void SendSurfaceResizeToEmbedder(const gfx::Size& size);
+
+  void set_surface_params(const BrowserPluginHostMsg_Surface_Params& params) {
+    surface_params_ = params;
+  }
+
   float damage_buffer_scale_factor() const {
       return damage_buffer_scale_factor_;
   }
 
  private:
   typedef std::map<WebContents*, int64> GuestMap;
   typedef std::map<int, BrowserPluginHost*> ContainerInstanceMap;
   friend class BrowserPluginHostHelper;
 
   // Get a guest BrowserPluginHost by its container ID specified
@@ skipping 10 matching lines @@
     embedder_render_process_host_ = embedder_render_process_host;
   }
   void set_instance_id(int instance_id) { instance_id_ = instance_id; }
 
   void DestroyGuests();
   // Destroy a specific guest if possible. This is a no-op if the guest id is
   // unknown as we may already have removed it for a different reason.
   void DestroyGuestByInstanceID(int instance_id);
 
   // WebContentsDelegate implementation.
-  virtual bool TakeFocus(bool reverse) OVERRIDE;
+  virtual bool TakeFocus(WebContents* source, bool reverse) OVERRIDE;

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

This change shouldn't be here.

   virtual void RendererUnresponsive(WebContents* source) OVERRIDE;
 
   // WebContentsObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   // Used to monitor frame navigation to cleanup guests when a frame navigates
   // away from the browser plugin it's hosting.
   virtual void DidCommitProvisionalLoadForFrame(
       int64 frame_id,
       bool is_main_frame,
       const GURL& url,
@@ skipping 16 matching lines @@
   int instance_id_;
   TransportDIB* damage_buffer_;
   gfx::Size damage_buffer_size_;
   float damage_buffer_scale_factor_;
   GuestMap guests_;
   ContainerInstanceMap guests_by_instance_id_;
 
   IDMap<RenderViewHost> pending_updates_;
   int pending_update_counter_;
   scoped_ptr<IPC::Message> pending_input_event_reply_;
+  BrowserPluginHostMsg_Surface_Params surface_params_;
   gfx::Rect guest_rect_;
   WebCursor cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_HOST_H_