LayoutTests:

        Reviewed by Dave Hyatt.

        <rdar://problem/5379040>
        REGRESSION (Tiger-Leopard): ADOBE: Safari calls NPP_SetWindow with bad values sometimes

        Add test.

        * plugins/netscape-plugin-setwindow-size-expected.txt: Added.
        * plugins/netscape-plugin-setwindow-size.html: Added.

WebCore:

        Reviewed by Dave Hyatt.

        <rdar://problem/5379040>
        REGRESSION (Tiger-Leopard): ADOBE: Safari calls NPP_SetWindow with bad values sometimes

        Instantiate plug-ins during the first layout instead of doing so when creating the renderer.
        This ensures that the plug-in widget will have a correct initial size.

        * html/HTMLEmbedElement.cpp:
        (WebCore::HTMLEmbedElement::getInstance):
        Force a layout if the plug-in doesn't have an instance.

        (WebCore::HTMLEmbedElement::attach):
        Pass true to updateWidget, causing it to only create a widget if it won't be a plug-in.

        * html/HTMLIFrameElement.cpp:
        (WebCore::HTMLIFrameElement::attach):
        Pass false to updateWidget, this will only create subframes anyway.

        * html/HTMLObjectElement.cpp:
        (WebCore::HTMLObjectElement::getInstance):
        Force a layout if the plug-in doesn't have an instance.

        (WebCore::HTMLObjectElement::attach):
        Pass true to updateWidget, causing it to only create a widget if it won't be a plug-in.

        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::loadPlugin):
        Get the size from the renderer and pass it to the client.

        * loader/FrameLoaderClient.h:
        * page/mac/WebCoreFrameBridge.h:
        * platform/graphics/svg/SVGImageEmptyClients.h:
        (WebCore::SVGEmptyFrameLoaderClient::createPlugin):
        Update declarations.

        * rendering/RenderPart.cpp:
        (WebCore::RenderPart::setWidget):
        No need to mark the renderer as dirty here.

        * rendering/RenderPartObject.h:
        * rendering/RenderPartObject.cpp:
        (WebCore::RenderPartObject::updateWidget):
        Add a parameter, onlyCreateNonPlugins. If this is true the widget
        will only be created if it's not a plug-in.

        (WebCore::RenderPartObject::layout):
        Call updateWidget here if m_widget is 0, causing the plug-in to be instantiated.

WebKit:

        Reviewed by Dave Hyatt.

        <rdar://problem/5379040>
        REGRESSION (Tiger-Leopard): ADOBE: Safari calls NPP_SetWindow with bad values sometimes

        Pass the right size when creating the views.

        * WebCoreSupport/WebFrameBridge.mm:
        (-[WebFrameBridge viewForPluginWithFrame:URL:attributeNames:attributeValues:MIMEType:DOMElement:loadManually:]):
        * WebCoreSupport/WebFrameLoaderClient.h:
        * WebCoreSupport/WebFrameLoaderClient.mm:
        (WebFrameLoaderClient::createPlugin):

WebKitTools:

        Reviewed by Dave Hyatt.

        <rdar://problem/5379040>
        REGRESSION (Tiger-Leopard): ADOBE: Safari calls NPP_SetWindow with bad values sometimes

        Add a way for the plug-in to dump the width and height when it gets its  NPP_SetWindow call.

        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c:
        (pluginAllocate):
        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h:
        * DumpRenderTree/TestNetscapePlugIn.subproj/main.c:
        (NPP_New):
        (NPP_SetWindow):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25128 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6e4bb0bae2f34e67737a20468bf7e186817ba6a5..be986a4f6e814e8748c2670837907d53b2d7917f 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2007-08-17  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        <rdar://problem/5379040>
+        REGRESSION (Tiger-Leopard): ADOBE: Safari calls NPP_SetWindow with bad values sometimes
+        
+        Add test.
+        
+        * plugins/netscape-plugin-setwindow-size-expected.txt: Added.
+        * plugins/netscape-plugin-setwindow-size.html: Added.
+
 2007-08-17  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Maciej.

diff --git a/LayoutTests/plugins/netscape-plugin-setwindow-size-expected.txt b/LayoutTests/plugins/netscape-plugin-setwindow-size-expected.txt
new file mode 100644 (file)
index 0000000..d5b36a2
--- /dev/null
+++ b/LayoutTests/plugins/netscape-plugin-setwindow-size-expected.txt
@@ -0,0 +1,3 @@
+PLUGIN: NPP_SetWindow: 800 200
+
+This tests that a plug-in with a percentage width gets a correct NPP_SetWindow the first time.

diff --git a/LayoutTests/plugins/netscape-plugin-setwindow-size.html b/LayoutTests/plugins/netscape-plugin-setwindow-size.html
new file mode 100644 (file)
index 0000000..40000a1
--- /dev/null
+++ b/LayoutTests/plugins/netscape-plugin-setwindow-size.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<script>
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+</script>
+<body style="margin:0px;overflow:hidden">
+<embed id="testPlugin" type="application/x-webkit-test-netscape" logfirstsetwindow="true" width="100%" height="200"></embed>
+<div>
+    This tests that a plug-in with a percentage width gets a correct NPP_SetWindow the first time.
+</div>
+<body>
+</html>

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 589d4dfdfe658f94e5decf4ba89f2a8f27786f4e..99875d26f994efdca4bc2d49e25aa98b5d33f722 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,54 @@
+2007-08-17  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dave Hyatt.
+        
+        <rdar://problem/5379040>
+        REGRESSION (Tiger-Leopard): ADOBE: Safari calls NPP_SetWindow with bad values sometimes
+
+        Instantiate plug-ins during the first layout instead of doing so when creating the renderer.
+        This ensures that the plug-in widget will have a correct initial size.
+        
+        * html/HTMLEmbedElement.cpp:
+        (WebCore::HTMLEmbedElement::getInstance):
+        Force a layout if the plug-in doesn't have an instance.
+        
+        (WebCore::HTMLEmbedElement::attach):
+        Pass true to updateWidget, causing it to only create a widget if it won't be a plug-in.
+        
+        * html/HTMLIFrameElement.cpp:        
+        (WebCore::HTMLIFrameElement::attach):
+        Pass false to updateWidget, this will only create subframes anyway.
+        
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::getInstance):
+        Force a layout if the plug-in doesn't have an instance.
+        
+        (WebCore::HTMLObjectElement::attach):
+        Pass true to updateWidget, causing it to only create a widget if it won't be a plug-in.
+        
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadPlugin):
+        Get the size from the renderer and pass it to the client.
+        
+        * loader/FrameLoaderClient.h:
+        * page/mac/WebCoreFrameBridge.h:
+        * platform/graphics/svg/SVGImageEmptyClients.h:
+        (WebCore::SVGEmptyFrameLoaderClient::createPlugin):
+        Update declarations.
+        
+        * rendering/RenderPart.cpp:
+        (WebCore::RenderPart::setWidget):
+        No need to mark the renderer as dirty here.
+        
+        * rendering/RenderPartObject.h:
+        * rendering/RenderPartObject.cpp:
+        (WebCore::RenderPartObject::updateWidget):
+        Add a parameter, onlyCreateNonPlugins. If this is true the widget 
+        will only be created if it's not a plug-in.
+        
+        (WebCore::RenderPartObject::layout):
+        Call updateWidget here if m_widget is 0, causing the plug-in to be instantiated.
+        
 2007-08-17  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 106d70cd68a48da15904fc95ecab2803d3526d27..eeaf101352327f9b6497a10279a63639c81a4416 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -11750,6 +11750,7 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
+                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,

diff --git a/WebCore/html/HTMLEmbedElement.cpp b/WebCore/html/HTMLEmbedElement.cpp
index 32b88cca1dc623a60609dde7f813e6410a771615..3af6a689d01ed6fb96d52de5b262b27bfcc876ea 100644 (file)
--- a/WebCore/html/HTMLEmbedElement.cpp
+++ b/WebCore/html/HTMLEmbedElement.cpp
@@ -65,6 +65,8 @@ KJS::Bindings::Instance *HTMLEmbedElement::getInstance() const
     if (m_instance)
         return m_instance.get();
     
+    document()->updateLayoutIgnorePendingStylesheets();
+
     RenderObject *r = renderer();
     if (!r) {
         Node *p = parentNode();
@@ -153,7 +155,7 @@ void HTMLEmbedElement::attach()
     HTMLPlugInElement::attach();
 
     if (renderer())
-        static_cast<RenderPartObject*>(renderer())->updateWidget();
+        static_cast<RenderPartObject*>(renderer())->updateWidget(true);
 }
 
 void HTMLEmbedElement::detach()

diff --git a/WebCore/html/HTMLIFrameElement.cpp b/WebCore/html/HTMLIFrameElement.cpp
index 9a7ee10e4219ece05fbaa21939ea50957590446a..13a63068c0b5933167fe999a74c2e199137b6ebd 100644 (file)
--- a/WebCore/html/HTMLIFrameElement.cpp
+++ b/WebCore/html/HTMLIFrameElement.cpp
@@ -121,7 +121,7 @@ void HTMLIFrameElement::attach()
     HTMLFrameElementBase::attach();
 
     if (RenderPartObject* renderPartObject = static_cast<RenderPartObject*>(renderer()))
-        renderPartObject->updateWidget();
+        renderPartObject->updateWidget(false);
 }
 
 bool HTMLIFrameElement::isURLAttribute(Attribute* attr) const

diff --git a/WebCore/html/HTMLObjectElement.cpp b/WebCore/html/HTMLObjectElement.cpp
index a49f258e7ae399997244bbcc85653f94a38bcc57..41959e2c12fb1a17c643a75c285564b962c75d64 100644 (file)
--- a/WebCore/html/HTMLObjectElement.cpp
+++ b/WebCore/html/HTMLObjectElement.cpp
@@ -81,6 +81,7 @@ KJS::Bindings::Instance *HTMLObjectElement::getInstance() const
     if (m_instance)
         return m_instance.get();
 
+    document()->updateLayoutIgnorePendingStylesheets();
     RenderObject* r = renderer();
     if (r && r->isWidget()) {
         if (Widget* widget = static_cast<RenderWidget*>(r)->widget()) 
@@ -184,7 +185,7 @@ void HTMLObjectElement::attach()
                 // Set m_needWidgetUpdate to false before calling updateWidget because updateWidget may cause
                 // this method or recalcStyle (which also calls updateWidget) to be called.
                 m_needWidgetUpdate = false;
-                static_cast<RenderPartObject*>(renderer())->updateWidget();
+                static_cast<RenderPartObject*>(renderer())->updateWidget(true);
             } else {
                 m_needWidgetUpdate = true;
                 setChanged();

diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 7120caf01c0083c9ce24f9c62b90edbbb48d1c79..69ed952a06ca535d52aaf688c0c1e3053830e518 100644 (file)
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -1529,7 +1529,8 @@ bool FrameLoader::loadPlugin(RenderPart* renderer, const KURL& url, const String
             return false;
         }
 
-        widget = m_client->createPlugin(pluginElement, url, paramNames, paramValues, mimeType,
+        widget = m_client->createPlugin(IntSize(renderer->contentWidth(), renderer->contentHeight()), 
+                                        pluginElement, url, paramNames, paramValues, mimeType,
                                         m_frame->document()->isPluginDocument());
         if (widget) {
             renderer->setWidget(widget);

diff --git a/WebCore/loader/FrameLoaderClient.h b/WebCore/loader/FrameLoaderClient.h
index 4a52eb4518eeb3e23b511d16a623104d47ac4dc0..109928e5a213455f00958da709b0bd3c92afee71 100644 (file)
--- a/WebCore/loader/FrameLoaderClient.h
+++ b/WebCore/loader/FrameLoaderClient.h
@@ -198,7 +198,7 @@ namespace WebCore {
 
         virtual Frame* createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
                                    const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) = 0;
-        virtual Widget* createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) = 0;
+        virtual Widget* createPlugin(const IntSize&, Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) = 0;
         virtual void redirectDataToPlugin(Widget* pluginWidget) = 0;
         
         virtual Widget* createJavaAppletWidget(const IntSize&, Element*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) = 0;

diff --git a/WebCore/page/mac/WebCoreFrameBridge.h b/WebCore/page/mac/WebCoreFrameBridge.h
index 0c390931736e36b9fe4d08ec0d7d1c0a9f053365..c704191fa0a9df46ca46a5f715e4d96df8922b83 100644 (file)
--- a/WebCore/page/mac/WebCoreFrameBridge.h
+++ b/WebCore/page/mac/WebCoreFrameBridge.h
@@ -264,12 +264,13 @@ typedef enum ObjectElementType {
 
 - (void)setNeedsReapplyStyles;
 
-- (NSView *)viewForPluginWithURL:(NSURL *)URL
-                  attributeNames:(NSArray *)attributeNames
-                 attributeValues:(NSArray *)attributeValues
-                        MIMEType:(NSString *)MIMEType
-                      DOMElement:(DOMElement *)element
-                    loadManually:(BOOL)loadManually;
+- (NSView *)viewForPluginWithFrame:(NSRect)frame
+                               URL:(NSURL *)URL
+                    attributeNames:(NSArray *)attributeNames
+                   attributeValues:(NSArray *)attributeValues
+                          MIMEType:(NSString *)MIMEType
+                        DOMElement:(DOMElement *)element
+                      loadManually:(BOOL)loadManually;
 - (NSView *)viewForJavaAppletWithFrame:(NSRect)frame
                         attributeNames:(NSArray *)attributeNames
                        attributeValues:(NSArray *)attributeValues

diff --git a/WebCore/platform/graphics/svg/SVGImageEmptyClients.h b/WebCore/platform/graphics/svg/SVGImageEmptyClients.h
index 20eb6cc04500c17e6610a47db55c9889d658d8cb..5119f9f5e777495410aaf08b77aa512ac018959d 100644 (file)
--- a/WebCore/platform/graphics/svg/SVGImageEmptyClients.h
+++ b/WebCore/platform/graphics/svg/SVGImageEmptyClients.h
@@ -264,7 +264,7 @@ public:
 
     virtual Frame* createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement,
                                const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) { return 0; }
-    virtual Widget* createPlugin(Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool) { return 0; }
+    virtual Widget* createPlugin(const IntSize&,Element*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool) { return 0; }
     virtual Widget* createJavaAppletWidget(const IntSize&, Element*, const KURL&, const Vector<String>&, const Vector<String>&) { return 0; }
     
     virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType) { return ObjectContentType(); }

diff --git a/WebCore/rendering/RenderPart.cpp b/WebCore/rendering/RenderPart.cpp
index 7b454e9572bb75319b5911a1b86b7369b9442429..698205ce15e1cb145d7a09dce46603be8bf81238 100644 (file)
--- a/WebCore/rendering/RenderPart.cpp
+++ b/WebCore/rendering/RenderPart.cpp
@@ -63,8 +63,6 @@ void RenderPart::setWidget(Widget* widget)
             static_cast<FrameView*>(widget)->ref();
         RenderWidget::setWidget(widget);
 
-        setNeedsLayoutAndPrefWidthsRecalc();
-
         // make sure the scrollbars are set correctly for restore
         // ### find better fix
         viewCleared();

diff --git a/WebCore/rendering/RenderPartObject.cpp b/WebCore/rendering/RenderPartObject.cpp
index 1bed517ffb7444b00bccdd877ab2db9336e6dda9..4dd956fbd78d1a750fdd17cec04cff7a5a0db188 100644 (file)
--- a/WebCore/rendering/RenderPartObject.cpp
+++ b/WebCore/rendering/RenderPartObject.cpp
@@ -29,6 +29,7 @@
 #include "EventHandler.h"
 #include "Frame.h"
 #include "FrameLoader.h"
+#include "FrameLoaderClient.h"
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "HTMLEmbedElement.h"
@@ -100,16 +101,14 @@ static inline void mapClassIdToServiceType(const String& classId, String& servic
     // TODO: add more plugins here
 }
 
-void RenderPartObject::updateWidget()
+void RenderPartObject::updateWidget(bool onlyCreateNonPlugins)
 {
   String url;
   String serviceType;
   Vector<String> paramNames;
   Vector<String> paramValues;
   Frame* frame = m_view->frame();
-
-  setNeedsLayoutAndPrefWidthsRecalc();
-
+  
   if (element()->hasTagName(objectTag)) {
 
       HTMLObjectElement* o = static_cast<HTMLObjectElement*>(element());
@@ -217,6 +216,16 @@ void RenderPartObject::updateWidget()
               (child->isTextNode() && !static_cast<Text*>(child)->containsOnlyWhitespace()))
               m_hasFallbackContent = true;
       }
+      
+      if (onlyCreateNonPlugins) {
+          KURL completedURL;
+          if (!url.isEmpty())
+              completedURL = frame->loader()->completeURL(url);
+        
+          if (frame->loader()->client()->objectContentType(completedURL, serviceType) == ObjectContentPlugin)
+              return;
+      }
+      
       bool success = frame->loader()->requestObject(this, url, AtomicString(o->name()), serviceType, paramNames, paramValues);
       if (!success && m_hasFallbackContent)
           o->renderFallbackContent();
@@ -239,6 +248,16 @@ void RenderPartObject::updateWidget()
               paramValues.append(it->value().domString());
           }
       }
+      
+      if (onlyCreateNonPlugins) {
+          KURL completedURL;
+          if (!url.isEmpty())
+              completedURL = frame->loader()->completeURL(url);
+          
+          if (frame->loader()->client()->objectContentType(completedURL, serviceType) == ObjectContentPlugin)
+              return;
+      }
+      
       frame->loader()->requestObject(this, url, o->getAttribute(nameAttr), serviceType, paramNames, paramValues);
   }
 }
@@ -253,6 +272,9 @@ void RenderPartObject::layout()
 
     RenderPart::layout();
 
+    if (!m_widget)
+      updateWidget(false);
+    
     setNeedsLayout(false);
 }
 

diff --git a/WebCore/rendering/RenderPartObject.h b/WebCore/rendering/RenderPartObject.h
index 6054564b52a4d6b536c7350fa9d629391cb06e79..e71131abead5f80588d830090832d4abcbbf3e60 100644 (file)
--- a/WebCore/rendering/RenderPartObject.h
+++ b/WebCore/rendering/RenderPartObject.h
@@ -36,7 +36,7 @@ public:
     virtual const char* renderName() const { return "RenderPartObject"; }
 
     virtual void layout();
-    virtual void updateWidget();
+    void updateWidget(bool onlyCreateNonPlugins);
 
     virtual void viewCleared();
 };

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a2ff8bdfe4c33dadddb1a859607b490cf125f97d..4e84c06b4310a8b170a9de55e3fdc39c4e010e21 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2007-08-17  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        <rdar://problem/5379040> 
+        REGRESSION (Tiger-Leopard): ADOBE: Safari calls NPP_SetWindow with bad values sometimes
+        
+        Pass the right size when creating the views.
+        
+        * WebCoreSupport/WebFrameBridge.mm:
+        (-[WebFrameBridge viewForPluginWithFrame:URL:attributeNames:attributeValues:MIMEType:DOMElement:loadManually:]):
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::createPlugin):
+
 2007-08-13  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Dave Hyatt.

diff --git a/WebKit/WebCoreSupport/WebFrameBridge.mm b/WebKit/WebCoreSupport/WebFrameBridge.mm
index a11c13b035bcd0efd7465f44ebe455a61884b68f..8ec72a6419546d9addc9c6a9733e4bc1cd242cb1 100644 (file)
--- a/WebKit/WebCoreSupport/WebFrameBridge.mm
+++ b/WebKit/WebCoreSupport/WebFrameBridge.mm
@@ -432,12 +432,13 @@ NSString *WebPluginContainerKey =   @"WebPluginContainer";
     return nil;
 }
 
-- (NSView *)viewForPluginWithURL:(NSURL *)URL
-                  attributeNames:(NSArray *)attributeNames
-                 attributeValues:(NSArray *)attributeValues
-                        MIMEType:(NSString *)MIMEType
-                      DOMElement:(DOMElement *)element
-                    loadManually:(BOOL)loadManually
+- (NSView *)viewForPluginWithFrame:(NSRect)frame
+                               URL:(NSURL *)URL
+                    attributeNames:(NSArray *)attributeNames
+                   attributeValues:(NSArray *)attributeValues
+                          MIMEType:(NSString *)MIMEType
+                        DOMElement:(DOMElement *)element
+                      loadManually:(BOOL)loadManually
 {
     ASSERT([attributeNames count] == [attributeValues count]);
 
@@ -491,7 +492,7 @@ NSString *WebPluginContainerKey =   @"WebPluginContainer";
         }
 #ifndef __LP64__
         else if ([pluginPackage isKindOfClass:[WebNetscapePluginPackage class]]) {
-            WebNetscapePluginEmbeddedView *embeddedView = [[[WebNetscapePluginEmbeddedView alloc] initWithFrame:NSZeroRect
+            WebNetscapePluginEmbeddedView *embeddedView = [[[WebNetscapePluginEmbeddedView alloc] initWithFrame:frame
                                                            pluginPackage:(WebNetscapePluginPackage *)pluginPackage
                                                                      URL:URL
                                                                  baseURL:baseURL
@@ -517,7 +518,7 @@ NSString *WebPluginContainerKey =   @"WebPluginContainer";
                                                      pluginPageURL:pluginPageURL
                                                         pluginName:[pluginPackage name]
                                                           MIMEType:MIMEType];
-        WebNullPluginView *nullView = [[[WebNullPluginView alloc] initWithFrame:NSZeroRect error:error DOMElement:element] autorelease];
+        WebNullPluginView *nullView = [[[WebNullPluginView alloc] initWithFrame:frame error:error DOMElement:element] autorelease];
         view = nullView;
         [error release];
     }

diff --git a/WebKit/WebCoreSupport/WebFrameLoaderClient.h b/WebKit/WebCoreSupport/WebFrameLoaderClient.h
index 2cb314fd829d3983b94501a4702a7e9117c74c46..66ac2b416be679afeba949b059ec26e92f93284c 100644 (file)
--- a/WebKit/WebCoreSupport/WebFrameLoaderClient.h
+++ b/WebKit/WebCoreSupport/WebFrameLoaderClient.h
@@ -184,7 +184,7 @@ private:
 
     virtual WebCore::Frame* createFrame(const WebCore::KURL& url, const WebCore::String& name, WebCore::HTMLFrameOwnerElement*,
                                         const WebCore::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight);
-    virtual WebCore::Widget* createPlugin(WebCore::Element*, const WebCore::KURL&, const Vector<WebCore::String>&,
+    virtual WebCore::Widget* createPlugin(const WebCore::IntSize&, WebCore::Element*, const WebCore::KURL&, const Vector<WebCore::String>&,
                                           const Vector<WebCore::String>&, const WebCore::String&, bool);
     virtual void redirectDataToPlugin(WebCore::Widget* pluginWidget);
     

diff --git a/WebKit/WebCoreSupport/WebFrameLoaderClient.mm b/WebKit/WebCoreSupport/WebFrameLoaderClient.mm
index e5610d2b64fa7cf1e506670f7d01815cf46fccfc..a98c535a55d5776d3d667563463058dfc68b527e 100644 (file)
--- a/WebKit/WebCoreSupport/WebFrameLoaderClient.mm
+++ b/WebKit/WebCoreSupport/WebFrameLoaderClient.mm
@@ -1215,18 +1215,19 @@ static NSArray* nsArray(const Vector<String>& vector)
     return array;
 }
 
-Widget* WebFrameLoaderClient::createPlugin(Element* element, const KURL& url, const Vector<String>& paramNames,
+Widget* WebFrameLoaderClient::createPlugin(const IntSize& size, Element* element, const KURL& url, const Vector<String>& paramNames,
                                            const Vector<String>& paramValues, const String& mimeType, bool loadManually)
 {
     WebFrameBridge* bridge = m_webFrame->_private->bridge;
 
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
-    return new Widget([bridge viewForPluginWithURL:url.getNSURL()
-                              attributeNames:nsArray(paramNames)
-                              attributeValues:nsArray(paramValues)
-                              MIMEType:mimeType
-                              DOMElement:[DOMElement _wrapElement:element]
-                              loadManually:loadManually]);
+    return new Widget([bridge viewForPluginWithFrame:NSMakeRect(0, 0, size.width(), size.height())
+                                                 URL:url.getNSURL()
+                                      attributeNames:nsArray(paramNames)
+                                     attributeValues:nsArray(paramValues)
+                                            MIMEType:mimeType
+                                          DOMElement:[DOMElement _wrapElement:element]
+                                        loadManually:loadManually]);
     END_BLOCK_OBJC_EXCEPTIONS;
 
     return 0;

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e7006d3429f3851bcc8c86d4aec5cf99d8a2431f..8860f5f53eece318f56b0a2cec5e7f16d8c6d1d4 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2007-08-17  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        <rdar://problem/5379040>
+        REGRESSION (Tiger-Leopard): ADOBE: Safari calls NPP_SetWindow with bad values sometimes
+
+        Add a way for the plug-in to dump the width and height when it gets its  NPP_SetWindow call.
+        
+        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c:
+        (pluginAllocate):
+        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h:
+        * DumpRenderTree/TestNetscapePlugIn.subproj/main.c:
+        (NPP_New):
+        (NPP_SetWindow):
+
 2007-08-16  Alice Liu  <alice.liu@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c b/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c
index 69b5ca08859f541ca6d848905a16e269ec4662f1..f9c808f02ef033a1cee42147a998698a13a94d36 100644 (file)
--- a/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c
+++ b/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c
@@ -334,6 +334,7 @@ static NPObject *pluginAllocate(NPP npp, NPClass *theClass)
     newInstance->testObject = browser->createobject(npp, getTestClass());
     newInstance->eventLogging = FALSE;
     newInstance->logDestroy = FALSE;
+    newInstance->logSetWindow = FALSE;
     newInstance->returnErrorFromNewStream = FALSE;
     newInstance->stream = 0;
     

diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h b/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h
index a25b3d9c95b140892c11be4008a94830fa184742..95abbf95f1931cf0a8343ec10e4ab69dbf30bc0c 100644 (file)
--- a/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h
+++ b/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h
@@ -39,6 +39,7 @@ typedef struct {
     NPObject header;
     NPP npp;
     NPBool eventLogging;
+    NPBool logSetWindow;
     NPBool logDestroy;
     NPBool returnErrorFromNewStream;
     NPObject* testObject;

diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c b/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c
index 017c07b5d2e692fcb2f1691c88c625a70f42c90f..3e84c42260e0acca11801c5248a715f731b241a0 100644 (file)
--- a/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c
+++ b/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c
@@ -83,6 +83,8 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, ch
             else if (strcasecmp(argn[i], "src") == 0 &&
                      strcasecmp(argv[i], "data:application/x-webkit-test-netscape,returnerrorfromnewstream") == 0)
                 obj->returnErrorFromNewStream = TRUE;
+            else if (strcasecmp(argn[i], "logfirstsetwindow") == 0)
+                obj->logSetWindow = TRUE;
         }
         
         instance->pdata = obj;
@@ -108,6 +110,15 @@ NPError NPP_Destroy(NPP instance, NPSavedData **save)
 
 NPError NPP_SetWindow(NPP instance, NPWindow *window)
 {
+    PluginObject *obj = instance->pdata;
+
+    if (obj) {
+        if (obj->logSetWindow) {
+            printf("PLUGIN: NPP_SetWindow: %d %d\n", window->width, window->height);
+            obj->logSetWindow = false;
+        }
+    }
+    
     return NPERR_NO_ERROR;
 }