Title: [107355] trunk/Source/WebKit/mac
- Revision
- 107355
- Author
- [email protected]
- Date
- 2012-02-09 21:42:55 -0800 (Thu, 09 Feb 2012)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (107354 => 107355)
--- trunk/Source/WebKit/mac/ChangeLog 2012-02-10 05:28:58 UTC (rev 107354)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-02-10 05:42:55 UTC (rev 107355)
@@ -1,3 +1,18 @@
+2012-02-09 Alexey Proskuryakov <[email protected]>
+
+ 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 <[email protected]>
REGRESSION (r106681): Null check missing in [WebFrame(WebInternal) _typingStyle]
Modified: trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h (107354 => 107355)
--- trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h 2012-02-10 05:28:58 UTC (rev 107354)
+++ trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h 2012-02-10 05:42:55 UTC (rev 107355)
@@ -69,6 +69,8 @@
- (NSString *)_webkit_suggestedFilenameWithMIMEType:(NSString *)MIMEType;
+- (NSURL *)_webkit_URLFromURLOrPath;
+
@end
@interface NSString (WebNSURLExtras)
Modified: trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm (107354 => 107355)
--- trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm 2012-02-10 05:28:58 UTC (rev 107354)
+++ trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm 2012-02-10 05:42:55 UTC (rev 107355)
@@ -883,6 +883,14 @@
return suggestedFilenameWithMIMEType(self, MIMEType);
}
+- (NSURL *)_webkit_URLFromURLOrPath
+{
+ if ([self scheme])
+ return self;
+
+ return [NSURL fileURLWithPath:[self absoluteString]];
+}
+
@end
@implementation NSString (WebNSURLExtras)
Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (107354 => 107355)
--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2012-02-10 05:28:58 UTC (rev 107354)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2012-02-10 05:42:55 UTC (rev 107355)
@@ -1484,7 +1484,7 @@
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];
}
- (void)_loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL unreachableURL:(NSURL *)unreachableURL
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
