Commit 0ce577a1 authored by cblu's avatar cblu

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
parent 8807f2f1
2003-01-08 Chris Blumenberg <cblu@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@apple.com>
3136213 - Page loads stopped by backtracking don't finish when moving forward
......
2003-01-08 Chris Blumenberg <cblu@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@apple.com>
3136213 - Page loads stopped by backtracking don't finish when moving forward
......
......@@ -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()];
......
......@@ -249,6 +249,8 @@ enum FrameBorderStyle {
- (int)getObjectCacheSize;
- (BOOL)frameRequiredForMIMEType: (NSString*)mimeType;
- (void)loadEmptyDocumentSynchronously;
- (NSString *)MIMETypeForPath:(NSString *)path;
......
2003-01-08 Chris Blumenberg <cblu@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@apple.com>
FIXED: 3128098 - flash performance weak!!!
......
......@@ -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 @@ -(int)getObjectCacheSize
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:@""];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment