[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 0ce577a13f547bbe4fd50e66271d5b486a12c424
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 9 02:08:43 2003 +0000

    WebCore:
    
    	Fixed: 3111432 - Support OBJECT tags with type text/plain or text/html
    
            Reviewed by dave.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::createPart): call [_bridge frameRequiredForMIMEType:] to determine if we should create a plug-in view or iframe
            * kwq/WebCoreBridge.h: add frameRequiredForMIMEType:
    
    WebKit:
    
    	Fixed: 3111432 - Support OBJECT tags with type text/plain or text/html
    
            Reviewed by dave.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge frameRequiredForMIMEType:]): added, returns YES for non-plug-in views
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3279 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 48ae844..fccbede 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-01-08  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3111432 - Support OBJECT tags with type text/plain or text/html
+
+        Reviewed by dave.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::createPart): call [_bridge frameRequiredForMIMEType:] to determine if we should create a plug-in view or iframe 
+        * kwq/WebCoreBridge.h: add frameRequiredForMIMEType:
+
 2003-01-08  Trey Matteson  <trey at apple.com>
 
 	3136213 - Page loads stopped by backtracking don't finish when moving forward
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 48ae844..fccbede 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-01-08  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3111432 - Support OBJECT tags with type text/plain or text/html
+
+        Reviewed by dave.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::createPart): call [_bridge frameRequiredForMIMEType:] to determine if we should create a plug-in view or iframe 
+        * kwq/WebCoreBridge.h: add frameRequiredForMIMEType:
+
 2003-01-08  Trey Matteson  <trey at apple.com>
 
 	3136213 - Page loads stopped by backtracking don't finish when moving forward
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 6ccf495..71d64ad 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -236,7 +236,8 @@ class KWQPluginPart : public ReadOnlyPart
 
 ReadOnlyPart *KWQKHTMLPart::createPart(const ChildFrame &child, const KURL &url, const QString &mimeType)
 {
-    if (child.m_type == ChildFrame::Object) {
+    BOOL needFrame = [_bridge frameRequiredForMIMEType: mimeType.getNSString()];
+    if (child.m_type == ChildFrame::Object && !needFrame) {
         NSMutableArray *attributesArray = [NSMutableArray arrayWithCapacity:child.m_params.count()];
         for (uint i = 0; i < child.m_params.count(); i++) {
             [attributesArray addObject:child.m_params[i].getNSString()];
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index eaa9095..99c507d 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -249,6 +249,8 @@ enum FrameBorderStyle {
 
 - (int)getObjectCacheSize;
 
+- (BOOL)frameRequiredForMIMEType: (NSString*)mimeType;
+
 - (void)loadEmptyDocumentSynchronously;
 
 - (NSString *)MIMETypeForPath:(NSString *)path;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4f8021d..b6b6414 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2003-01-08  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: 3111432 - Support OBJECT tags with type text/plain or text/html
+
+        Reviewed by dave.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge frameRequiredForMIMEType:]): added, returns YES for non-plug-in views
+
+2003-01-08  Chris Blumenberg  <cblu at apple.com>
+
 	FIXED: 3128098 - flash performance weak!!!
 
         Reviewed by darin.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 71a8279..355188a 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -27,6 +27,7 @@
 #import <WebKit/WebPluginError.h>
 #import <WebKit/WebPluginPackage.h>
 #import <WebKit/WebPluginViewFactory.h>
+#import <WebKit/WebNetscapePluginDocumentView.h>
 #import <WebKit/WebPreferencesPrivate.h>
 #import <WebKit/WebResourceLoadDelegate.h>
 #import <WebKit/WebSubresourceClient.h>
@@ -37,6 +38,7 @@
 #import <WebFoundation/WebError.h>
 #import <WebFoundation/WebHTTPResourceRequest.h>
 #import <WebFoundation/WebNSStringExtras.h>
+#import <WebFoundation/WebNSDictionaryExtras.h>
 #import <WebFoundation/WebNSURLExtras.h>
 #import <WebFoundation/WebResourceHandle.h>
 #import <WebFoundation/WebResourceResponse.h>
@@ -549,6 +551,22 @@ static BOOL loggedObjectCacheSize = NO;
     return cacheSize * multiplier;
 }
 
+- (BOOL)frameRequiredForMIMEType: (NSString*)mimeType
+{
+    // Assume a plugin is required. Don't make a frame.
+    if ([mimeType length] == 0)
+        return NO;
+    
+    Class result = [[WebView _viewTypes] _web_objectForMIMEType: mimeType];
+    if (!result)
+        return NO;  // Want to display a "plugin not found" dialog/image, so let a plugin get made.
+        
+    // 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]];
+}
+
 - (void)loadEmptyDocumentSynchronously
 {
     NSURL *url = [[NSURL alloc] initWithString:@""];

-- 
WebKit Debian packaging