Changeset 268868 in webkit

Timestamp:

Oct 22, 2020, 9:23:07 AM (6 years ago)

Author:

Chris Dumez

Message:

Turn ScriptExecutionContext::vm() into a pure virtual function
​https://bugs.webkit.org/show_bug.cgi?id=218057

Reviewed by Geoffrey Garen.

Turn ScriptExecutionContext::vm() into a pure virtual function instead of using a
non-virtual function that does type-checking inside.

• dom/Document.cpp:

(WebCore::Document::vm):

• dom/Document.h:
• dom/EmptyScriptExecutionContext.h:
• dom/ScriptExecutionContext.cpp:

(WebCore::ScriptExecutionContext::vm): Deleted.

• dom/ScriptExecutionContext.h:
• workers/WorkerOrWorkletGlobalScope.cpp:

(WebCore::WorkerOrWorkletGlobalScope::vm):

• workers/WorkerOrWorkletGlobalScope.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/Document.h (modified) (1 diff)
• dom/EmptyScriptExecutionContext.h (modified) (3 diffs)
• dom/ScriptExecutionContext.cpp (modified) (1 diff)
• dom/ScriptExecutionContext.h (modified) (1 diff)
• workers/WorkerOrWorkletGlobalScope.cpp (modified) (1 diff)
• workers/WorkerOrWorkletGlobalScope.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-22  Chris Dumez  <cdumez@apple.com>
+
+        Turn ScriptExecutionContext::vm() into a pure virtual function
+        https://bugs.webkit.org/show_bug.cgi?id=218057
+
+        Reviewed by Geoffrey Garen.
+
+        Turn ScriptExecutionContext::vm() into a pure virtual function instead of using a
+        non-virtual function that does type-checking inside.
+
+        * dom/Document.cpp:
+        (WebCore::Document::vm):
+        * dom/Document.h:
+        * dom/EmptyScriptExecutionContext.h:
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::vm): Deleted.
+        * dom/ScriptExecutionContext.h:
+        * workers/WorkerOrWorkletGlobalScope.cpp:
+        (WebCore::WorkerOrWorkletGlobalScope::vm):
+        * workers/WorkerOrWorkletGlobalScope.h:
+
 2020-10-22  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -8670 +8670 @@
 }
 
+JSC::VM& Document::vm()
+{
+    return commonVM();
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/dom/Document.h

@@ -1596 +1596 @@
     bool contains(const Node* node) const { return node && contains(*node); }
 
+    WEBCORE_EXPORT JSC::VM& vm() final;
+
 protected:
     enum ConstructionFlags { Synthesized = 1, NonRenderedPlaceholder = 1 << 1 };

trunk/Source/WebCore/dom/EmptyScriptExecutionContext.h

@@ -76 +76 @@
 #endif
 
+    JSC::VM& vm() final { return m_vm; }
+
     using RefCounted::ref;
     using RefCounted::deref;
@@ -81 +83 @@
 private:
     EmptyScriptExecutionContext(JSC::VM& vm)
-        : m_origin(SecurityOrigin::createUnique())
+        : m_vm(vm)
+        , m_origin(SecurityOrigin::createUnique())
         , m_eventLoop(EmptyEventLoop::create(vm))
         , m_eventLoopTaskGroup(makeUnique<EventLoopTaskGroup>(m_eventLoop))
@@ -113 +116 @@
     };
 
+    Ref<JSC::VM> m_vm;
     Ref<SecurityOrigin> m_origin;
     URL m_url;

trunk/Source/WebCore/dom/ScriptExecutionContext.cpp

@@ -478 +478 @@
 }
 
-JSC::VM& ScriptExecutionContext::vm()
-{
-    if (is<Document>(*this))
-        return commonVM();
-    if (is<WorkerOrWorkletGlobalScope>(*this))
-        return downcast<WorkerOrWorkletGlobalScope>(*this).script()->vm();
-
-    RELEASE_ASSERT_NOT_REACHED();
-    return commonVM();
-}
-
 RejectedPromiseTracker& ScriptExecutionContext::ensureRejectedPromiseTrackerSlow()
 {

trunk/Source/WebCore/dom/ScriptExecutionContext.h

@@ -212 +212 @@
     DOMTimer* findTimeout(int timeoutId) { return m_timeouts.get(timeoutId); }
 
-    WEBCORE_EXPORT JSC::VM& vm();
+    virtual JSC::VM& vm() = 0;
 
     void adjustMinimumDOMTimerInterval(Seconds oldMinimumTimerInterval);

trunk/Source/WebCore/workers/WorkerOrWorkletGlobalScope.cpp

@@ -65 +65 @@
 }
 
+JSC::VM& WorkerOrWorkletGlobalScope::vm()
+{
+    return script()->vm();
+}
+
 void WorkerOrWorkletGlobalScope::disableEval(const String& errorMessage)
 {

trunk/Source/WebCore/workers/WorkerOrWorkletGlobalScope.h

@@ -48 +48 @@
     void clearScript();
 
+    JSC::VM& vm() final;
+
     unsigned long createUniqueIdentifier() { return m_uniqueIdentifier++; }