Patch by Thatcher Ulrich <tulrich@google.com>.

Implement "iframe shim" behavior for windowed plugins.

In FF and IE on windows, iframes are implemented as native HWNDs.  
This has the side effect that iframes display on top of windowed 
plugins. This side effect has long been known as a workaround for
allowing HTML elements to appear above plugin content.

BUG=1788

Review URL: http://codereview.chromium.org/7032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3137 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 4 deletions

diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc
index 84bc069..69177e1 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/chrome/plugin/webplugin_delegate_stub.cc
@@ -237,11 +237,13 @@ void WebPluginDelegateStub::OnPrint(PluginMsg_PrintResponse_Params* params) {
 void WebPluginDelegateStub::OnUpdateGeometry(
     const gfx::Rect& window_rect,
     const gfx::Rect& clip_rect,
+    const std::vector<gfx::Rect>& cutout_rects,
     bool visible,
     const SharedMemoryHandle& windowless_buffer,
     const SharedMemoryHandle& background_buffer) {
   webplugin_->UpdateGeometry(
-      window_rect, clip_rect, visible, windowless_buffer, background_buffer);
+      window_rect, clip_rect, cutout_rects, visible, windowless_buffer, 
+      background_buffer);
 }
 
 void WebPluginDelegateStub::OnGetPluginScriptableObject(int* route_id,
diff --git a/chrome/plugin/webplugin_delegate_stub.h b/chrome/plugin/webplugin_delegate_stub.h
index 78684bf..fb7d4dd 100644
--- a/chrome/plugin/webplugin_delegate_stub.h
+++ b/chrome/plugin/webplugin_delegate_stub.h
@@ -64,7 +64,9 @@ class WebPluginDelegateStub : public IPC::Channel::Listener,
   void OnPrint(PluginMsg_PrintResponse_Params* params);
 
   void OnUpdateGeometry(const gfx::Rect& window_rect,
-                        const gfx::Rect& clip_rect, bool visible,
+                        const gfx::Rect& clip_rect,
+                        const std::vector<gfx::Rect>& cutout_rects,
+                        bool visible,
                         const SharedMemoryHandle& windowless_buffer,
                         const SharedMemoryHandle& background_buffer);
   void OnGetPluginScriptableObject(int* route_id, void** npobject_ptr);
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index 9528490..56beb25c 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/plugin/webplugin_proxy.h"
 
-#include "base/gfx/bitmap_header.h"
+#include "base/gfx/gdi_util.h"
 #include "base/gfx/platform_device_win.h"
 #include "base/scoped_handle.h"
 #include "base/shared_memory.h"
@@ -277,13 +277,14 @@ void WebPluginProxy::Paint(const gfx::Rect& rect) {
 void WebPluginProxy::UpdateGeometry(
     const gfx::Rect& window_rect,
     const gfx::Rect& clip_rect,
+    const std::vector<gfx::Rect>& cutout_rects,
     bool visible,
     const SharedMemoryHandle& windowless_buffer,
     const SharedMemoryHandle& background_buffer) {
       gfx::Rect old = delegate_->rect();
   bool moved = delegate_->rect().x() != window_rect.x() ||
                delegate_->rect().y() != window_rect.y();
-  delegate_->UpdateGeometry(window_rect, clip_rect, visible);
+  delegate_->UpdateGeometry(window_rect, clip_rect, cutout_rects, visible);
   if (windowless_buffer) {
     // The plugin's rect changed, so now we have a new buffer to draw into.
     SetWindowlessBuffer(windowless_buffer, background_buffer);
diff --git a/chrome/plugin/webplugin_proxy.h b/chrome/plugin/webplugin_proxy.h
index ab50933..5374d1c 100644
--- a/chrome/plugin/webplugin_proxy.h
+++ b/chrome/plugin/webplugin_proxy.h
@@ -81,6 +81,7 @@ class WebPluginProxy : public WebPlugin {
 
   void UpdateGeometry(const gfx::Rect& window_rect,
                       const gfx::Rect& clip_rect,
+                      const std::vector<gfx::Rect>& cutout_rects,
                       bool visible,
                       const SharedMemoryHandle& windowless_buffer,
                       const SharedMemoryHandle& background_buffer);