Commit c06878b4 authored by darin@apple.com's avatar darin@apple.com

JavaScriptCore:

        Reviewed by Adam.

        * JavaScriptCore.exp: Sort the contents of this file.

WebCore:

        Reviewed by Adam.

        * WebCore.base.exp: Export blankURL, and sort the file.

WebKit/mac:

        Reviewed by Adam.

        * WebView/WebArchiver.mm:
        (+[WebArchiver archiveSelectionInFrame:]): Use blankURL.
        * WebView/WebFrame.mm:
        (-[WebFrame _loadData:MIMEType:textEncodingName:baseURL:unreachableURL:]): Avoid the
        variable name URL to avoid clashing with the renamed KURL in the future. Also use
        blankURL.
        (-[WebFrame loadData:MIMEType:textEncodingName:baseURL:]): Ditto.
        (-[WebFrame _loadHTMLString:baseURL:unreachableURL:]): Ditto.
        (-[WebFrame loadHTMLString:baseURL:]): Ditto.
        (-[WebFrame loadAlternateHTMLString:baseURL:forUnreachableURL:]): Ditto.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@30568 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f3172872
2008-02-25 Darin Adler <darin@apple.com>
Reviewed by Adam.
* JavaScriptCore.exp: Sort the contents of this file.
2008-02-25 Adam Roben <aroben@apple.com>
MSVC build fix
......
2008-02-25 Darin Adler <darin@apple.com>
Reviewed by Adam.
* WebCore.base.exp: Export blankURL, and sort the file.
2008-02-25 Simon Hausmann <hausmann@webkit.org>
Reviewed by Mark Rowe.
......@@ -488,6 +488,7 @@ __ZN7WebCore8Settings32setNeedsAdobeFrameReloadingQuirkEb
__ZN7WebCore8Settings40setJavaScriptCanOpenWindowsAutomaticallyEb
__ZN7WebCore8Settings41setNeedsKeyboardEventDisambiguationQuirksEb
__ZN7WebCore8Settings41setUsesDashboardBackwardCompatibilityModeEb
__ZN7WebCore8blankURLEv
__ZN7WebCore8parseURLERKNS_6StringE
__ZN7WebCore9FloatRectC1ERK7_NSRect
__ZN7WebCore9FrameTree11appendChildEN3WTF10PassRefPtrINS_5FrameEEE
......
2008-02-25 Darin Adler <darin@apple.com>
Reviewed by Adam.
* WebView/WebArchiver.mm:
(+[WebArchiver archiveSelectionInFrame:]): Use blankURL.
* WebView/WebFrame.mm:
(-[WebFrame _loadData:MIMEType:textEncodingName:baseURL:unreachableURL:]): Avoid the
variable name URL to avoid clashing with the renamed KURL in the future. Also use
blankURL.
(-[WebFrame loadData:MIMEType:textEncodingName:baseURL:]): Ditto.
(-[WebFrame _loadHTMLString:baseURL:unreachableURL:]): Ditto.
(-[WebFrame loadHTMLString:baseURL:]): Ditto.
(-[WebFrame loadAlternateHTMLString:baseURL:forUnreachableURL:]): Ditto.
2008-02-24 Darin Adler <darin@apple.com>
Reviewed by Sam.
......
......@@ -170,7 +170,7 @@ using namespace WebCore;
NSString *iframeMarkup = [[NSString alloc] initWithFormat:@"<iframe frameborder=\"no\" marginwidth=\"0\" marginheight=\"0\" width=\"98%%\" height=\"98%%\" src=\"%@\"></iframe>", [[[frame _dataSource] response] URL]];
WebResource *iframeResource = [[WebResource alloc] initWithData:[iframeMarkup dataUsingEncoding:NSUTF8StringEncoding]
URL:[NSURL URLWithString:@"about:blank"]
URL:blankURL()
MIMEType:@"text/html"
textEncodingName:@"UTF-8"
frameName:nil];
......
......@@ -123,7 +123,7 @@ NSString *WebPageCacheDataSourceKey = @"WebPageCacheDataSourceKey";
NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
@interface WebFrame (ForwardDecls)
- (void)_loadHTMLString:(NSString *)string baseURL:(NSURL *)URL unreachableURL:(NSURL *)unreachableURL;
- (void)_loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL unreachableURL:(NSURL *)unreachableURL;
- (WebHistoryItem *)_createItem:(BOOL)useOriginal;
- (WebHistoryItem *)_createItemTreeWithTargetFrame:(WebFrame *)targetFrame clippedAtTarget:(BOOL)doClip;
@end
......@@ -766,15 +766,15 @@ static NSURL *createUniqueWebDataURL()
return URL;
}
- (void)_loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)URL unreachableURL:(NSURL *)unreachableURL
- (void)_loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL unreachableURL:(NSURL *)unreachableURL
{
KURL responseURL;
if (!URL) {
URL = [NSURL URLWithString:@"about:blank"];
if (!baseURL) {
baseURL = blankURL();
responseURL = createUniqueWebDataURL();
}
ResourceRequest request([URL absoluteURL]);
ResourceRequest request([baseURL absoluteURL]);
// hack because Mail checks for this property to detect data / archive loads
[NSURLProtocol setProperty:@"" forKey:@"WebDataRequest" inRequest:(NSMutableURLRequest *)request.nsURLRequest()];
......@@ -785,27 +785,27 @@ static NSURL *createUniqueWebDataURL()
}
- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)URL
- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL
{
if (!MIMEType)
MIMEType = @"text/html";
[self _loadData:data MIMEType:MIMEType textEncodingName:encodingName baseURL:URL unreachableURL:nil];
[self _loadData:data MIMEType:MIMEType textEncodingName:encodingName baseURL:baseURL unreachableURL:nil];
}
- (void)_loadHTMLString:(NSString *)string baseURL:(NSURL *)URL unreachableURL:(NSURL *)unreachableURL
- (void)_loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL unreachableURL:(NSURL *)unreachableURL
{
NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
[self _loadData:data MIMEType:@"text/html" textEncodingName:@"UTF-8" baseURL:URL unreachableURL:unreachableURL];
[self _loadData:data MIMEType:@"text/html" textEncodingName:@"UTF-8" baseURL:baseURL unreachableURL:unreachableURL];
}
- (void)loadHTMLString:(NSString *)string baseURL:(NSURL *)URL
- (void)loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL
{
[self _loadHTMLString:string baseURL:URL unreachableURL:nil];
[self _loadHTMLString:string baseURL:baseURL unreachableURL:nil];
}
- (void)loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)URL forUnreachableURL:(NSURL *)unreachableURL
- (void)loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL
{
[self _loadHTMLString:string baseURL:URL unreachableURL:unreachableURL];
[self _loadHTMLString:string baseURL:baseURL unreachableURL:unreachableURL];
}
- (void)loadArchive:(WebArchive *)archive
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment