Changeset 173360 in webkit

Timestamp:

Sep 6, 2014, 10:58:46 AM (11 years ago)

Author:

Antti Koivisto

Message:

Serialize ResourceResponses using WebKit types
​https://bugs.webkit.org/show_bug.cgi?id=136545

Fix the failing webarchive tests.

• platform/network/mac/ResourceResponseMac.mm:

(WebCore::ResourceResponse::initNSURLResponse): Map empty text encoding name to nil NSString.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/mac/ResourceResponseMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-06  Antti Koivisto  <antti@apple.com>
+
+        Serialize ResourceResponses using WebKit types
+        https://bugs.webkit.org/show_bug.cgi?id=136545
+
+        Fix the failing webarchive tests.
+
+        * platform/network/mac/ResourceResponseMac.mm:
+        (WebCore::ResourceResponse::initNSURLResponse): Map empty text encoding name to nil NSString.
+
 2014-09-06  peavo@outlook.com  <peavo@outlook.com>
 

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

@@ -56 +56 @@
             expectedContentLength = static_cast<NSInteger>(m_expectedContentLength);
 
-        m_nsResponse = adoptNS([[NSURLResponse alloc] initWithURL:m_url MIMEType:m_mimeType expectedContentLength:expectedContentLength textEncodingName:m_textEncodingName]);
+        NSString* encodingNSString = nsStringNilIfEmpty(m_textEncodingName);
+        m_nsResponse = adoptNS([[NSURLResponse alloc] initWithURL:m_url MIMEType:m_mimeType expectedContentLength:expectedContentLength textEncodingName:encodingNSString]);
         return;
     }