Changeset 62973 in webkit

Timestamp:

Jul 9, 2010 11:43:17 AM (14 years ago)

Author:

andersca@apple.com

Message:

Pass a clip rect to the plugin and call NPP_SetWindow
​https://bugs.webkit.org/show_bug.cgi?id=41969

Reviewed by Sam Weinig.

• WebProcess/Plugins/DummyPlugin.cpp:

(WebKit::DummyPlugin::geometryDidChange):

• WebProcess/Plugins/DummyPlugin.h:

Add clip rect parameter.

• WebProcess/Plugins/Netscape/NetscapePlugin.cpp:

(WebKit::NetscapePlugin::NetscapePlugin):
Initialize m_npWindow.

(WebKit::NetscapePlugin::callSetWindow):
Call NPP_SetWindow.

(WebKit::NetscapePlugin::initialize):
Set the window type to NPWindowTypeDrawable for now.

(WebKit::NetscapePlugin::geometryDidChange):
Update the frame and clip rects and call NPP_SetWindow.

• WebProcess/Plugins/Netscape/NetscapePlugin.h:

Add an NPWindow member variable.

• WebProcess/Plugins/Plugin.h:

Add a clipRect parameter to geometryDidChange.

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::PluginView):
Add the plug-in element to the constructor.

(WebKit::PluginView::viewGeometryDidChange):
Compute the clip rect and pass it to the plug-in.

• WebProcess/Plugins/PluginView.h:

(WebKit::PluginView::create):
Pass the plug-in element to the constructor.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::createPlugin):
Pass the plug-in element to PluginView::create.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/DummyPlugin.cpp (modified) (1 diff)
• WebProcess/Plugins/DummyPlugin.h (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp (modified) (4 diffs)
• WebProcess/Plugins/Netscape/NetscapePlugin.h (modified) (2 diffs)
• WebProcess/Plugins/Plugin.h (modified) (1 diff)
• WebProcess/Plugins/PluginView.cpp (modified) (4 diffs)
• WebProcess/Plugins/PluginView.h (modified) (2 diffs)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-09  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Pass a clip rect to the plugin and call NPP_SetWindow
+        https://bugs.webkit.org/show_bug.cgi?id=41969
+
+        * WebProcess/Plugins/DummyPlugin.cpp:
+        (WebKit::DummyPlugin::geometryDidChange):
+        * WebProcess/Plugins/DummyPlugin.h:
+        Add clip rect parameter.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::NetscapePlugin):
+        Initialize m_npWindow.
+
+        (WebKit::NetscapePlugin::callSetWindow):
+        Call NPP_SetWindow.
+
+        (WebKit::NetscapePlugin::initialize):
+        Set the window type to NPWindowTypeDrawable for now.
+
+        (WebKit::NetscapePlugin::geometryDidChange):
+        Update the frame and clip rects and call NPP_SetWindow.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+        Add an NPWindow member variable.
+
+        * WebProcess/Plugins/Plugin.h:
+        Add a clipRect parameter to geometryDidChange.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::PluginView):
+        Add the plug-in element to the constructor.
+        
+        (WebKit::PluginView::viewGeometryDidChange):
+        Compute the clip rect and pass it to the plug-in.
+
+        * WebProcess/Plugins/PluginView.h:
+        (WebKit::PluginView::create):
+        Pass the plug-in element to the constructor.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::createPlugin):
+        Pass the plug-in element to PluginView::create.
+
 2010-07-09  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/WebProcess/Plugins/DummyPlugin.cpp

@@ -58 +58 @@
 }
     
-void DummyPlugin::geometryDidChange(const IntRect& frameRect)
+void DummyPlugin::geometryDidChange(const IntRect& frameRect, const IntRect& clipRect)
 {
 }

trunk/WebKit2/WebProcess/Plugins/DummyPlugin.h

@@ -46 +46 @@
     virtual void destroy();
     virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect);
-    virtual void geometryDidChange(const WebCore::IntRect& frameRect);
+    virtual void geometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
 };
 

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

@@ -34 +34 @@
 NetscapePlugin::NetscapePlugin(PassRefPtr<NetscapePluginModule> pluginModule)
     : m_pluginModule(pluginModule)
+    , m_npWindow()
 {
     m_npp.ndata = this;
@@ -41 +42 @@
 NetscapePlugin::~NetscapePlugin()
 {
+}
+
+void NetscapePlugin::callSetWindow()
+{
+    m_npWindow.x = m_frameRect.x();
+    m_npWindow.y = m_frameRect.y();
+    m_npWindow.width = m_frameRect.width();
+    m_npWindow.height = m_frameRect.height();
+    m_npWindow.clipRect.top = m_clipRect.y();
+    m_npWindow.clipRect.left = m_clipRect.x();
+    m_npWindow.clipRect.bottom = m_clipRect.bottom();
+    m_npWindow.clipRect.right = m_clipRect.right();
+
+    m_pluginModule->pluginFuncs().setwindow(&m_npp, &m_npWindow);
 }
 
@@ -51 +66 @@
     if (error != NPERR_NO_ERROR)
         return false;
+
+    // FIXME: This is not correct in all cases.
+    m_npWindow.type = NPWindowTypeDrawable;
 
     return true;
@@ -63 +81 @@
 }
 
-void NetscapePlugin::geometryDidChange(const IntRect& frameRect)
+void NetscapePlugin::geometryDidChange(const IntRect& frameRect, const IntRect& clipRect)
 {
+    if (m_frameRect == frameRect && m_clipRect == clipRect) {
+        // Nothing to do.
+        return;
+    }
+
+    m_frameRect = frameRect;
+    m_clipRect = clipRect;
+
+    callSetWindow();
 }
 

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h

@@ -29 +29 @@
 #include "NetscapePluginModule.h"
 #include "Plugin.h"
+#include <WebCore/IntRect.h>
 
 namespace WebKit {
@@ -43 +44 @@
     NetscapePlugin(PassRefPtr<NetscapePluginModule> pluginModule);
 
+    void callSetWindow();
+
     // Plugin
     virtual bool initialize(const WebCore::KURL&, const Vector<WebCore::String>& paramNames, const Vector<WebCore::String>& paramValues, const WebCore::String& mimeType, bool loadManually);
     virtual void destroy();
     virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect);
-    virtual void geometryDidChange(const WebCore::IntRect& frameRect);
+    virtual void geometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect);
     
     RefPtr<NetscapePluginModule> m_pluginModule;
     NPP_t m_npp;
+    NPWindow m_npWindow;
+    
+    WebCore::IntRect m_frameRect;
+    WebCore::IntRect m_clipRect;
 };
 

trunk/WebKit2/WebProcess/Plugins/Plugin.h

@@ -46 +46 @@
     virtual void destroy() = 0;
     virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect& dirtyRect) = 0;
-    virtual void geometryDidChange(const WebCore::IntRect& frameRect) = 0;
+    virtual void geometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect) = 0;
 
 protected:

trunk/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -27 +27 @@
 
 #include "Plugin.h"
+#include <WebCore/FrameView.h>
 #include <WebCore/GraphicsContext.h>
+#include <WebCore/HTMLPlugInElement.h>
+#include <WebCore/RenderLayer.h>
 #include <WebCore/ScrollView.h>
 
@@ -34 +37 @@
 namespace WebKit {
 
-PluginView::PluginView(PassRefPtr<Plugin> plugin)
+PluginView::PluginView(PassRefPtr<Plugin> plugin, HTMLPlugInElement* pluginElement)
     : m_plugin(plugin)
+    , m_pluginElement(pluginElement)
 {
 }
@@ -62 +66 @@
 }
 
-
 void PluginView::frameRectsChanged()
 {
@@ -80 +83 @@
         return;
 
+    // Get the frame rect in window coordinates.
     IntRect frameRectInWindowCoordinates = parent()->contentsToWindow(frameRect());
-    
-    m_plugin->geometryDidChange(frameRectInWindowCoordinates);
+
+    // Get the window clip rect for the enclosing layer (in window coordinates).
+    RenderLayer* layer = m_pluginElement->renderer()->enclosingLayer();
+    FrameView* parentView = m_pluginElement->document()->frame()->view();
+    IntRect windowClipRect = parentView->windowClipRectForLayer(layer, true);
+
+    // Intersect the two rects to get the view clip rect in window coordinates.
+    IntRect clipRectInWindowCoordinates = intersection(frameRectInWindowCoordinates, windowClipRect);
+
+    m_plugin->geometryDidChange(frameRectInWindowCoordinates, clipRectInWindowCoordinates);
 }
 

trunk/WebKit2/WebProcess/Plugins/PluginView.h

@@ -32 +32 @@
 // FIXME: Eventually this should move to WebCore.
 
+namespace WebCore {
+    class HTMLPlugInElement;
+}
+
 namespace WebKit {
 
 class PluginView : public WebCore::Widget {
 public:
-    static PassRefPtr<PluginView> create(PassRefPtr<Plugin> plugin)
+    static PassRefPtr<PluginView> create(PassRefPtr<Plugin> plugin, WebCore::HTMLPlugInElement* pluginElement)
     {
-        return adoptRef(new PluginView(plugin));
+        return adoptRef(new PluginView(plugin, pluginElement));
     }
 
 private:
-    PluginView(PassRefPtr<Plugin>);
+    PluginView(PassRefPtr<Plugin>, WebCore::HTMLPlugInElement*);
     virtual ~PluginView();
 
@@ -55 +59 @@
 
     RefPtr<Plugin> m_plugin;
+    WebCore::HTMLPlugInElement* m_pluginElement;
 };
 

trunk/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -771 +771 @@
 }    
 
-PassRefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugInElement*, const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
+PassRefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugInElement* pluginElement, const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
 {
     String pluginPath;
@@ -796 +796 @@
         return 0;
 
-    return PluginView::create(plugin.release());
+    return PluginView::create(plugin.release(), pluginElement);
 #else
     return 0;