Attachment 348534 Details for Bug 189168 – Patch

[patch] Patch

bug-189168-20180830131729.patch (text/plain), 2.61 KB, created by Chris Dumez on 2018-08-30 13:17:30 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-08-30 13:17:30 PDT

Size: 2.61 KB

patch

obsolete

>Subversion Revision: 235505
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index bfb586285c4e228fb76c91fcdb61b0235c06b5b2..e5f185500b62681319288a2ac9c9fc5101d5c2b9 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-08-30  Chris Dumez  <cdumez@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 NOBODY (OOPS!).
>+
>+        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  Yoshiaki Jitsukawa  <yoshiaki.jitsukawa@sony.com>
> 
>         [ConnectionUnix] Shrink sizeof AttachmentInfo by reordering members
>diff --git a/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.h b/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.h
>index d7c9555153875c5782ee754e8f31a70c6bc5eb2f..ae186533f285a6307626233340fa719297fc2155 100644
>--- a/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.h
>+++ b/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.h
>@@ -62,6 +62,7 @@ WK_EXPORT id <_WKFullscreenDelegate> WKPageGetFullscreenDelegate(WKPageRef page)
> #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__
>diff --git a/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm b/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm
>index 1994f3dc9d4fcfe0130573a8cabcca57ca54c6b2..25cecdd0a78da0cdf16b238ea4dce1596f398cdd 100644
>--- a/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm
>+++ b/Source/WebKit/UIProcess/API/C/mac/WKPagePrivateMac.mm
>@@ -145,6 +145,11 @@ WKNavigation *WKPageLoadURLRequestReturningNavigation(WKPageRef pageRef, WKURLRe
>     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)

Actions: View | Formatted Diff | Diff

Attachments on bug 189168: 348534