Title: [159875] trunk/Source/WebKit2
- Revision
- 159875
- Author
- [email protected]
- Date
- 2013-11-29 13:15:28 -0800 (Fri, 29 Nov 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159874 => 159875)
--- trunk/Source/WebKit2/ChangeLog 2013-11-29 20:54:46 UTC (rev 159874)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-29 21:15:28 UTC (rev 159875)
@@ -1,3 +1,15 @@
+2013-11-29 Dan Bernstein <[email protected]>
+
+ [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 <[email protected]>
Move API files shared between Mac and iOS to the Cocoa directory
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h (159874 => 159875)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h 2013-11-29 20:54:46 UTC (rev 159874)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h 2013-11-29 21:15:28 UTC (rev 159875)
@@ -70,6 +70,8 @@
- (void)loadHTMLString:(NSString *)HTMLString baseURL:(NSURL *)baseURL;
- (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;
- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL userData:(id)userData;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (159874 => 159875)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-11-29 20:54:46 UTC (rev 159874)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-11-29 21:15:28 UTC (rev 159875)
@@ -47,6 +47,7 @@
#import "WebContext.h"
#import "WebData.h"
#import "WebPageProxy.h"
+#import <WebCore/CFURLExtras.h>
#import <wtf/ObjcRuntimeExtras.h>
#import <wtf/RetainPtr.h>
@@ -56,6 +57,7 @@
#import "WKBrowsingContextPolicyDelegate.h"
#import "WKProcessGroupInternal.h"
+using namespace WebCore;
using namespace WebKit;
class PageLoadStateObserver : public PageLoadState::Observer {
@@ -216,6 +218,17 @@
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));
+}
+
- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL
{
[self loadData:data MIMEType:MIMEType textEncodingName:encodingName baseURL:baseURL userData:nil];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
