Skip to content
Permalink
Browse files
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.


Canonical link: https://commits.webkit.org/95227@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@107355 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
aproskuryakov committed Feb 10, 2012
1 parent 70d94fc commit a380e16afaa361bb79d00834aed67e50f88854fe
Showing 4 changed files with 26 additions and 1 deletion.
@@ -1,3 +1,18 @@
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>

REGRESSION (r106681): Null check missing in [WebFrame(WebInternal) _typingStyle]
@@ -69,6 +69,8 @@

- (NSString *)_webkit_suggestedFilenameWithMIMEType:(NSString *)MIMEType;

- (NSURL *)_webkit_URLFromURLOrPath;

@end

@interface NSString (WebNSURLExtras)
@@ -883,6 +883,14 @@ - (NSString *)_webkit_suggestedFilenameWithMIMEType:(NSString *)MIMEType
return suggestedFilenameWithMIMEType(self, MIMEType);
}

- (NSURL *)_webkit_URLFromURLOrPath
{
if ([self scheme])
return self;

return [NSURL fileURLWithPath:[self absoluteString]];
}

@end

@implementation NSString (WebNSURLExtras)
@@ -1484,7 +1484,7 @@ - (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(

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

0 comments on commit a380e16

Please sign in to comment.