[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 2577062ba9450175d187c4e56ec40e2eaffb0957
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 14 21:21:14 2004 +0000

    	Fixed: <rdar://problem/3655495>: (exception loading applets)
    
            Reviewed by kocienda.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge pluginViewWithPackage:attributes:baseURL:]): when calling old cocoa plug-ins, use old keys
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6603 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b2f8966..db347bc 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2004-05-14  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: <rdar://problem/3655495>: (exception loading applets)
+
+        Reviewed by kocienda.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge pluginViewWithPackage:attributes:baseURL:]): when calling old cocoa plug-ins, use old keys
+
+2004-05-14  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: <rdar://problem/3655204>: (repro assertion failure and crash loading java applets)
 
         Reviewed by kocienda.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index f00823e..96a7c60 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -86,6 +86,10 @@
 + (NSView <WebPlugin> *)pluginViewWithArguments:(NSDictionary *)arguments;
 @end
 
+NSString *WebPluginBaseURLKey =     @"WebPluginBaseURL";
+NSString *WebPluginAttributesKey =  @"WebPluginAttributes";
+NSString *WebPluginContainerKey =   @"WebPluginContainer";
+
 @implementation WebBridge
 
 - (id)initWithWebFrame:(WebFrame *)webFrame
@@ -727,22 +731,26 @@
 
     ASSERT([docView isKindOfClass:[WebHTMLView class]]);
     
-    WebPluginController *pluginController = [docView _pluginController];
-    
-    NSDictionary *arguments = [NSDictionary dictionaryWithObjectsAndKeys:
-        baseURL, WebPlugInBaseURLKey,
-        attributes, WebPlugInAttributesKey,
-        pluginController, WebPlugInContainerKey,
-        nil];
-
-    LOG(Plugins, "arguments:\n%@", arguments);
-
     [pluginPackage load];
     
+    WebPluginController *pluginController = [docView _pluginController];
     Class viewFactory = [pluginPackage viewFactory];
+    
     if ([viewFactory respondsToSelector:@selector(plugInViewWithArguments:)]) {
+        NSDictionary *arguments = [NSDictionary dictionaryWithObjectsAndKeys:
+            baseURL, WebPlugInBaseURLKey,
+            attributes, WebPlugInAttributesKey,
+            pluginController, WebPlugInContainerKey,
+            nil];
+        LOG(Plugins, "arguments:\n%@", arguments);
         return [viewFactory plugInViewWithArguments:arguments];
     } else if ([viewFactory respondsToSelector:@selector(pluginViewWithArguments:)]) {
+        NSDictionary *arguments = [NSDictionary dictionaryWithObjectsAndKeys:
+            baseURL, WebPluginBaseURLKey,
+            attributes, WebPluginAttributesKey,
+            pluginController, WebPluginContainerKey,
+            nil];
+        LOG(Plugins, "arguments:\n%@", arguments);
         return [viewFactory pluginViewWithArguments:arguments];
     } else {
         return nil;

-- 
WebKit Debian packaging