Title: [207081] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 207081
- Author
- carlo...@webkit.org
- Date
- 2016-10-11 03:40:16 -0700 (Tue, 11 Oct 2016)
Log 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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207080 => 207081)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 10:38:37 UTC (rev 207080)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 10:40:16 UTC (rev 207081)
@@ -1,3 +1,19 @@
+2016-09-17 David Kilzer <ddkil...@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 <cdu...@apple.com>
Cancelling one frame's load cancels load in other frames that have the same URL as well
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/loader/WorkerThreadableLoader.cpp (207080 => 207081)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-10-11 10:38:37 UTC (rev 207080)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-10-11 10:40:16 UTC (rev 207081)
@@ -108,7 +108,7 @@
ASSERT(securityOrigin);
ASSERT(contentSecurityPolicy);
- auto contentSecurityPolicyCopy = std::make_unique<ContentSecurityPolicy>(*securityOrigin);
+ auto contentSecurityPolicyCopy = std::make_unique<ContentSecurityPolicy>(securityOrigin->isolatedCopy());
contentSecurityPolicyCopy->copyStateFrom(contentSecurityPolicy);
auto optionsCopy = std::make_unique<LoaderTaskOptions>(options, request.httpReferrer().isNull() ? outgoingReferrer : request.httpReferrer(), *securityOrigin);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
