Title: [217908] trunk/Source/WebKit2
Revision
217908
Author
m...@apple.com
Date
2017-06-07 15:26:48 -0700 (Wed, 07 Jun 2017)

Log Message

[Cocoa] additionalReadAccessAllowedURLs should be consumed before loading the injected bundle
https://bugs.webkit.org/show_bug.cgi?id=173078

Reviewed by Anders Carlsson.

* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess): Changed the order.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (217907 => 217908)


--- trunk/Source/WebKit2/ChangeLog	2017-06-07 22:21:30 UTC (rev 217907)
+++ trunk/Source/WebKit2/ChangeLog	2017-06-07 22:26:48 UTC (rev 217908)
@@ -1,3 +1,13 @@
+2017-06-07  Dan Bernstein  <m...@apple.com>
+
+        [Cocoa] additionalReadAccessAllowedURLs should be consumed before loading the injected bundle
+        https://bugs.webkit.org/show_bug.cgi?id=173078
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess): Changed the order.
+
 2017-06-07  Per Arne Vollan  <pvol...@apple.com>
 
         Support removal of authentication data through the Website data store API.

Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (217907 => 217908)


--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp	2017-06-07 22:21:30 UTC (rev 217907)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp	2017-06-07 22:26:48 UTC (rev 217908)
@@ -291,12 +291,12 @@
         memoryPressureHandler.install();
     }
 
+    for (size_t i = 0, size = parameters.additionalSandboxExtensionHandles.size(); i < size; ++i)
+        SandboxExtension::consumePermanently(parameters.additionalSandboxExtensionHandles[i]);
+
     if (!parameters.injectedBundlePath.isEmpty())
         m_injectedBundle = InjectedBundle::create(parameters, transformHandlesToObjects(parameters.initializationUserData.object()).get());
 
-    for (size_t i = 0, size = parameters.additionalSandboxExtensionHandles.size(); i < size; ++i)
-        SandboxExtension::consumePermanently(parameters.additionalSandboxExtensionHandles[i]);
-
     for (auto& supplement : m_supplements.values())
         supplement->initialize(parameters);
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to