Title: [191479] trunk/Source/WebKit2
- Revision
- 191479
- Author
- [email protected]
- Date
- 2015-10-22 14:54:11 -0700 (Thu, 22 Oct 2015)
Log Message
Add a SPI variant of loadData that accepts user data to WKWebView
https://bugs.webkit.org/show_bug.cgi?id=150475
Reviewed by Anders Carlsson.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _loadData:MIMEType:characterEncodingName:baseURL:userData:]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191478 => 191479)
--- trunk/Source/WebKit2/ChangeLog 2015-10-22 21:37:04 UTC (rev 191478)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-22 21:54:11 UTC (rev 191479)
@@ -1,3 +1,14 @@
+2015-10-22 Tim Horton <[email protected]>
+
+ Add a SPI variant of loadData that accepts user data to WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=150475
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _loadData:MIMEType:characterEncodingName:baseURL:userData:]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
2015-10-22 Alex Christensen <[email protected]>
Progress towards CMake on Mac
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (191478 => 191479)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-10-22 21:37:04 UTC (rev 191478)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-10-22 21:54:11 UTC (rev 191479)
@@ -36,6 +36,7 @@
#import "FindClient.h"
#import "LegacySessionStateCoding.h"
#import "NavigationState.h"
+#import "ObjCObjectGraph.h"
#import "RemoteLayerTreeScrollingPerformanceData.h"
#import "RemoteLayerTreeTransaction.h"
#import "RemoteObjectRegistry.h"
@@ -2005,6 +2006,15 @@
_page->loadAlternateHTMLString(string, [baseURL _web_originalDataAsWTFString], [unreachableURL _web_originalDataAsWTFString]);
}
+- (WKNavigation *)_loadData:(NSData *)data MIMEType:(NSString *)MIMEType characterEncodingName:(NSString *)characterEncodingName baseURL:(NSURL *)baseURL userData:(id)userData
+{
+ auto navigation = _page->loadData(API::Data::createWithoutCopying(data).ptr(), MIMEType, characterEncodingName, baseURL.absoluteString, WebKit::ObjCObjectGraph::create(userData).ptr());
+ if (!navigation)
+ return nil;
+
+ return [wrapper(*navigation.release().leakRef()) autorelease];
+}
+
- (NSArray *)_certificateChain
{
if (WebKit::WebFrameProxy* mainFrame = _page->mainFrame())
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (191478 => 191479)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-10-22 21:37:04 UTC (rev 191478)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-10-22 21:54:11 UTC (rev 191479)
@@ -73,6 +73,7 @@
@property (nonatomic, readonly) NSURL *_unreachableURL;
- (void)_loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL;
+- (WKNavigation *)_loadData:(NSData *)data MIMEType:(NSString *)MIMEType characterEncodingName:(NSString *)characterEncodingName baseURL:(NSURL *)baseURL userData:(id)userData WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@property (nonatomic, readonly) NSArray *_certificateChain WK_DEPRECATED(10_10, 10_11, 8_0, 9_0, "use -certificateChain");
@property (nonatomic, readonly) NSURL *_committedURL;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes