Title: [268164] trunk/Source/WebCore
- Revision
- 268164
- Author
- [email protected]
- Date
- 2020-10-07 17:27:40 -0700 (Wed, 07 Oct 2020)
Log Message
Unreviewed, fix Windows build after r268161.
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::createdMessagePort):
(WebCore::ScriptExecutionContext::destroyedMessagePort):
* workers/WorkerOrWorkletGlobalScope.h:
(isType):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (268163 => 268164)
--- trunk/Source/WebCore/ChangeLog 2020-10-08 00:23:53 UTC (rev 268163)
+++ trunk/Source/WebCore/ChangeLog 2020-10-08 00:27:40 UTC (rev 268164)
@@ -1,3 +1,13 @@
+2020-10-07 Chris Dumez <[email protected]>
+
+ Unreviewed, fix Windows build after r268161.
+
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::createdMessagePort):
+ (WebCore::ScriptExecutionContext::destroyedMessagePort):
+ * workers/WorkerOrWorkletGlobalScope.h:
+ (isType):
+
2020-10-07 Tim Horton <[email protected]>
REGRESSION: Safari unable to load PDF in <embed> (docs.legalconnect.com)
Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (268163 => 268164)
--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2020-10-08 00:23:53 UTC (rev 268163)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2020-10-08 00:27:40 UTC (rev 268164)
@@ -28,8 +28,6 @@
#include "config.h"
#include "ScriptExecutionContext.h"
-#include "AudioWorkletGlobalScope.h"
-#include "AudioWorkletThread.h"
#include "CachedScript.h"
#include "CommonVM.h"
#include "DOMTimer.h"
@@ -57,6 +55,8 @@
#include "Settings.h"
#include "WorkerGlobalScope.h"
#include "WorkerNavigator.h"
+#include "WorkerOrWorkletGlobalScope.h"
+#include "WorkerOrWorkletThread.h"
#include "WorkerThread.h"
#include "WorkletGlobalScope.h"
#include "WorkletScriptController.h"
@@ -207,11 +207,8 @@
void ScriptExecutionContext::createdMessagePort(MessagePort& messagePort)
{
ASSERT((is<Document>(*this) && isMainThread())
- || (is<WorkerGlobalScope>(*this) && downcast<WorkerGlobalScope>(*this).thread().thread() == &Thread::current())
-#if ENABLE(WEB_AUDIO)
- || (is<AudioWorkletGlobalScope>(*this) && downcast<AudioWorkletGlobalScope>(*this).thread().thread() == &Thread::current())
-#endif
- );
+ || (is<WorkerOrWorkletGlobalScope>(*this) && downcast<WorkerOrWorkletGlobalScope>(*this).workerOrWorkletThread() && downcast<WorkerOrWorkletGlobalScope>(*this).workerOrWorkletThread()->thread() == &Thread::current())
+ || (is<WorkerOrWorkletGlobalScope>(*this) && !downcast<WorkerOrWorkletGlobalScope>(*this).workerOrWorkletThread() && isMainThread()));
m_messagePorts.add(&messagePort);
}
@@ -219,11 +216,9 @@
void ScriptExecutionContext::destroyedMessagePort(MessagePort& messagePort)
{
ASSERT((is<Document>(*this) && isMainThread())
- || (is<WorkerGlobalScope>(*this) && downcast<WorkerGlobalScope>(*this).thread().thread() == &Thread::current())
-#if ENABLE(WEB_AUDIO)
- || (is<AudioWorkletGlobalScope>(*this) && downcast<AudioWorkletGlobalScope>(*this).thread().thread() == &Thread::current())
-#endif
- );
+ || (is<WorkerOrWorkletGlobalScope>(*this) && downcast<WorkerOrWorkletGlobalScope>(*this).workerOrWorkletThread() && downcast<WorkerOrWorkletGlobalScope>(*this).workerOrWorkletThread()->thread() == &Thread::current())
+ || (is<WorkerOrWorkletGlobalScope>(*this) && !downcast<WorkerOrWorkletGlobalScope>(*this).workerOrWorkletThread() && isMainThread()));
+
m_messagePorts.remove(&messagePort);
}
Modified: trunk/Source/WebCore/workers/WorkerOrWorkletGlobalScope.h (268163 => 268164)
--- trunk/Source/WebCore/workers/WorkerOrWorkletGlobalScope.h 2020-10-08 00:23:53 UTC (rev 268163)
+++ trunk/Source/WebCore/workers/WorkerOrWorkletGlobalScope.h 2020-10-08 00:27:40 UTC (rev 268164)
@@ -47,3 +47,7 @@
};
} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::WorkerOrWorkletGlobalScope)
+ static bool isType(const WebCore::ScriptExecutionContext& context) { return context.isWorkerGlobalScope() || context.isWorkletGlobalScope(); }
+SPECIALIZE_TYPE_TRAITS_END()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
