Changeset 267030 in webkit

Timestamp:

Sep 14, 2020 12:50:06 PM (4 years ago)

Author:

Fujii Hironori

Message:

[TestRunnerShared] Make UIScriptContext not directly call UIScriptController::create which are defined in DRT and WTR
​https://bugs.webkit.org/show_bug.cgi?id=216470

Reviewed by Simon Fraser.

UIScriptContext constructor directly called
UIScriptController::create which are defined in DRT and WTR. I'd
like to make TestRunnerShared as a stand alone library which
doesn't depend on DRT and WTR (Bug 216465). Make UIScriptContext
take a factory function to create UIScriptController.

• DumpRenderTree/TestRunner.cpp:

(TestRunner::runUIScript):

• DumpRenderTree/TestRunner.h:
• TestRunnerShared/UIScriptContext/UIScriptContext.cpp:

(UIScriptContext::UIScriptContext):

• TestRunnerShared/UIScriptContext/UIScriptContext.h:
• TestRunnerShared/UIScriptContext/UIScriptControllerShared.cpp:

(WTR::UIScriptController::create): Deleted.

• WebKitTestRunner/TestInvocation.cpp:

(WTR::TestInvocation::runUISideScript):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/TestRunner.cpp (modified) (1 diff)
• DumpRenderTree/TestRunner.h (modified) (1 diff)
• TestRunnerShared/UIScriptContext/UIScriptContext.cpp (modified) (1 diff)
• TestRunnerShared/UIScriptContext/UIScriptContext.h (modified) (2 diffs)
• TestRunnerShared/UIScriptContext/UIScriptControllerShared.cpp (modified) (1 diff)
• WebKitTestRunner/TestInvocation.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-09-14  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [TestRunnerShared] Make UIScriptContext not directly call UIScriptController::create which are defined in DRT and WTR
+        https://bugs.webkit.org/show_bug.cgi?id=216470
+
+        Reviewed by Simon Fraser.
+
+        UIScriptContext constructor directly called
+        UIScriptController::create which are defined in DRT and WTR. I'd
+        like to make TestRunnerShared as a stand alone library which
+        doesn't depend on DRT and WTR (Bug 216465). Make UIScriptContext
+        take a factory function to create UIScriptController.
+
+        * DumpRenderTree/TestRunner.cpp:
+        (TestRunner::runUIScript):
+        * DumpRenderTree/TestRunner.h:
+        * TestRunnerShared/UIScriptContext/UIScriptContext.cpp:
+        (UIScriptContext::UIScriptContext):
+        * TestRunnerShared/UIScriptContext/UIScriptContext.h:
+        * TestRunnerShared/UIScriptContext/UIScriptControllerShared.cpp:
+        (WTR::UIScriptController::create): Deleted.
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::runUISideScript):
+
 2020-09-14  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/DumpRenderTree/TestRunner.cpp

@@ -2468 +2468 @@
 
     if (!m_UIScriptContext)
-        m_UIScriptContext = makeUniqueWithoutFastMallocCheck<WTR::UIScriptContext>(*this);
+        m_UIScriptContext = makeUniqueWithoutFastMallocCheck<WTR::UIScriptContext>(*this, WTR::UIScriptController::create);
 
     String scriptString(reinterpret_cast<const UChar*>(JSStringGetCharactersPtr(script)), JSStringGetLength(script));

trunk/Tools/DumpRenderTree/TestRunner.h

@@ -30 +30 @@
 
 #include "UIScriptContext.h"
+#include "UIScriptController.h"
 #include <JavaScriptCore/JSObjectRef.h>
 #include <map>

trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.cpp

@@ -39 +39 @@
 }
 
-UIScriptContext::UIScriptContext(UIScriptContextDelegate& delegate)
+UIScriptContext::UIScriptContext(UIScriptContextDelegate& delegate, UIScriptControllerFactory factory)
     : m_context(adopt(JSGlobalContextCreate(nullptr)))
     , m_delegate(delegate)
 {
-    m_controller = UIScriptController::create(*this);
+    m_controller = factory(*this);
 
     JSObjectRef globalObject = JSContextGetGlobalObject(m_context.get());

trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.h

@@ -31 +31 @@
 #include <JavaScriptCore/JSRetainPtr.h>
 #include <wtf/HashMap.h>
-#include <wtf/RefPtr.h>
+#include <wtf/Ref.h>
 #include <wtf/text/WTFString.h>
 
@@ -73 +73 @@
     WTF_MAKE_NONCOPYABLE(UIScriptContext);
 public:
-    UIScriptContext(UIScriptContextDelegate&);
+    using UIScriptControllerFactory = Ref<UIScriptController> (*)(UIScriptContext&);
+
+    UIScriptContext(UIScriptContextDelegate&, UIScriptControllerFactory);
     ~UIScriptContext();
 

trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptControllerShared.cpp

@@ -59 +59 @@
 }
 
-#if !PLATFORM(GTK) && !PLATFORM(COCOA) && !PLATFORM(WIN) && !PLATFORM(WPE)
-Ref<UIScriptController> UIScriptController::create(UIScriptContext& context)
-{
-    return adoptRef(*new UIScriptController(context));
-}
-#endif
-
 UIScriptController::UIScriptController(UIScriptContext& context)
     : m_context(&context)

trunk/Tools/WebKitTestRunner/TestInvocation.cpp

@@ -1896 +1896 @@
 
     if (!m_UIScriptContext)
-        m_UIScriptContext = makeUnique<UIScriptContext>(*this);
+        m_UIScriptContext = makeUnique<UIScriptContext>(*this, UIScriptController::create);
     
     m_UIScriptContext->runUIScript(toWTFString(script), scriptCallbackID);