[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 ea8e13bd4d955df40d148cfcd0675e405e51ae7e
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 16 00:41:21 2004 +0000

    	Fixed: <rdar://problem/3695724> WebKit plug-ins should only have to implement plugInViewWithArguments:
    
            Reviewed by rjw.
    
            * ChangeLog:
            * Plugins.subproj/WebPluginViewFactory.h: mention that plugInViewWithArguments is required
            * WebView.subproj/WebFrame.m:
            (-[WebFrame _reloadForPluginChanges]): check for plugInViewWithArguments: not webPlugInInitialize
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView addSubview:]): ditto
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6859 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6161c7c..4857c1a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,25 @@
+2004-06-15  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3695724> WebKit plug-ins should only have to implement plugInViewWithArguments:
+
+        Reviewed by rjw.
+
+        * ChangeLog:
+        * Plugins.subproj/WebPluginViewFactory.h: mention that plugInViewWithArguments is required
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _reloadForPluginChanges]): check for plugInViewWithArguments: not webPlugInInitialize
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView addSubview:]): ditto
+
+2004-06-15  Chris Blumenberg  <cblu at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _reloadForPluginChanges]):
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView addSubview:]):
+
 2004-06-15  Trey Matteson  <trey at apple.com>
 
 	3695240 - pasting plain text with newlines in it turns them into spaces
diff --git a/WebKit/Plugins.subproj/WebPluginViewFactory.h b/WebKit/Plugins.subproj/WebPluginViewFactory.h
index 26018d0..85a0455 100644
--- a/WebKit/Plugins.subproj/WebPluginViewFactory.h
+++ b/WebKit/Plugins.subproj/WebPluginViewFactory.h
@@ -47,7 +47,7 @@ extern NSString *WebPlugInContainingElementKey;
 
 /*!
     @method plugInViewWithArguments: 
-    @param arguments The arguments dictionary with the mentioned keys and objects.
+    @param arguments The arguments dictionary with the mentioned keys and objects. This method is required to implement.
     @result Returns an NSView object that conforms to the WebPlugIn informal protocol.
 */
 + (NSView *)plugInViewWithArguments:(NSDictionary *)arguments;
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index ee31ff8..4575d5f 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -2384,7 +2384,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
         while ((view = [viewEnumerator nextObject]) != nil) {
             if ([view isKindOfClass:[WebNetscapePluginEmbeddedView class]] ||
                 [view isKindOfClass:[WebNullPluginView class]] ||
-                [view respondsToSelector:@selector(webPlugInInitialize)] ||
+                [[view class] respondsToSelector:@selector(plugInViewWithArguments:)] ||
                 [view respondsToSelector:@selector(pluginInitialize)]) {
                 [self reload];
                 break;
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index b7faeee..55d3ff3 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -1437,7 +1437,7 @@ static WebHTMLView *lastHitView = nil;
 {
     [super addSubview:view];
 
-    if ([view respondsToSelector:@selector(webPlugInInitialize)] || [view respondsToSelector:@selector(pluginInitialize)]) {
+    if ([[view class] respondsToSelector:@selector(plugInViewWithArguments:)] || [view respondsToSelector:@selector(pluginInitialize)]) {
         [[self _pluginController] addPlugin:view];
     }
 }

-- 
WebKit Debian packaging