[Cocoa] additionalReadAccessAllowedURLs should be consumed before loading the injecte...

https://bugs.webkit.org/show_bug.cgi?id=173078

Reviewed by Anders Carlsson.

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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@217908 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 12254c47005635ccd2150aade238271280a309d5..d0f3354516d93f29859c3e00cda2f1c6a495b733 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2017-06-07  Dan Bernstein  <mitz@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  <pvollan@apple.com>
 
         Support removal of authentication data through the Website data store API.

diff --git a/Source/WebKit2/WebProcess/WebProcess.cpp b/Source/WebKit2/WebProcess/WebProcess.cpp
index 5b82a3af34ad79c7d30198c266eb0c1ef96ee370..dbbb0a64d29c6a2bb378c462ce4ba25f42b30648 100644 (file)
--- a/Source/WebKit2/WebProcess/WebProcess.cpp
+++ b/Source/WebKit2/WebProcess/WebProcess.cpp
@@ -291,12 +291,12 @@ void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters)
         memoryPressureHandler.install();
     }
 
-    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]);
 
+    if (!parameters.injectedBundlePath.isEmpty())
+        m_injectedBundle = InjectedBundle::create(parameters, transformHandlesToObjects(parameters.initializationUserData.object()).get());
+
     for (auto& supplement : m_supplements.values())
         supplement->initialize(parameters);