Title: [207741] branches/safari-602-branch/Source/WebCore
- Revision
- 207741
- Author
- matthew_han...@apple.com
- Date
- 2016-10-24 00:18:22 -0700 (Mon, 24 Oct 2016)
Log Message
Merge r206074. rdar://problem/28216061
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207740 => 207741)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-24 07:18:19 UTC (rev 207740)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-24 07:18:22 UTC (rev 207741)
@@ -1,3 +1,23 @@
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r206074. rdar://problem/28216061
+
+ 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-10-20 Babak Shafiei <bshaf...@apple.com>
Build fix. rdar://problem/28883727
Modified: branches/safari-602-branch/Source/WebCore/loader/WorkerThreadableLoader.cpp (207740 => 207741)
--- branches/safari-602-branch/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-10-24 07:18:19 UTC (rev 207740)
+++ branches/safari-602-branch/Source/WebCore/loader/WorkerThreadableLoader.cpp 2016-10-24 07:18:22 UTC (rev 207741)
@@ -107,7 +107,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, outgoingReferrer, *securityOrigin);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
