Changeset 26758 in webkit

Timestamp:

Oct 18, 2007 5:33:19 PM (17 years ago)

Author:

mitz

Message:

WebCore:

Reviewed by Adam Roben.

• fix <rdar://problem/5313523> REGRESSION(Leopard): http/tests/incremental/slow-utf8-text.pl fails on Leopard

• platform/network/mac/ResourceResponseMac.mm: (WebCore::ResourceResponse::doUpdateResourceResponse): Work around <rdar://problem/5321972> by testing for the case of a response with a MIME type of application/octet-stream and a Content-Type header starting with text/plain and setting the MIME type to text/plain in that case.

WebKit:

Reviewed by Adam Roben.

• fix <rdar://problem/5313523> REGRESSION(Leopard): http/tests/incremental/slow-utf8-text.pl fails on Leopard

• WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::makeDocumentView): Changed to use _responseMIMEType.
• WebView/WebDataSource.mm: (-[WebDataSource _MIMETypeOfResponse:]): Added. Works around <rdar://problem/5321972> by testing for the case of an NSHTTPURLResponse with a MIMEType of application/octet-stream and a Content-Type header starting with text/plain and returning text/plain as the MIME type in that case. (-[WebDataSource _responseMIMEType]): Added. Used to get the correct response MIME type. (-[WebDataSource _isDocumentHTML]): Changed to use _responseMIMEType. (-[WebDataSource _makeRepresentation]): Ditto. (-[WebDataSource mainResource]): Ditto. (-[WebDataSource subresources]): Changed to use _MIMETypeOfResponse and pass the MIME type explicitly. (-[WebDataSource subresourceForURL:]): Ditto.
• WebView/WebDataSourcePrivate.h:
• WebView/WebFrameView.mm: (-[WebFrameView _makeDocumentViewForDataSource:]): Changed to use _responseMIMEType.
• WebView/WebResource.mm: (-[WebResource _initWithData:URL:response:MIMEType:]): Changed this method to take a MIME type instead of extracting it from the response, so that WebDataSource could pass the correct MIME type.
• WebView/WebResourcePrivate.h:

WebKitTools:

Reviewed by Adam Roben.

• fix <rdar://problem/5313523> REGRESSION(Leopard): http/tests/incremental/slow-utf8-text.pl fails on Leopard

• DumpRenderTree/mac/DumpRenderTree.mm: (dump): Changed to use _responseMIMEType.

LayoutTests:

Reviewed by Adam Roben.

• removing fixed test

• platform/mac-leopard/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-leopard/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/mac/ResourceResponseMac.mm (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebCoreSupport/WebFrameLoaderClient.mm (modified) (1 diff)
• WebKit/WebView/WebDataSource.mm (modified) (7 diffs)
• WebKit/WebView/WebDataSourcePrivate.h (modified) (1 diff)
• WebKit/WebView/WebFrameView.mm (modified) (2 diffs)
• WebKit/WebView/WebResource.mm (modified) (2 diffs)
• WebKit/WebView/WebResourcePrivate.h (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-10-18  Dan Bernstein  <dan.bernstein@apple.com>
+
+        Reviewed by Adam Roben.
+
+        - removing fixed test
+
+        * platform/mac-leopard/Skipped:
+
 2007-10-18  Darin Adler  <darin@apple.com>
 

trunk/LayoutTests/platform/mac-leopard/Skipped

@@ -1 +1 @@
 # <rdar://problem/5313520> editing/pasteboard/4076267-2.html fails on Leopard
 editing/pasteboard/4076267-2.html
-
-# <rdar://problem/5313523> http/tests/incremental/slow-utf8-text.pl fails on Leopard
-http/tests/incremental/slow-utf8-text.pl
 
 # <rdar://problem/5228256> Leopard regression test failures: security/block-test

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-18  Dan Bernstein  <dan.bernstein@apple.com>
+
+        Reviewed by Adam Roben.
+
+        - fix <rdar://problem/5313523>
+        REGRESSION(Leopard): http/tests/incremental/slow-utf8-text.pl fails on Leopard
+
+        * platform/network/mac/ResourceResponseMac.mm:
+        (WebCore::ResourceResponse::doUpdateResourceResponse): Work around
+        <rdar://problem/5321972> by testing for the case of a response
+        with a MIME type of application/octet-stream and a Content-Type header
+        starting with text/plain and setting the MIME type to text/plain in
+        that case.
+
 2007-10-18  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/platform/network/mac/ResourceResponseMac.mm

@@ -88 +88 @@
         while (NSString *name = [e nextObject])
             m_httpHeaderFields.set(name, [headers objectForKey:name]);
+#ifndef BUILDING_ON_TIGER
+        // FIXME: This is part of a workaround for <rdar://problem/5321972> REGRESSION: Plain text document from HTTP server detected
+        // as application/octet-stream
+        if (m_mimeType == "application/octet-stream") {
+            static const String textPlainMIMEType("text/plain");
+            if (m_httpHeaderFields.get("Content-Type").startsWith(textPlainMIMEType))
+                m_mimeType = textPlainMIMEType;
+        }
+#endif
     } else {
         m_httpStatusCode = 0;

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-10-18  Dan Bernstein  <dan.bernstein@apple.com>
+
+        Reviewed by Adam Roben.
+
+        - fix <rdar://problem/5313523>
+        REGRESSION(Leopard): http/tests/incremental/slow-utf8-text.pl fails on Leopard
+
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::makeDocumentView): Changed to use _responseMIMEType.
+        * WebView/WebDataSource.mm:
+        (-[WebDataSource _MIMETypeOfResponse:]): Added. Works around
+        <rdar://problem/5321972> by testing for the case of an NSHTTPURLResponse
+        with a MIMEType of application/octet-stream and a Content-Type header
+        starting with text/plain and returning text/plain as the MIME type in
+        that case.
+        (-[WebDataSource _responseMIMEType]): Added. Used to get the correct
+        response MIME type.
+        (-[WebDataSource _isDocumentHTML]): Changed to use _responseMIMEType.
+        (-[WebDataSource _makeRepresentation]): Ditto.
+        (-[WebDataSource mainResource]): Ditto.
+        (-[WebDataSource subresources]): Changed to use _MIMETypeOfResponse and
+        pass the MIME type explicitly.
+        (-[WebDataSource subresourceForURL:]): Ditto.
+        * WebView/WebDataSourcePrivate.h:
+        * WebView/WebFrameView.mm:
+        (-[WebFrameView _makeDocumentViewForDataSource:]): Changed to use
+        _responseMIMEType.
+        * WebView/WebResource.mm:
+        (-[WebResource _initWithData:URL:response:MIMEType:]): Changed this
+        method to take a MIME type instead of extracting it from the response,
+        so that WebDataSource could pass the correct MIME type.
+        * WebView/WebResourcePrivate.h:
+
 2007-10-17  Darin Adler  <darin@apple.com>
 

trunk/WebKit/WebCoreSupport/WebFrameLoaderClient.mm

@@ -157 +157 @@
     WebDataSource *ds = [m_webFrame.get() _dataSource];
 
-    bool willProduceHTMLView = [[WebFrameView class] _viewClassForMIMEType:[[ds response] MIMEType]] == [WebHTMLView class];
+    bool willProduceHTMLView = [[WebFrameView class] _viewClassForMIMEType:[ds _responseMIMEType]] == [WebHTMLView class];
     bool canSkipCreation = [m_webFrame.get() _frameLoader]->committingFirstRealLoad() && willProduceHTMLView;
     if (canSkipCreation) {

trunk/WebKit/WebView/WebDataSource.mm

@@ -137 +137 @@
 }
 
+#ifndef BUILDING_ON_TIGER
+- (NSString *)_MIMETypeOfResponse:(NSURLResponse *)response
+{
+    // FIXME: This is part of a workaround for <rdar://problem/5321972> REGRESSION: Plain text document from HTTP server detected
+    // as application/octet-stream
+    NSString *MIMEType = [response MIMEType];
+    if ([MIMEType isEqualToString:@"application/octet-stream"] && [response isKindOfClass:[NSHTTPURLResponse class]] && [[[(NSHTTPURLResponse *)response allHeaderFields] objectForKey:@"Content-Type"] hasPrefix:@"text/plain"])
+        return @"text/plain";
+    return MIMEType;
+}
+#endif
 @end
 
@@ -173 +184 @@
     
     return nil;
+}
+
+- (NSString *)_responseMIMEType
+{
+#ifdef BUILDING_ON_TIGER
+    return [[self response] MIMEType];
+#else
+    return [self _MIMETypeOfResponse:[self response]];
+#endif
 }
 
@@ -320 +340 @@
 - (BOOL)_isDocumentHTML
 {
-    NSString *MIMEType = [[self response] MIMEType];
+    NSString *MIMEType = [self _responseMIMEType];
     return [WebView canShowMIMETypeAsHTML:MIMEType];
 }
@@ -326 +346 @@
 -(void)_makeRepresentation
 {
-    Class repClass = [[self class] _representationClassForMIMEType:[[self response] MIMEType]];
+    Class repClass = [[self class] _representationClassForMIMEType:[self _responseMIMEType]];
     
     // Check if the data source was already bound?
@@ -472 +492 @@
     return [[[WebResource alloc] initWithData:[self data]
                                           URL:[response URL] 
-                                     MIMEType:[response MIMEType]
+                                     MIMEType:[self _responseMIMEType]
                              textEncodingName:[response textEncodingName]
                                     frameName:[[self webFrame] name]] autorelease];
@@ -490 +510 @@
     for (unsigned i = 0; i < [datas count]; ++i) {
         NSURLResponse *response = [responses objectAtIndex:i];
-        [subresources addObject:[[[WebResource alloc] _initWithData:[datas objectAtIndex:i] URL:[response URL] response:response] autorelease]];
+        [subresources addObject:[[[WebResource alloc] _initWithData:[datas objectAtIndex:i] URL:[response URL] response:response MIMEType:[self _MIMETypeOfResponse:response]] autorelease]];
     }
 
@@ -506 +526 @@
         return [self _archivedSubresourceForURL:URL];
 
-    return [[[WebResource alloc] _initWithData:data URL:URL response:response] autorelease];
+    return [[[WebResource alloc] _initWithData:data URL:URL response:response MIMEType:[self _MIMETypeOfResponse:response]] autorelease];
 }
 

trunk/WebKit/WebView/WebDataSourcePrivate.h

@@ -36 +36 @@
 
 - (NSError *)_mainDocumentError;
+
+- (NSString *)_responseMIMEType;
 @end

trunk/WebKit/WebView/WebFrameView.mm

@@ -30 +30 @@
 
 #import "WebClipView.h"
-#import "WebDataSource.h"
+#import "WebDataSourcePrivate.h"
 #import "WebDocument.h"
 #import "WebDynamicScrollBarsView.h"
@@ -188 +188 @@
 -(NSView <WebDocumentView> *)_makeDocumentViewForDataSource:(WebDataSource *)dataSource
 {
-    NSString* MIMEType = [[dataSource response] MIMEType];
+    NSString* MIMEType = [dataSource _responseMIMEType];
     if (!MIMEType)
         MIMEType = @"text/html";

trunk/WebKit/WebView/WebResource.mm

@@ -249 +249 @@
 }
 
-- (id)_initWithData:(NSData *)data URL:(NSURL *)URL response:(NSURLResponse *)response
+- (id)_initWithData:(NSData *)data URL:(NSURL *)URL response:(NSURLResponse *)response MIMEType:(NSString *)MIMEType
 {
     // Pass NO for copyData since the data doesn't need to be copied since we know that callers will no longer modify it.
@@ -255 +255 @@
     return [self _initWithData:data
                            URL:URL
-                      MIMEType:[response MIMEType]
+                      MIMEType:MIMEType
               textEncodingName:[response textEncodingName]
                      frameName:nil

trunk/WebKit/WebView/WebResourcePrivate.h

@@ -39 +39 @@
            copyData:(BOOL)copyData;
 
-- (id)_initWithData:(NSData *)data URL:(NSURL *)URL response:(NSURLResponse *)response;
+- (id)_initWithData:(NSData *)data URL:(NSURL *)URL response:(NSURLResponse *)response MIMEType:(NSString *)MIMEType;
 
 - (BOOL)_shouldIgnoreWhenUnarchiving;

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-10-18  Dan Bernstein  <dan.bernstein@apple.com>
+
+        Reviewed by Adam Roben.
+
+        - fix <rdar://problem/5313523>
+        REGRESSION(Leopard): http/tests/incremental/slow-utf8-text.pl fails on Leopard
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (dump): Changed to use _responseMIMEType.
+
 2007-10-17  Adam Roben  <aroben@apple.com>
 

trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -52 +52 @@
 #import <WebKit/WebBackForwardList.h>
 #import <WebKit/WebCoreStatistics.h>
-#import <WebKit/WebDataSource.h>
+#import <WebKit/WebDataSourcePrivate.h>
 #import <WebKit/WebDocumentPrivate.h>
 #import <WebKit/WebEditingDelegate.h>
@@ -841 +841 @@
         
         bool dumpAsText = layoutTestController->dumpAsText();
-        dumpAsText |= [[[[mainFrame dataSource] response] MIMEType] isEqualToString:@"text/plain"];
+        dumpAsText |= [[[mainFrame dataSource] _responseMIMEType] isEqualToString:@"text/plain"];
         layoutTestController->setDumpAsText(dumpAsText);
         if (layoutTestController->dumpAsText()) {