Changeset 207081 in webkit

Timestamp:

Oct 11, 2016 3:40:16 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r206074 - MainThreadBridge needs an isolatedCopy() of SecurityOrigin
<​https://webkit.org/b/162116>
<rdar://problem/27525870>

Reviewed by Carlos Garcia Campos.

Covered by existing tests.

• loader/WorkerThreadableLoader.cpp:

(WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
Make an isolatedCopy() of SecurityOrigin here since that's the
correct idiom to use when the object is passed from a worker
thread back to the main thread. Fix suggested by Daniel Bates.

Location:

releases/WebKitGTK/webkit-2.14/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/WorkerThreadableLoader.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-17  David Kilzer  <ddkilzer@apple.com>
+
+        MainThreadBridge needs an isolatedCopy() of SecurityOrigin
+        <https://webkit.org/b/162116>
+        <rdar://problem/27525870>
+
+        Reviewed by Carlos Garcia Campos.
+
+        Covered by existing tests.
+
+        * loader/WorkerThreadableLoader.cpp:
+        (WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge):
+        Make an isolatedCopy() of SecurityOrigin here since that's the
+        correct idiom to use when the object is passed from a worker
+        thread back to the main thread.  Fix suggested by Daniel Bates.
+
 2016-09-16  Chris Dumez  <cdumez@apple.com>
 

releases/WebKitGTK/webkit-2.14/Source/WebCore/loader/WorkerThreadableLoader.cpp

@@ -109 +109 @@
     ASSERT(contentSecurityPolicy);
 
-    auto contentSecurityPolicyCopy = std::make_unique<ContentSecurityPolicy>(*securityOrigin);
+    auto contentSecurityPolicyCopy = std::make_unique<ContentSecurityPolicy>(securityOrigin->isolatedCopy());
     contentSecurityPolicyCopy->copyStateFrom(contentSecurityPolicy);