The following commit has been merged in the debian/unstable branch:
commit 10c554edf76ba8d5fd47d5774513e6ca7b016b6d
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jun 3 02:48:21 2004 +0000
conformsToProtocol:@protocol(WebPlugin) becomes
respondsToSelector:@selector(webPlugInInitialize) because
protocol was changed to an informal protocol.
Reviewed by Kevin.
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge frameRequiredForMIMEType:URL:]):
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView addSubview:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6749 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e041b70..f8432c3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2004-06-02 Richard Williamson <rjw at apple.com>
+
+ conformsToProtocol:@protocol(WebPlugin) becomes
+ respondsToSelector:@selector(webPlugInInitialize) because
+ protocol was changed to an informal protocol.
+
+ Reviewed by Kevin.
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge frameRequiredForMIMEType:URL:]):
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView addSubview:]):
+
2004-06-01 Trey Matteson <trey at apple.com>
First cut at source side of DHTML dragging. Most of the work is in WebCore.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 372dabc..900fffd 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -967,7 +967,7 @@ static BOOL loggedObjectCacheSize = NO;
// Ultimately we should just use frames for all mime types (plugins and HTML/XML/text documents),
// but for now we're burdened with making a distinction between the two.
return !([viewClass isSubclassOfClass:[WebNetscapePluginDocumentView class]] ||
- [viewClass conformsToProtocol:@protocol(WebPlugin)]);
+ [viewClass respondsToSelector:@selector(webPlugInInitialize)]);
}
- (void)loadEmptyDocumentSynchronously
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index e41ab62..155bd55 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -1321,7 +1321,7 @@ static WebHTMLView *lastHitView = nil;
{
[super addSubview:view];
- if ([view conformsToProtocol:@protocol(WebPlugin)]) {
+ if ([view respondsToSelector:@selector(webPlugInInitialize)]) {
[[self _pluginController] addPlugin:view];
}
}
--
WebKit Debian packaging