Index: content/browser/browser_plugin/browser_plugin_embedder.h |
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.h b/content/browser/browser_plugin/browser_plugin_embedder.h |
index bad744b307e4273389a921045602cddbc07d51c2..aafc1d61de15498ff1e9da2a8966d3bfa8fb1a69 100644 |
--- a/content/browser/browser_plugin/browser_plugin_embedder.h |
+++ b/content/browser/browser_plugin/browser_plugin_embedder.h |
@@ -26,9 +26,11 @@ |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
#include "content/public/browser/web_contents_observer.h" |
+#include "ui/surface/transport_dib.h" |
class TransportDIB; |
Fady Samuel
2012/09/25 18:02:01
We probably don't need this forward declaration if
lazyboy
2012/09/25 18:47:13
Done.
|
class WebContentsImpl; |
+struct BrowserPluginHostMsg_ResizeGuest_Params; |
namespace WebKit { |
class WebInputEvent; |
@@ -62,11 +64,16 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver, |
RenderViewHost* render_view_host); |
// Navigates in a guest (new or existing). |
- void NavigateGuest(RenderViewHost* render_view_host, |
- int instance_id, |
- int64 frame_id, |
- const std::string& src, |
- const gfx::Size& size); |
+ void NavigateGuest( |
+ RenderViewHost* render_view_host, |
+ int instance_id, |
+ int64 frame_id, |
+ const std::string& src, |
+ const BrowserPluginHostMsg_ResizeGuest_Params& resize_params); |
+ |
+ void ResizeGuest(int instance_id, |
+ const BrowserPluginHostMsg_ResizeGuest_Params& params); |
+ |
void Stop(int instance_id); |
void Reload(int instance_id); |
@@ -83,15 +90,6 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver, |
// Routes update rect ack message to the appropriate guest. |
void UpdateRectACK(int instance_id, int message_id, const gfx::Size& size); |
void SetFocus(int instance_id, bool focused); |
- void 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); |
// Handles input events sent from the BrowserPlugin (embedder's renderer |
// process) by passing them to appropriate guest's input handler. |
void HandleInputEvent(int instance_id, |
@@ -123,6 +121,9 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver, |
void DestroyGuestByInstanceID(int instance_id); |
void DestroyGuests(); |
+ // Returns the transport DIB associated with the dib id. |
+ TransportDIB* GetDamageBuffer(const TransportDIB::Id& damage_buffer_id); |
+ |
// Called when visiblity of web_contents changes, so the embedder will |
// show/hide its guest. |
void WebContentsVisibilityChanged(bool visible); |