Title: [186322] releases/WebKitGTK/webkit-2.8/Source/WebCore
- Revision
- 186322
- Author
- [email protected]
- Date
- 2015-07-06 02:01:02 -0700 (Mon, 06 Jul 2015)
Log Message
Merge r184657 - ThreadableLoaderOptions::isolatedCopy() doesn't produce a copy that is safe for sending to another thread
https://bugs.webkit.org/show_bug.cgi?id=145217
Reviewed by Anders Carlsson.
Caught by existing tests, rarely. I don't know how to catch such bugs more reliably.
* loader/ThreadableLoader.cpp: (WebCore::ThreadableLoaderOptions::isolatedCopy):
* loader/ThreadableLoader.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (186321 => 186322)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-06 08:55:21 UTC (rev 186321)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-06 09:01:02 UTC (rev 186322)
@@ -1,3 +1,15 @@
+2015-05-20 Alexey Proskuryakov <[email protected]>
+
+ ThreadableLoaderOptions::isolatedCopy() doesn't produce a copy that is safe for sending to another thread
+ https://bugs.webkit.org/show_bug.cgi?id=145217
+
+ Reviewed by Anders Carlsson.
+
+ Caught by existing tests, rarely. I don't know how to catch such bugs more reliably.
+
+ * loader/ThreadableLoader.cpp: (WebCore::ThreadableLoaderOptions::isolatedCopy):
+ * loader/ThreadableLoader.h:
+
2015-05-19 Antti Koivisto <[email protected]>
Crash under WebCore::invalidateStyleRecursively
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.cpp (186321 => 186322)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.cpp 2015-07-06 08:55:21 UTC (rev 186321)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.cpp 2015-07-06 09:01:02 UTC (rev 186322)
@@ -59,7 +59,7 @@
if (securityOrigin)
copy->securityOrigin = securityOrigin->isolatedCopy();
#if ENABLE(RESOURCE_TIMING)
- copy->initiator = initiator.string().isolatedCopy();
+ copy->initiator = initiator.isolatedCopy();
#endif
return copy;
}
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.h (186321 => 186322)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.h 2015-07-06 08:55:21 UTC (rev 186321)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/ThreadableLoader.h 2015-07-06 09:01:02 UTC (rev 186322)
@@ -72,7 +72,7 @@
CrossOriginRequestPolicy crossOriginRequestPolicy;
RefPtr<SecurityOrigin> securityOrigin;
#if ENABLE(RESOURCE_TIMING)
- AtomicString initiator;
+ String initiator; // This cannot be an AtomicString, as isolatedCopy() wouldn't create an object that's safe for passing to another thread.
#endif
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
