Changeset 159875 in webkit

Timestamp:

Nov 29, 2013, 1:15:28 PM (11 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Expose loadAlternateHTMLString via the API
​https://bugs.webkit.org/show_bug.cgi?id=125019

Reviewed by Sam Weinig.

• UIProcess/API/Cocoa/WKBrowsingContextController.h: Declared new method.
• UIProcess/API/Cocoa/WKBrowsingContextController.mm:

(-[WKBrowsingContextController loadAlternateHTMLString:baseURL:forUnreachableURL:]): Added.
Calls WebPageProxy::loadAlternateHTMLString.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKBrowsingContextController.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKBrowsingContextController.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-29  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Expose loadAlternateHTMLString via the API
+        https://bugs.webkit.org/show_bug.cgi?id=125019
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/API/Cocoa/WKBrowsingContextController.h: Declared new method.
+        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+        (-[WKBrowsingContextController loadAlternateHTMLString:baseURL:forUnreachableURL:]): Added.
+        Calls WebPageProxy::loadAlternateHTMLString.
+
 2013-11-29  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h

@@ -71 +71 @@
 - (void)loadHTMLString:(NSString *)HTMLString baseURL:(NSURL *)baseURL userData:(id)userData;
 
+- (void)loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL;
+
 /* Load a page using the passed in data as its contents. */
 - (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL;

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm

@@ -48 +48 @@
 #import "WebData.h"
 #import "WebPageProxy.h"
+#import <WebCore/CFURLExtras.h>
 #import <wtf/ObjcRuntimeExtras.h>
 #import <wtf/RetainPtr.h>
@@ -57 +58 @@
 #import "WKProcessGroupInternal.h"
 
+using namespace WebCore;
 using namespace WebKit;
 
@@ -215 +217 @@
 
     WKPageLoadHTMLStringWithUserData(_pageRef.get(), wkHTMLString.get(), wkBaseURL.get(), (WKTypeRef)wkUserData.get());
+}
+
+- (void)loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL
+{
+    CString baseURLString;
+    getURLBytes((CFURLRef)baseURL, baseURLString);
+
+    CString unreachableURLString;
+    getURLBytes((CFURLRef)unreachableURL, unreachableURLString);
+
+    toImpl(_pageRef.get())->loadAlternateHTMLString(string, String::fromUTF8(baseURLString), String::fromUTF8(unreachableURLString));
 }