Changeset 47509 in webkit

Timestamp:

Aug 19, 2009 10:33:32 AM (15 years ago)

Author:

kdecker@apple.com

Message:

Reviewed by Kevin Decker.

<rdar://problem/7042555> Loading certain pages on Tiger will start a spurious download

Get rid of method swizzling entirely. This created problems when lower level
Foundation code would call into our own swizzled method.

• platform/network/mac/ResourceHandleMac.mm: (-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]):
• platform/network/mac/WebCoreURLResponse.h:
• platform/network/mac/WebCoreURLResponse.mm: (-[NSURLResponse adjustMIMETypeIfNecessary]):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (1 diff)
• platform/network/mac/ResourceHandleMac.mm (modified) (4 diffs)
• platform/network/mac/WebCoreURLResponse.h (modified) (2 diffs)
• platform/network/mac/WebCoreURLResponse.mm (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-19  Brady Eidson <beidson@apple.com>
+
+        Reviewed by Kevin Decker.
+
+        <rdar://problem/7042555> Loading certain pages on Tiger will start a spurious download
+        
+        Get rid of method swizzling entirely. This created problems when lower level
+        Foundation code would call into our own swizzled method.
+        
+        * platform/network/mac/ResourceHandleMac.mm: 
+        (-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]): 
+        * platform/network/mac/WebCoreURLResponse.h:
+        * platform/network/mac/WebCoreURLResponse.mm:
+        (-[NSURLResponse adjustMIMETypeIfNecessary]):
+
 2009-08-19  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -17552 +17552 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n    exit 0;\nfi\n\nif [ -f ../WebKitTools/Scripts/check-for-global-initializers ]; then\n    ../WebKitTools/Scripts/check-for-global-initializers || exit $?\nfi";
+                        shellScript = "";
                 };
                 DD041FBD09D9DDBE0010AF2A /* Generate Derived Sources */ = {

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2004, 2006 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2006-2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65 +65 @@
 @end
 
-@interface NSURLResponse (Details)
-- (void)_setMIMEType:(NSString *)type;
-@end
-
 @interface NSURLRequest (Details)
 - (id)_propertyForKey:(NSString *)key;
@@ -636 +632 @@
     UNUSED_PARAM(connection);
 
-    LOG(Network, "Handle %p delegate connection:%p didReceiveResponse:%p (HTTP status %d, MIMEType '%s', reported MIMEType '%s')", m_handle, connection, r, [r respondsToSelector:@selector(statusCode)] ? [(id)r statusCode] : 0, [[r MIMEType] UTF8String], [[r _webcore_reportedMIMEType] UTF8String]);
+    LOG(Network, "Handle %p delegate connection:%p didReceiveResponse:%p (HTTP status %d, reported MIMEType '%s')", m_handle, connection, r, [r respondsToSelector:@selector(statusCode)] ? [(id)r statusCode] : 0, [[r MIMEType] UTF8String]);
 
     if (!m_handle || !m_handle->client())
@@ -642 +638 @@
     CallbackGuard guard;
 
-    swizzleMIMETypeMethodIfNecessary();
+    [r adjustMIMETypeIfNecessary];
 
     if ([m_handle->request().nsURLRequest() _propertyForKey:@"ForceHTMLMIMEType"])

trunk/WebCore/platform/network/mac/WebCoreURLResponse.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28 +28 @@
 
 @interface NSURLResponse (WebCoreURLResponse)
--(NSString *)_webcore_reportedMIMEType;
+-(void)adjustMIMETypeIfNecessary;
 @end
 
-void swizzleMIMETypeMethodIfNecessary();
+@interface NSURLResponse (Details)
+- (void)_setMIMEType:(NSString *)type;
+@end

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -328 +328 @@
 }
 
-static IMP oldNSURLResponseMIMETypeIMP = 0;
-static NSString *webNSURLResponseMIMEType(id, SEL);
-
-void swizzleMIMETypeMethodIfNecessary()
-{
-    if (!oldNSURLResponseMIMETypeIMP) {
-        Method nsURLResponseMIMETypeMethod = class_getInstanceMethod([NSURLResponse class], @selector(MIMEType));
-        ASSERT(nsURLResponseMIMETypeMethod);
-#ifdef BUILDING_ON_TIGER
-        oldNSURLResponseMIMETypeIMP = nsURLResponseMIMETypeMethod->method_imp;
-        nsURLResponseMIMETypeMethod->method_imp = (IMP)webNSURLResponseMIMEType;
-#else
-        oldNSURLResponseMIMETypeIMP = method_setImplementation(nsURLResponseMIMETypeMethod, (IMP)webNSURLResponseMIMEType);
-#endif
-    }
-}
-
 static NSString *mimeTypeFromUTITree(CFStringRef uti)
 {
@@ -380 +363 @@
 }
 
-static NSString *webNSURLResponseMIMEType(id self, SEL _cmd)
+@implementation NSURLResponse (WebCoreURLResponse)
+
+-(void)adjustMIMETypeIfNecessary
 {
-    ASSERT(oldNSURLResponseMIMETypeIMP);
-    NSString *result = oldNSURLResponseMIMETypeIMP(self, _cmd);
+    NSString *result = [self MIMEType];
+    NSString *originalResult = result;
 
 #ifdef BUILDING_ON_TIGER
@@ -419 +404 @@
     // <rdar://problem/5321972> Plain text document from HTTP server detected as application/octet-stream
     // Make the best guess when deciding between "generic binary" and "generic text" using a table of known binary MIME types.
-    if ([result isEqualToString:@"application/octet-stream"] && [self respondsToSelector:@selector(allHeaderFields)] && [[[self allHeaderFields] objectForKey:@"Content-Type"] hasPrefix:@"text/plain"]) {
+    if ([result isEqualToString:@"application/octet-stream"] && [self respondsToSelector:@selector(allHeaderFields)] && [[[self performSelector:@selector(allHeaderFields)] objectForKey:@"Content-Type"] hasPrefix:@"text/plain"]) {
         static NSSet *binaryExtensions = createBinaryExtensionsSet();
         if (![binaryExtensions containsObject:[[[self suggestedFilename] pathExtension] lowercaseString]])
@@ -433 +418 @@
 #endif
 
-    return result;
+    if (result != originalResult)
+        [self _setMIMEType:result];
 }
 
-@implementation NSURLResponse (WebCoreURLResponse)
-
--(NSString *)_webcore_reportedMIMEType
-{
-    swizzleMIMETypeMethodIfNecessary();
-    return oldNSURLResponseMIMETypeIMP(self, @selector(_webcore_realMIMEType));
-}
-
 @end