Title: [235532] trunk/Source/WebKit
- Revision
- 235532
- Author
- cdu...@apple.com
- Date
- 2018-08-30 16:32:14 -0700 (Thu, 30 Aug 2018)
Log Message
Add WKPageLoadFile SPI variant which returns a navigation object
https://bugs.webkit.org/show_bug.cgi?id=189168
<rdar://problem/43899330>
Reviewed by Alex Christensen.
Add WKPageLoadFile SPI variant which returns a navigation object, similarly to WKPageLoadURLRequestReturningNavigation().
This is needed in order to implement <rdar://problem/40309266>.
* UIProcess/API/C/mac/WKPagePrivateMac.h:
* UIProcess/API/C/mac/WKPagePrivateMac.mm:
(WKPageLoadFileReturningNavigation):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (235531 => 235532)
--- trunk/Source/WebKit/ChangeLog 2018-08-30 23:28:10 UTC (rev 235531)
+++ trunk/Source/WebKit/ChangeLog 2018-08-30 23:32:14 UTC (rev 235532)
@@ -1,3 +1,18 @@
+2018-08-30 Chris Dumez <cdu...@apple.com>
+
+ Add WKPageLoadFile SPI variant which returns a navigation object
+ https://bugs.webkit.org/show_bug.cgi?id=189168
+ <rdar://problem/43899330>
+
+ Reviewed by Alex Christensen.
+
+ Add WKPageLoadFile SPI variant which returns a navigation object, similarly to WKPageLoadURLRequestReturningNavigation().
+ This is needed in order to implement <rdar://problem/40309266>.
+
+ * UIProcess/API/C/mac/WKPagePrivateMac.h:
+ * UIProcess/API/C/mac/WKPagePrivateMac.mm:
+ (WKPageLoadFileReturningNavigation):
+
2018-08-30 Tim Horton <timothy_hor...@apple.com>
Try to fix the watchOS and tvOS build
Modified: trunk/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.h (235531 => 235532)
--- trunk/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.h 2018-08-30 23:28:10 UTC (rev 235531)
+++ trunk/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.h 2018-08-30 23:32:14 UTC (rev 235532)
@@ -62,6 +62,7 @@
#if !TARGET_OS_IPHONE && (defined(__clang__) && defined(__APPLE__) && !defined(__i386__))
@class WKNavigation;
WK_EXPORT WKNavigation *WKPageLoadURLRequestReturningNavigation(WKPageRef page, WKURLRequestRef request);
+WK_EXPORT WKNavigation *WKPageLoadFileReturningNavigation(WKPageRef page, WKURLRef fileURL, WKURLRef resourceDirectoryURL);
#endif
#endif // __OBJC__
Modified: trunk/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm (235531 => 235532)
--- trunk/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm 2018-08-30 23:28:10 UTC (rev 235531)
+++ trunk/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm 2018-08-30 23:32:14 UTC (rev 235532)
@@ -145,6 +145,11 @@
auto resourceRequest = toImpl(urlRequestRef)->resourceRequest();
return wrapper(toImpl(pageRef)->loadRequest(WTFMove(resourceRequest)));
}
+
+WKNavigation *WKPageLoadFileReturningNavigation(WKPageRef pageRef, WKURLRef fileURL, WKURLRef resourceDirectoryURL)
+{
+ return wrapper(toImpl(pageRef)->loadFile(toWTFString(fileURL), toWTFString(resourceDirectoryURL)));
+}
#endif
#if PLATFORM(MAC)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
