Title: [215276] branches/safari-603-branch/Source/WebKit2
- Revision
- 215276
- Author
- [email protected]
- Date
- 2017-04-12 12:08:20 -0700 (Wed, 12 Apr 2017)
Log Message
Cherry-pick 214376. rdar://problem/31502340
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (215275 => 215276)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-04-12 19:02:51 UTC (rev 215275)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-04-12 19:08:20 UTC (rev 215276)
@@ -1,3 +1,18 @@
+2017-04-12 Jason Marcell <[email protected]>
+
+ Cherry-pick 214376. rdar://problem/31502340
+
+ 2017-03-24 Alex Christensen <[email protected]>
+
+ Fix assertions after r214358.
+ https://bugs.webkit.org/show_bug.cgi?id=169167
+
+ * UIProcess/API/APIContentExtensionStore.cpp:
+ (API::ContentExtensionStore::compileContentExtension):
+ AtomicString::init must be called for the first time from the main thread.
+ We were calling it for the first time from a non-main thread sometimes.
+ Call it from the main thread before initiating compiling on another thread.
+
2017-04-03 Jason Marcell <[email protected]>
Cherry-pick r211601. rdar://problem/31387958
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp (215275 => 215276)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2017-04-12 19:02:51 UTC (rev 215275)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2017-04-12 19:08:20 UTC (rev 215276)
@@ -334,6 +334,7 @@
void UserContentExtensionStore::compileContentExtension(const WTF::String& identifier, WTF::String&& json, std::function<void(RefPtr<API::UserContentExtension>, std::error_code)> completionHandler)
{
+ AtomicString::init();
m_compileQueue->dispatch([protectedThis = makeRef(*this), identifier = identifier.isolatedCopy(), json = json.isolatedCopy(), storePath = m_storePath.isolatedCopy(), completionHandler = WTFMove(completionHandler)] () mutable {
auto path = constructedPath(storePath, identifier);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
