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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit b99b3c5b024aad284104bfe633c8650b4c5f5e02
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 14 01:08:24 2004 +0000

    WebKit:
    	Updated to reflect new API.
    
            Reviewed by Chris.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge setIsSelected:forView:]):
            * WebView.subproj/WebFrame.m:
            (-[WebFrame _reloadForPluginChanges]):
    
    WebCore:
    	Removed vestigial isSelected method.
    
            Reviewed by Chris.
    
            * kwq/KWQWidget.h:
            * kwq/KWQWidget.mm:
            (QWidget::setIsSelected):
            * kwq/WebCoreBridge.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6594 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2e1c902..d3e3fd4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-05-13  Richard Williamson   <rjw at apple.com>
+
+	Removed vestigial isSelected method.
+
+        Reviewed by Chris.
+
+        * kwq/KWQWidget.h:
+        * kwq/KWQWidget.mm:
+        (QWidget::setIsSelected):
+        * kwq/WebCoreBridge.h:
+
 2004-05-13  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3616555>: (API: Make DOM extensions and WebKit DOM operations public)
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index 4cd12d2..15a6580 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -157,7 +157,6 @@ public:
     void sendConsumedMouseUp();
     
     void setIsSelected(bool isSelected);
-    bool isSelected();
 
 private:
     KWQWidgetPrivate *data;
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 1c8bcde..2b6beda 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -554,8 +554,3 @@ void QWidget::setIsSelected(bool isSelected)
 {
     [KWQKHTMLPart::bridgeForWidget(this) setIsSelected:isSelected forView:getView()];
 }
-
-bool QWidget::isSelected()
-{
-    return [KWQKHTMLPart::bridgeForWidget(this) isViewSelected:getView()];
-}
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 25c7c24..4ab44a5 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -447,7 +447,6 @@ typedef enum {
 - (void)editingKeyDown:(NSEvent *)event;
 
 - (void)setIsSelected:(BOOL)isSelected forView:(NSView *)view;
-- (BOOL)isViewSelected:(NSView *)view;
 
 - (NSString *)overrideMediaType;
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cffd039..82dea89 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2004-05-13  Richard Williamson   <rjw at apple.com>
+
+	Updated to reflect new API.
+
+        Reviewed by Chris.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge setIsSelected:forView:]):
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _reloadForPluginChanges]):
+
 2004-05-13  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed some indenting issues in public headers.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index b41eba7..73531a3 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -60,6 +60,11 @@
 #define AppleKeyboardUIMode CFSTR("AppleKeyboardUIMode")
 #define UniversalAccessDomain CFSTR("com.apple.universalaccess")
 
+// For compatibility only with old SPI. 
+ at interface NSObject (OldWebPlugin)
+- (void)setIsSelected:(BOOL)f;
+ at end
+
 @interface NSApplication (DeclarationStolenFromAppKit)
 - (void)_cycleWindowsReversed:(BOOL)reversed;
 @end
@@ -1240,14 +1245,12 @@ static id <WebFormDelegate> formDelegate(WebBridge *self)
 
 - (void)setIsSelected:(BOOL)isSelected forView:(NSView *)view
 {
-    if ([view conformsToProtocol:@protocol(WebPluginSelection)]) {
-        [(id <WebPluginSelection>)view setIsSelected:isSelected];
+    if ([view respondsToSelector:@selector(webPlugInSetIsSelected)]) {
+        [view webPlugInSetIsSelected:isSelected];
+    }
+    else if ([view respondsToSelector:@selector(setIsSelected)]) {
+        [view setIsSelected:isSelected];
     }
-}
-
-- (BOOL)isViewSelected:(NSView *)view
-{
-    return [view conformsToProtocol:@protocol(WebPluginSelection)] ? [(id <WebPluginSelection>)view isSelected] : NO;
 }
 
 - (NSString *)overrideMediaType
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 5a3e274..e263013 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -2470,10 +2470,12 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     } else if ([documentView isKindOfClass:[WebHTMLView class]]) {
         NSEnumerator *viewEnumerator = [[documentView subviews] objectEnumerator];
         NSView *view;
+        // FIXME:  We should ask the frame if it contains plugins, rather
+        // than doing this check.
         while ((view = [viewEnumerator nextObject]) != nil) {
             if ([view isKindOfClass:[WebNetscapePluginEmbeddedView class]] ||
                 [view isKindOfClass:[WebNullPluginView class]] ||
-                [view conformsToProtocol:@protocol(WebPlugin)]) {
+                [view respondsToSelector:@selector(webPlugInInitialize)]) {
                 [self reload];
                 break;
             }

-- 
WebKit Debian packaging