[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 bb853d16d2c2a0bf571ff154f6e83db96e5bef27
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 14 20:59:58 2004 +0000

    	Fixed: <rdar://problem/3655204>: (repro assertion failure and crash loading java applets)
    
            Reviewed by kocienda.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge pluginViewWithPackage:attributes:baseURL:]): call pluginViewWithArguments: for old Cocoa plug-ins
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6602 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ef62b99..b2f8966 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-14  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3655204>: (repro assertion failure and crash loading java applets)
+
+        Reviewed by kocienda.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge pluginViewWithPackage:attributes:baseURL:]): call pluginViewWithArguments: for old Cocoa plug-ins
+
 === Safari-140 ===
 
 2004-05-14  Chris Blumenberg  <cblu at apple.com>
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 8db1b76..f00823e 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -81,6 +81,11 @@
 - (jobject)pollForAppletInWindow: (NSWindow *)window;
 @end
 
+// For compatibility only.
+ at interface NSObject (OldPluginAPI)
++ (NSView <WebPlugin> *)pluginViewWithArguments:(NSDictionary *)arguments;
+ at end
+
 @implementation WebBridge
 
 - (id)initWithWebFrame:(WebFrame *)webFrame
@@ -714,9 +719,9 @@
     return [[[self dataSource] request] HTTPReferrer];
 }
 
-- (NSView <WebPlugin> *)pluginViewWithPackage:(WebPluginPackage *)pluginPackage
-                                   attributes:(NSDictionary *)attributes
-                                      baseURL:(NSURL *)baseURL
+- (NSView *)pluginViewWithPackage:(WebPluginPackage *)pluginPackage
+                       attributes:(NSDictionary *)attributes
+                          baseURL:(NSURL *)baseURL
 {
     WebHTMLView *docView = (WebHTMLView *)[[_frame frameView] documentView];
 
@@ -734,7 +739,14 @@
 
     [pluginPackage load];
     
-    return [[pluginPackage viewFactory] plugInViewWithArguments:arguments];
+    Class viewFactory = [pluginPackage viewFactory];
+    if ([viewFactory respondsToSelector:@selector(plugInViewWithArguments:)]) {
+        return [viewFactory plugInViewWithArguments:arguments];
+    } else if ([viewFactory respondsToSelector:@selector(pluginViewWithArguments:)]) {
+        return [viewFactory pluginViewWithArguments:arguments];
+    } else {
+        return nil;
+    }
 }
 
 - (NSView *)viewForPluginWithURL:(NSURL *)URL

-- 
WebKit Debian packaging