Title: [236438] trunk
Revision
236438
Author
[email protected]
Date
2018-09-24 16:08:51 -0700 (Mon, 24 Sep 2018)

Log Message

Prepare to replace WKBundleFileHandleCreateWithPath with a version that takes a WKBundlePageRef
https://bugs.webkit.org/show_bug.cgi?id=189929

Reviewed by Andy Estes.

Source/WebKit:

This will be needed for rdar://problem/24576194

* WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.cpp:
(WKBundleFileHandleCreateWithPathForPage):
* WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h:

Tools:

* TestWebKitAPI/Tests/WebKit/WKBundleFileHandle_Bundle.cpp:

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (236437 => 236438)


--- trunk/Source/WebKit/ChangeLog	2018-09-24 23:05:54 UTC (rev 236437)
+++ trunk/Source/WebKit/ChangeLog	2018-09-24 23:08:51 UTC (rev 236438)
@@ -1,5 +1,18 @@
 2018-09-24  Alex Christensen  <[email protected]>
 
+        Prepare to replace WKBundleFileHandleCreateWithPath with a version that takes a WKBundlePageRef
+        https://bugs.webkit.org/show_bug.cgi?id=189929
+
+        Reviewed by Andy Estes.
+
+        This will be needed for rdar://problem/24576194
+
+        * WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.cpp:
+        (WKBundleFileHandleCreateWithPathForPage):
+        * WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h:
+
+2018-09-24  Alex Christensen  <[email protected]>
+
         Begin deprecating C API
         https://bugs.webkit.org/show_bug.cgi?id=189810
 

Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.cpp (236437 => 236438)


--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.cpp	2018-09-24 23:05:54 UTC (rev 236437)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.cpp	2018-09-24 23:08:51 UTC (rev 236438)
@@ -41,3 +41,8 @@
 {
     return toAPI(InjectedBundleFileHandle::create(toWTFString(pathRef)).leakRef());
 }
+
+WKBundleFileHandleRef WKBundleFileHandleCreateWithPathForPage(WKStringRef pathRef, WKBundlePageRef)
+{
+    return toAPI(InjectedBundleFileHandle::create(toWTFString(pathRef)).leakRef());
+}

Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h (236437 => 236438)


--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h	2018-09-24 23:05:54 UTC (rev 236437)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFileHandleRef.h	2018-09-24 23:08:51 UTC (rev 236438)
@@ -27,6 +27,7 @@
 #define WKBundleFileHandleRef_h
 
 #include <WebKit/WKBase.h>
+#include <WebKit/WKDeprecated.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,7 +35,8 @@
 
 WK_EXPORT WKTypeID WKBundleFileHandleGetTypeID();
 
-WK_EXPORT WKBundleFileHandleRef WKBundleFileHandleCreateWithPath(WKStringRef path);
+WK_EXPORT WKBundleFileHandleRef WKBundleFileHandleCreateWithPath(WKStringRef path) WK_BUNDLE_API_DEPRECATED_WITH_REPLACEMENT(WKBundleFileHandleCreateWithPathForPage);
+WK_EXPORT WKBundleFileHandleRef WKBundleFileHandleCreateWithPathForPage(WKStringRef path, WKBundlePageRef page);
 
 #ifdef __cplusplus
 }

Modified: trunk/Tools/ChangeLog (236437 => 236438)


--- trunk/Tools/ChangeLog	2018-09-24 23:05:54 UTC (rev 236437)
+++ trunk/Tools/ChangeLog	2018-09-24 23:08:51 UTC (rev 236438)
@@ -1,3 +1,12 @@
+2018-09-24  Alex Christensen  <[email protected]>
+
+        Prepare to replace WKBundleFileHandleCreateWithPath with a version that takes a WKBundlePageRef
+        https://bugs.webkit.org/show_bug.cgi?id=189929
+
+        Reviewed by Andy Estes.
+
+        * TestWebKitAPI/Tests/WebKit/WKBundleFileHandle_Bundle.cpp:
+
 2018-09-24  Thomas Denney  <[email protected]>
 
         [WHLSL] Casting user-created types to themselves should always work

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKBundleFileHandle_Bundle.cpp (236437 => 236438)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKBundleFileHandle_Bundle.cpp	2018-09-24 23:05:54 UTC (rev 236437)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKBundleFileHandle_Bundle.cpp	2018-09-24 23:08:51 UTC (rev 236438)
@@ -69,7 +69,7 @@
         
         JSGlobalContextRef globalContext = WKBundleFrameGetJavaScriptContextForWorld(mainFrame, world);
 
-        auto fileHandle = adoptWK(WKBundleFileHandleCreateWithPath((WKStringRef)messageBody));
+        auto fileHandle = adoptWK(WKBundleFileHandleCreateWithPathForPage((WKStringRef)messageBody, loadedPage));
         JSValueRef jsFileHandle = WKBundleFrameGetJavaScriptWrapperForFileForWorld(mainFrame, fileHandle.get(), world);
 
         JSObjectRef globalObject = JSContextGetGlobalObject(globalContext);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to