Changeset 107355 in webkit

Timestamp:

Feb 9, 2012 9:42:55 PM (12 years ago)

Author:

ap@apple.com

Message:

REGRESSION (r104885): Articles not displayed in Vienna RSS reader
​https://bugs.webkit.org/show_bug.cgi?id=78280
<rdar://problem/10762545>

Reviewed by Oliver Hunt.

• Misc/WebNSURLExtras.h:
• Misc/WebNSURLExtras.mm: (-[NSURL _webkit_URLFromURLOrPath]):

Added a method to create a URL from a path, similarly to what KURL used to do.

• WebView/WebFrame.mm: (-[WebFrame loadData:MIMEType:textEncodingName:baseURL:]):

Use it in an API where a known regression occurred.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• Misc/WebNSURLExtras.h (modified) (1 diff)
• Misc/WebNSURLExtras.mm (modified) (1 diff)
• WebView/WebFrame.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2012-02-09  Alexey Proskuryakov  <ap@apple.com>
+
+        REGRESSION (r104885): Articles not displayed in Vienna RSS reader
+        https://bugs.webkit.org/show_bug.cgi?id=78280
+        <rdar://problem/10762545>
+
+        Reviewed by Oliver Hunt.
+
+        * Misc/WebNSURLExtras.h:
+        * Misc/WebNSURLExtras.mm: (-[NSURL _webkit_URLFromURLOrPath]):
+        Added a method to create a URL from a path, similarly to what KURL used to do.
+
+        * WebView/WebFrame.mm: (-[WebFrame loadData:MIMEType:textEncodingName:baseURL:]):
+        Use it in an API where a known regression occurred.
+
 2012-02-07  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h

@@ -70 +70 @@
 - (NSString *)_webkit_suggestedFilenameWithMIMEType:(NSString *)MIMEType;
 
+- (NSURL *)_webkit_URLFromURLOrPath;
+
 @end
 

trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm

@@ -884 +884 @@
 }
 
+- (NSURL *)_webkit_URLFromURLOrPath
+{
+    if ([self scheme])
+        return self;
+
+    return [NSURL fileURLWithPath:[self absoluteString]];
+}
+
 @end
 

trunk/Source/WebKit/mac/WebView/WebFrame.mm

@@ -1485 +1485 @@
     if (!MIMEType)
         MIMEType = @"text/html";
-    [self _loadData:data MIMEType:MIMEType textEncodingName:encodingName baseURL:baseURL unreachableURL:nil];
+    [self _loadData:data MIMEType:MIMEType textEncodingName:encodingName baseURL:[baseURL _webkit_URLFromURLOrPath] unreachableURL:nil];
 }