[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 1c35d9d1c1c6fd944b37a0bdb5ab941e128a216e
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 3 19:56:57 2003 +0000

            Reviewed by Chris & Darin.
    
            Fixed frameRequiredForMIMEType: to correctly check for BOTH
            netscape plugins and cocoa plugins.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge frameRequiredForMIMEType:]):
    
            Made WebPluginViewFactory.h private (SPI) to provide access to
            plugin package keys.
    
            * WebKit.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3728 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 22a22c2..48a3606 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2003-03-01  Richard Williamson   <rjw at apple.com>
+
+        Reviewed by Chris & Darin.
+
+        Fixed frameRequiredForMIMEType: to correctly check for BOTH
+        netscape plugins and cocoa plugins.
+        
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge frameRequiredForMIMEType:]):
+        
+        Made WebPluginViewFactory.h private (SPI) to provide access to
+        plugin package keys.
+        
+        * WebKit.pbproj/project.pbxproj:
+
 2003-02-28  Richard Williamson   <rjw at apple.com>
 
         Make WebDOM* classes private instead of public.  This change
diff --git a/WebKit/Misc.subproj/WebKit.h b/WebKit/Misc.subproj/WebKit.h
index 6162fb6..73cb969 100644
--- a/WebKit/Misc.subproj/WebKit.h
+++ b/WebKit/Misc.subproj/WebKit.h
@@ -1,4 +1,5 @@
-/*	#import <WebKit/WebKit.h>
+/*	
+        WebKit.h
 	Copyright 2001, Apple, Inc. All rights reserved.
 */
 
@@ -9,6 +10,7 @@
 #import <WebKit/WebDataSource.h>
 #import <WebKit/WebDefaultPolicyDelegate.h>
 #import <WebKit/WebDocument.h>
+#import <WebKit/WebDownload.h>
 #import <WebKit/WebFrame.h>
 #import <WebKit/WebHTMLRepresentation.h>
 #import <WebKit/WebHTMLView.h>
@@ -17,7 +19,9 @@
 #import <WebKit/WebKitErrors.h>
 #import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebPreferences.h>
+#import <WebKit/WebPluginError.h>
 #import <WebKit/WebResourceLoadDelegate.h>
+#import <WebKit/WebResourceResponseExtras.h>
 #import <WebKit/WebStandardPanels.h>
 #import <WebKit/WebView.h>
 #import <WebKit/WebWindowOperationsDelegate.h>
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 0037a5b..4d1cda4 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -575,7 +575,8 @@ static BOOL loggedObjectCacheSize = NO;
     // If we're a supported type other than a plugin, we want to make a frame.
     // 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 ![result isSubclassOfClass: [WebNetscapePluginDocumentView class]];
+    return !([result isSubclassOfClass: [WebNetscapePluginDocumentView class]] ||
+            [result conformsToProtocol: @protocol(WebPlugin)]);
 }
 
 - (void)loadEmptyDocumentSynchronously
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 30cfd12..869d741 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -1488,6 +1488,9 @@
 			fileRef = 848DFF860365FE6A00CA2ACA;
 			isa = PBXBuildFile;
 			settings = {
+				ATTRIBUTES = (
+					Private,
+				);
 			};
 		};
 		65490EC803666E25000CED4B = {

-- 
WebKit Debian packaging