Title: [199929] tags/Safari-602.1.29/Source/WebCore
- Revision
- 199929
- Author
- bshaf...@apple.com
- Date
- 2016-04-22 16:07:15 -0700 (Fri, 22 Apr 2016)
Log Message
Merged r199885.
Modified Paths
Diff
Modified: tags/Safari-602.1.29/Source/WebCore/ChangeLog (199928 => 199929)
--- tags/Safari-602.1.29/Source/WebCore/ChangeLog 2016-04-22 23:05:37 UTC (rev 199928)
+++ tags/Safari-602.1.29/Source/WebCore/ChangeLog 2016-04-22 23:07:15 UTC (rev 199929)
@@ -1,5 +1,16 @@
2016-04-22 Babak Shafiei <bshaf...@apple.com>
+ Merge r199885.
+
+ 2016-04-22 Brady Eidson <beid...@apple.com>
+
+ Attempt at a Windows build fix.
+
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::startWorkerGlobalScope):
+
+2016-04-22 Babak Shafiei <bshaf...@apple.com>
+
Merge r199912.
2016-04-22 Jer Noble <jer.no...@apple.com>
Modified: tags/Safari-602.1.29/Source/WebCore/workers/WorkerMessagingProxy.cpp (199928 => 199929)
--- tags/Safari-602.1.29/Source/WebCore/workers/WorkerMessagingProxy.cpp 2016-04-22 23:05:37 UTC (rev 199928)
+++ tags/Safari-602.1.29/Source/WebCore/workers/WorkerMessagingProxy.cpp 2016-04-22 23:07:15 UTC (rev 199929)
@@ -78,7 +78,12 @@
ASSERT(m_scriptExecutionContext);
Document& document = downcast<Document>(*m_scriptExecutionContext);
+#if ENABLE(INDEXED_DATABASE)
RefPtr<DedicatedWorkerThread> thread = DedicatedWorkerThread::create(scriptURL, userAgent, sourceCode, *this, *this, startMode, contentSecurityPolicyResponseHeaders, shouldBypassMainWorldContentSecurityPolicy, document.topOrigin(), document.idbConnectionProxy());
+#else
+ RefPtr<DedicatedWorkerThread> thread = DedicatedWorkerThread::create(scriptURL, userAgent, sourceCode, *this, *this, startMode, contentSecurityPolicyResponseHeaders, shouldBypassMainWorldContentSecurityPolicy, document.topOrigin(), nullptr);
+#endif
+
workerThreadCreated(thread);
thread->start();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
