Changeset 263575 in webkit


Ignore:
Timestamp:
Jun 26, 2020 12:28:18 PM (4 years ago)
Author:
ggaren@apple.com
Message:

Initializing the main thread should initialize the main run loop
​https://bugs.webkit.org/show_bug.cgi?id=213637

Reviewed by Anders Carlsson.

Source/JavaScriptCore:

  • JavaScriptCore.order: Removed some defunct stuff.
  • shell/playstation/TestShell.cpp:

(setupTestRun): Merged initializeThreading call with
initializeMainThread call because initializeMainThread is a superset.

Source/WebCore:

  • platform/ios/wak/WebCoreThread.mm:

(RunWebThread): Removed call to initializeMainThread() because the main
thread calls it before starting the web thread, so it's a no-op. (And if
it were an op, it would be broken.)
(StartWebThread): Merged RunLoop::initializeMain and initializeThreading
into initializeMainThread.

Source/WebDriver:

  • WebDriverService.cpp:

(WebDriver::WebDriverService::run):

Source/WebKit:

  • Shared/Cocoa/WebKit2InitializeCocoa.mm:

(WebKit::runInitializationCode):
(WebKit::InitializeWebKit2):

  • Shared/WebKit2Initialize.cpp:

(WebKit::InitializeWebKit2):

Source/WebKitLegacy/mac:

  • History/WebBackForwardList.mm:

(+[WebBackForwardList initialize]):

  • History/WebHistoryItem.mm:

(+[WebHistoryItem initialize]):

  • Misc/WebCache.mm:

(+[WebCache initialize]):

  • Misc/WebElementDictionary.mm:

(+[WebElementDictionary initialize]):

  • Misc/WebIconDatabase.mm:
  • Plugins/Hosted/WebHostedNetscapePluginView.mm:

(+[WebHostedNetscapePluginView initialize]):

  • Plugins/WebBaseNetscapePluginView.mm:
  • Plugins/WebBasePluginPackage.mm:

(+[WebBasePluginPackage initialize]):

  • Plugins/WebNetscapePluginView.mm:

(+[WebNetscapePluginView initialize]):

  • WebCoreSupport/WebEditorClient.mm:

(+[WebUndoStep initialize]):

  • WebCoreSupport/WebFrameLoaderClient.mm:

(+[WebFramePolicyListener initialize]):

  • WebView/WebArchive.mm:

(+[WebArchivePrivate initialize]):

  • WebView/WebDataSource.mm:

(+[WebDataSource initialize]):

  • WebView/WebHTMLView.mm:

(+[WebHTMLViewPrivate initialize]):
(+[WebHTMLView initialize]):

  • WebView/WebPreferences.mm:

(+[WebPreferences initialize]):

  • WebView/WebResource.mm:

(+[WebResourcePrivate initialize]):

  • WebView/WebTextIterator.mm:

(+[WebTextIteratorPrivate initialize]):

  • WebView/WebView.mm:

(+[WebView initialize]):

  • WebView/WebViewData.mm:

(+[WebViewPrivate initialize]):

Source/WebKitLegacy/win:

  • WebView.cpp:

(WebView::WebView):

Source/WTF:

Previously, some code initialized one, some the other, and some both;
and some code tried to initialize more than once; and some code tried
to initialize in ways that would crash but luckily got pre-empted by
other code that had already initialized.

In addition to general confusion, this setup made it subtly high stakes
to call certain functions, like callOnMainThread or
RunLoop::main().dispatch(), because they might crash if the right
initialization had not been performed.

Let's fix that.

  • wtf/MainThread.cpp:

(WTF::initializeMainThread): Removed defunct comment about
initializeMainThreadToProcessMainThread. Shrank scope of initializeKey.

  • wtf/RunLoop.cpp:

(WTF::RunLoop::initializeMain): Don't call initializeMainThread anymore
because it calls us now. No need for a store fence since we run on the
main thread and we don't store anything.
(WTF::RunLoop::initializeWeb): Upgrade to RELEASE_ASSERT.

  • wtf/RunLoop.h: Removed incorrect comment. (Fascinating to wonder when

it became incorrect.)

Tools:

Updated TestWebKitAPI to stop using RunLoop::initializeMain directly.

  • TestWebKitAPI/Tests/WTF/RefPtr.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WTF/RunLoop.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebCore/AbortableTaskQueue.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp:

(ApplicationManifestParserTest::SetUp):

  • TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp:

(TestWebKitAPI::ComplexTextControllerTest::SetUp):

  • TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:

(TestWebKitAPI::ContentExtensionTest::SetUp):

  • TestWebKitAPI/Tests/WebCore/DNS.cpp:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebCore/FileMonitor.cpp:

(TestWebKitAPI::TEST_F):

  • TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm:

(initializeInAppBrowserPrivacyTestSettings):

  • TestWebKitAPI/TestsController.cpp:

(TestWebKitAPI::TestsController::TestsController):

  • WebKitTestRunner/TestController.cpp:

(TestController::initialize):

Location:
trunk
Files:
48 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r263546 r263575  
     12020-06-26  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Initializing the main thread should initialize the main run loop
     4        https://bugs.webkit.org/show_bug.cgi?id=213637
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * JavaScriptCore.order: Removed some defunct stuff.
     9        * shell/playstation/TestShell.cpp:
     10        (setupTestRun): Merged initializeThreading call with
     11        initializeMainThread call because initializeMainThread is a superset.
     12
    1132020-06-25  Yusuke Suzuki  <ysuzuki@apple.com>
    214

  • trunk/Source/JavaScriptCore/JavaScriptCore.order

    r253234 r263575  
    5050__ZN3JSC7JSStack19initializeThreadingEv
    5151__ZN3JSC5LLInt10initializeEv
    52 __ZN3WTF39initializeMainThreadToProcessMainThreadEv
    53 __ZN3WTFL43initializeMainThreadToProcessMainThreadOnceEv
    54 __ZN3WTF47initializeMainThreadToProcessMainThreadPlatformEv
    5552__ZN3WTF19initializeGCThreadsEv
    5653__ZN3WTF18FunctionDispatcherC2Ev

  • trunk/Source/JavaScriptCore/shell/playstation/TestShell.cpp

    r252243 r263575  
    3131    // threading yet, since that would do somethings that we'd like to defer until after we
    3232    // have a chance to parse options.
    33     WTF::initializeThreading();
     33    WTF::initializeMainThread();
    3434
    3535    // Need to override and enable restricted options before we start parsing options below.
    3636    Config::enableRestrictedOptions();
    3737
    38     // Initialize JSC before getting VM.
    39     WTF::initializeMainThread();
    4038    JSC::initializeThreading();
    4139

  • trunk/Source/WTF/ChangeLog

    r263529 r263575  
     12020-06-26  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Initializing the main thread should initialize the main run loop
     4        https://bugs.webkit.org/show_bug.cgi?id=213637
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Previously, some code initialized one, some the other, and some both;
     9        and some code tried to initialize more than once; and some code tried
     10        to initialize in ways that would crash but luckily got pre-empted by
     11        other code that had already initialized.
     12
     13        In addition to general confusion, this setup made it subtly high stakes
     14        to call certain functions, like callOnMainThread or
     15        RunLoop::main().dispatch(), because they might crash if the right
     16        initialization had not been performed.
     17
     18        Let's fix that.
     19
     20        * wtf/MainThread.cpp:
     21        (WTF::initializeMainThread): Removed defunct comment about
     22        initializeMainThreadToProcessMainThread. Shrank scope of initializeKey.
     23        * wtf/RunLoop.cpp:
     24        (WTF::RunLoop::initializeMain): Don't call initializeMainThread anymore
     25        because it calls us now. No need for a store fence since we run on the
     26        main thread and we don't store anything.
     27        (WTF::RunLoop::initializeWeb): Upgrade to RELEASE_ASSERT.
     28        * wtf/RunLoop.h: Removed incorrect comment. (Fascinating to wonder when
     29        it became incorrect.)
     30
    1312020-06-25  Sam Weinig  <weinig@apple.com>
    232

  • trunk/Source/WTF/wtf/MainThread.cpp

    r263461 r263575  
    5050}
    5151
    52 // Share this initializeKey with initializeMainThread and initializeMainThreadToProcessMainThread.
    53 static std::once_flag initializeKey;
    5452void initializeMainThread()
    5553{
     54    static std::once_flag initializeKey;
    5655    std::call_once(initializeKey, [] {
    5756        initializeThreading();
    5857        initializeMainThreadPlatform();
     58        RunLoop::initializeMain();
    5959    });
    6060}

  • trunk/Source/WTF/wtf/RunLoop.cpp

    r263524 r263575  
    5555void RunLoop::initializeMain()
    5656{
    57     if (s_mainRunLoop)
    58         return;
    59     initializeMainThread();
    60     WTF::storeStoreFence();
     57    RELEASE_ASSERT(!s_mainRunLoop);
    6158    s_mainRunLoop = &RunLoop::current();
    6259}
    … …  
    8279void RunLoop::initializeWeb()
    8380{
     81    RELEASE_ASSERT(!s_webRunLoop);
    8482    s_webRunLoop = &RunLoop::current();
    8583}

  • trunk/Source/WTF/wtf/RunLoop.h

    r263524 r263575  
    5959    WTF_MAKE_NONCOPYABLE(RunLoop);
    6060public:
    61     // Must be called from the main thread (except for the Mac platform, where it
    62     // can be called from any thread).
     61    // Must be called from the main thread.
    6362    WTF_EXPORT_PRIVATE static void initializeMain();
    6463#if USE(WEB_THREAD)

  • trunk/Source/WebCore/ChangeLog

    r263573 r263575  
     12020-06-26  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Initializing the main thread should initialize the main run loop
     4        https://bugs.webkit.org/show_bug.cgi?id=213637
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * platform/ios/wak/WebCoreThread.mm:
     9        (RunWebThread): Removed call to initializeMainThread() because the main
     10        thread calls it before starting the web thread, so it's a no-op. (And if
     11        it were an op, it would be broken.)
     12        (StartWebThread): Merged RunLoop::initializeMain and initializeThreading
     13        into initializeMainThread.
     14
    1152020-06-26  Andres Gonzalez  <andresg_22@apple.com>
    216

  • trunk/Source/WebCore/platform/ios/wak/WebCoreThread.mm

    r262878 r263575  
    585585    FloatingPointEnvironment::singleton().propagateMainThreadEnvironment();
    586586
    587     // WTF::initializeMainThread() needs to be called before JSC::initializeThreading() since the
     587    // WTF::initializeWebThread() needs to be called before JSC::initializeThreading() since the
    588588    // code invoked by the latter needs to know if it's running on the WebThread. See
    589589    // <rdar://problem/8502487>.
    590     WTF::initializeMainThread();
    591590    WTF::initializeWebThread();
    592591    JSC::initializeThreading();
    … …  
    634633
    635634    // ThreadGlobalData touches AtomString, which requires Threading initialization.
    636     WTF::initializeThreading();
     635    WTF::initializeMainThread();
    637636
    638637    // Initialize AtomString on the main thread.
    … …  
    643642    WebCore::ThreadGlobalData& unused = WebCore::threadGlobalData();
    644643    UNUSED_PARAM(unused);
    645 
    646     RunLoop::initializeMain();
    647644
    648645    // register class for WebThread deallocation

  • trunk/Source/WebDriver/ChangeLog

    r263422 r263575  
     12020-06-26  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Initializing the main thread should initialize the main run loop
     4        https://bugs.webkit.org/show_bug.cgi?id=213637
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebDriverService.cpp:
     9        (WebDriver::WebDriverService::run):
     10
    1112020-06-23  Chris Dumez  <cdumez@apple.com>
    212

  • trunk/Source/WebDriver/WebDriverService.cpp

    r262878 r263575  
    9797    }
    9898
    99     RunLoop::initializeMain();
     99    WTF::initializeMainThread();
    100100
    101101    if (!m_server.listen(host, port))

  • trunk/Source/WebKit/ChangeLog

    r263570 r263575  
     12020-06-26  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Initializing the main thread should initialize the main run loop
     4        https://bugs.webkit.org/show_bug.cgi?id=213637
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Shared/Cocoa/WebKit2InitializeCocoa.mm:
     9        (WebKit::runInitializationCode):
     10        (WebKit::InitializeWebKit2):
     11        * Shared/WebKit2Initialize.cpp:
     12        (WebKit::InitializeWebKit2):
     13
    1142020-06-26  Chris Dumez  <cdumez@apple.com>
    215

  • trunk/Source/WebKit/Shared/Cocoa/WebKit2InitializeCocoa.mm

    r263479 r263575  
    5454
    5555    JSC::initializeThreading();
    56     RunLoop::initializeMain();
     56    WTF::initializeMainThread();
    5757
    5858    WTF::RefCountedBase::enableThreadingChecksGlobally();
    … …  
    6666void InitializeWebKit2()
    6767{
    68     // Make sure the initialization code is run only once and on the main thread since things like RunLoop::initializeMain()
     68    // Make sure the initialization code is run only once and on the main thread since things like initializeMainThread()
    6969    // are only safe to call on the main thread.
    7070    std::call_once(flag, [] {

  • trunk/Source/WebKit/Shared/WebKit2Initialize.cpp

    r262878 r263575  
    4141{
    4242    JSC::initializeThreading();
    43     RunLoop::initializeMain();
     43    WTF::initializeMainThread();
    4444    AtomString::init();
    4545

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r263567 r263575  
     12020-06-26  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Initializing the main thread should initialize the main run loop
     4        https://bugs.webkit.org/show_bug.cgi?id=213637
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * History/WebBackForwardList.mm:
     9        (+[WebBackForwardList initialize]):
     10        * History/WebHistoryItem.mm:
     11        (+[WebHistoryItem initialize]):
     12        * Misc/WebCache.mm:
     13        (+[WebCache initialize]):
     14        * Misc/WebElementDictionary.mm:
     15        (+[WebElementDictionary initialize]):
     16        * Misc/WebIconDatabase.mm:
     17        * Plugins/Hosted/WebHostedNetscapePluginView.mm:
     18        (+[WebHostedNetscapePluginView initialize]):
     19        * Plugins/WebBaseNetscapePluginView.mm:
     20        * Plugins/WebBasePluginPackage.mm:
     21        (+[WebBasePluginPackage initialize]):
     22        * Plugins/WebNetscapePluginView.mm:
     23        (+[WebNetscapePluginView initialize]):
     24        * WebCoreSupport/WebEditorClient.mm:
     25        (+[WebUndoStep initialize]):
     26        * WebCoreSupport/WebFrameLoaderClient.mm:
     27        (+[WebFramePolicyListener initialize]):
     28        * WebView/WebArchive.mm:
     29        (+[WebArchivePrivate initialize]):
     30        * WebView/WebDataSource.mm:
     31        (+[WebDataSource initialize]):
     32        * WebView/WebHTMLView.mm:
     33        (+[WebHTMLViewPrivate initialize]):
     34        (+[WebHTMLView initialize]):
     35        * WebView/WebPreferences.mm:
     36        (+[WebPreferences initialize]):
     37        * WebView/WebResource.mm:
     38        (+[WebResourcePrivate initialize]):
     39        * WebView/WebTextIterator.mm:
     40        (+[WebTextIteratorPrivate initialize]):
     41        * WebView/WebView.mm:
     42        (+[WebView initialize]):
     43        * WebView/WebViewData.mm:
     44        (+[WebViewPrivate initialize]):
     45
    1462020-06-26  Wenson Hsieh  <wenson_hsieh@apple.com>
    247

  • trunk/Source/WebKitLegacy/mac/History/WebBackForwardList.mm

    r262878 r263575  
    100100#if !PLATFORM(IOS_FAMILY)
    101101    JSC::initializeThreading();
    102     RunLoop::initializeMain();
     102    WTF::initializeMainThread();
    103103#endif
    104104}

  • trunk/Source/WebKitLegacy/mac/History/WebHistoryItem.mm

    r262878 r263575  
    127127#if !PLATFORM(IOS_FAMILY)
    128128    JSC::initializeThreading();
    129     RunLoop::initializeMain();
     129    WTF::initializeMainThread();
    130130#endif
    131131}

  • trunk/Source/WebKitLegacy/mac/Misc/WebCache.mm

    r262878 r263575  
    6565#if !PLATFORM(IOS_FAMILY)
    6666    JSC::initializeThreading();
    67     RunLoop::initializeMain();
     67    WTF::initializeMainThread();
    6868#endif
    6969}

  • trunk/Source/WebKitLegacy/mac/Misc/WebElementDictionary.mm

    r262878 r263575  
    6969#if !PLATFORM(IOS_FAMILY)
    7070    JSC::initializeThreading();
    71     RunLoop::initializeMain();
     71    WTF::initializeMainThread();
    7272#endif
    7373}

  • trunk/Source/WebKitLegacy/mac/Misc/WebIconDatabase.mm

    r262878 r263575  
    9999{
    100100    JSC::initializeThreading();
    101     RunLoop::initializeMain();
     101    WTF::initializeMainThread();
    102102}
    103103

  • trunk/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm

    r262878 r263575  
    107107#if !PLATFORM(IOS_FAMILY)
    108108    JSC::initializeThreading();
    109     RunLoop::initializeMain();
     109    WTF::initializeMainThread();
    110110#endif
    111111    sendUserChangeNotifications();

  • trunk/Source/WebKitLegacy/mac/Plugins/WebBaseNetscapePluginView.mm

    r262878 r263575  
    7272{
    7373    JSC::initializeThreading();
    74     RunLoop::initializeMain();
     74    WTF::initializeMainThread();
    7575    WebKit::sendUserChangeNotifications();
    7676}

  • trunk/Source/WebKitLegacy/mac/Plugins/WebBasePluginPackage.mm

    r262878 r263575  
    6161#if !PLATFORM(IOS_FAMILY)
    6262    JSC::initializeThreading();
    63     RunLoop::initializeMain();
     63    WTF::initializeMainThread();
    6464#endif
    6565}

  • trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm

    r262878 r263575  
    164164{
    165165    JSC::initializeThreading();
    166     RunLoop::initializeMain();
     166    WTF::initializeMainThread();
    167167    sendUserChangeNotifications();
    168168}

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm

    r262878 r263575  
    140140#if !PLATFORM(IOS_FAMILY)
    141141    JSC::initializeThreading();
    142     RunLoop::initializeMain();
     142    WTF::initializeMainThread();
    143143#endif
    144144}

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r262878 r263575  
    23442344#if !PLATFORM(IOS_FAMILY)
    23452345    JSC::initializeThreading();
    2346     RunLoop::initializeMain();
     2346    WTF::initializeMainThread();
    23472347#endif
    23482348}

  • trunk/Source/WebKitLegacy/mac/WebView/WebArchive.mm

    r262878 r263575  
    7171#if !PLATFORM(IOS_FAMILY)
    7272    JSC::initializeThreading();
    73     RunLoop::initializeMain();
     73    WTF::initializeMainThread();
    7474#endif
    7575}

  • trunk/Source/WebKitLegacy/mac/WebView/WebDataSource.mm

    r262878 r263575  
    155155#if !PLATFORM(IOS_FAMILY)
    156156        JSC::initializeThreading();
    157         RunLoop::initializeMain();
     157        WTF::initializeMainThread();
    158158#endif
    159159    }

  • trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm

    r262878 r263575  
    10331033
    10341034    JSC::initializeThreading();
    1035     RunLoop::initializeMain();
     1035    WTF::initializeMainThread();
    10361036
    10371037    if (!oldSetCursorForMouseLocationIMP) {
    … …  
    25672567
    25682568    JSC::initializeThreading();
    2569     RunLoop::initializeMain();
     2569    WTF::initializeMainThread();
    25702570}
    25712571

  • trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm

    r263198 r263575  
    389389#if !PLATFORM(IOS_FAMILY)
    390390    JSC::initializeThreading();
    391     RunLoop::initializeMain();
     391    WTF::initializeMainThread();
    392392    bool attachmentElementEnabled = MacApplication::isAppleMail();
    393393    bool webSQLEnabled = false;

  • trunk/Source/WebKitLegacy/mac/WebView/WebResource.mm

    r262878 r263575  
    6969#if !PLATFORM(IOS_FAMILY)
    7070    JSC::initializeThreading();
    71     RunLoop::initializeMain();
     71    WTF::initializeMainThread();
    7272#endif
    7373}

  • trunk/Source/WebKitLegacy/mac/WebView/WebTextIterator.mm

    r262878 r263575  
    4949#if !PLATFORM(IOS_FAMILY)
    5050    JSC::initializeThreading();
    51     RunLoop::initializeMain();
     51    WTF::initializeMainThread();
    5252#endif
    5353}

  • trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

    r263567 r263575  
    55595559#if !PLATFORM(IOS_FAMILY)
    55605560    JSC::initializeThreading();
    5561     RunLoop::initializeMain();
     5561    WTF::initializeMainThread();
    55625562#endif
    55635563

  • trunk/Source/WebKitLegacy/mac/WebView/WebViewData.mm

    r262878 r263575  
    169169#if !PLATFORM(IOS_FAMILY)
    170170    JSC::initializeThreading();
    171     RunLoop::initializeMain();
     171    WTF::initializeMainThread();
    172172#endif
    173173}

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r263270 r263575  
     12020-06-26  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Initializing the main thread should initialize the main run loop
     4        https://bugs.webkit.org/show_bug.cgi?id=213637
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebView.cpp:
     9        (WebView::WebView):
     10
    1112020-06-19  Chris Dumez  <cdumez@apple.com>
    212

  • trunk/Source/WebKitLegacy/win/WebView.cpp

    r263270 r263575  
    422422{
    423423    JSC::initializeThreading();
    424     RunLoop::initializeMain();
     424    WTF::initializeMainThread();
    425425    WTF::setProcessPrivileges(allPrivileges());
    426426    WebCore::NetworkStorageSession::permitProcessToUseCookieAPI(true);

  • trunk/Tools/ChangeLog

    r263569 r263575  
     12020-06-26  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Initializing the main thread should initialize the main run loop
     4        https://bugs.webkit.org/show_bug.cgi?id=213637
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Updated TestWebKitAPI to stop using RunLoop::initializeMain directly.
     9
     10        * TestWebKitAPI/Tests/WTF/RefPtr.cpp:
     11        (TestWebKitAPI::TEST):
     12        * TestWebKitAPI/Tests/WTF/RunLoop.cpp:
     13        (TestWebKitAPI::TEST):
     14        * TestWebKitAPI/Tests/WebCore/AbortableTaskQueue.cpp:
     15        (TestWebKitAPI::TEST):
     16        * TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp:
     17        (ApplicationManifestParserTest::SetUp):
     18        * TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp:
     19        (TestWebKitAPI::ComplexTextControllerTest::SetUp):
     20        * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
     21        (TestWebKitAPI::ContentExtensionTest::SetUp):
     22        * TestWebKitAPI/Tests/WebCore/DNS.cpp:
     23        (TestWebKitAPI::TEST):
     24        * TestWebKitAPI/Tests/WebCore/FileMonitor.cpp:
     25        (TestWebKitAPI::TEST_F):
     26        * TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm:
     27        (initializeInAppBrowserPrivacyTestSettings):
     28        * TestWebKitAPI/TestsController.cpp:
     29        (TestWebKitAPI::TestsController::TestsController):
     30        * WebKitTestRunner/TestController.cpp:
     31        (TestController::initialize):
     32
    1332020-06-26  Jonathan Bedard  <jbedard@apple.com>
    234

  • trunk/Tools/TestWebKitAPI/Tests/WTF/RefPtr.cpp

    r262878 r263575  
    586586TEST(WTF_RefPtr, ReleaseInNonMainThreadDestroyInMainThread)
    587587{
    588     RunLoop::initializeMain();
     588    WTF::initializeMainThread();
    589589    done = false;
    590590    Thread::create("", [object = MainThreadSafeRefCountedObject::create()] { });

  • trunk/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp

    r262878 r263575  
    3737TEST(WTF_RunLoop, Deadlock)
    3838{
    39     RunLoop::initializeMain();
     39    WTF::initializeMainThread();
    4040
    4141    struct DispatchFromDestructorTester {
    … …  
    7777TEST(WTF_RunLoop, OneShotTimer)
    7878{
    79     RunLoop::initializeMain();
     79    WTF::initializeMainThread();
    8080
    8181    bool testFinished = false;
    … …  
    109109TEST(WTF_RunLoop, RepeatingTimer)
    110110{
    111     RunLoop::initializeMain();
     111    WTF::initializeMainThread();
    112112
    113113    bool testFinished = false;

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/AbortableTaskQueue.cpp

    r262878 r263575  
    4040    bool testFinished { false };
    4141    int currentStep { 0 };
    42     RunLoop::initializeMain();
     42    WTF::initializeMainThread();
    4343
    4444    auto backgroundThreadFunction = [&]() {
    … …  
    102102    bool destructedResponseFlag { false };
    103103    int currentStep { 0 };
    104     RunLoop::initializeMain();
     104    WTF::initializeMainThread();
    105105
    106106    auto backgroundThreadFunction = [&]() {
    … …  
    184184    AbortableTaskQueue taskQueue;
    185185    bool testFinished { false };
    186     RunLoop::initializeMain();
     186    WTF::initializeMainThread();
    187187
    188188    auto backgroundThreadFunction = [&]() {
    … …  
    241241    AbortableTaskQueue taskQueue;
    242242    bool testFinished { false };
    243     RunLoop::initializeMain();
     243    WTF::initializeMainThread();
    244244
    245245    auto backgroundThreadFunction = [&]() {
    … …  
    278278    int currentStep { 0 };
    279279    bool destructedResponseFlag { false };
    280     RunLoop::initializeMain();
     280    WTF::initializeMainThread();
    281281
    282282    auto backgroundThreadFunction = [&]() {

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp

    r262878 r263575  
    5858    {
    5959        JSC::initializeThreading();
    60         RunLoop::initializeMain();
     60        WTF::initializeMainThread();
    6161
    6262        m_manifestURL = { { }, "https://example.com/manifest.json" };

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp

    r262878 r263575  
    4141    {
    4242        JSC::initializeThreading();
    43         RunLoop::initializeMain();
     43        WTF::initializeMainThread();
    4444    }
    4545};

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp

    r262878 r263575  
    7777    {
    7878        JSC::initializeThreading();
    79         RunLoop::initializeMain();
     79        WTF::initializeMainThread();
    8080    }
    8181};

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/DNS.cpp

    r262878 r263575  
    4242TEST(DNSTest, cancelResolveDNS)
    4343{
    44     RunLoop::initializeMain();
     44    WTF::initializeMainThread();
    4545
    4646    const String hostname = String("www.webkit.org");
    … …  
    6464TEST(DNSTest, cannotResolveDNS)
    6565{
    66     RunLoop::initializeMain();
     66    WTF::initializeMainThread();
    6767
    6868    const String hostname = String("notavaliddomain.notavaliddomain");
    … …  
    8585TEST(DNSTest, resolveDNS)
    8686{
    87     RunLoop::initializeMain();
     87    WTF::initializeMainThread();
    8888
    8989    const String hostname = String("www.webkit.org");

  • trunk/Tools/TestWebKitAPI/Tests/WebCore/FileMonitor.cpp

    r262878 r263575  
    5353    void SetUp() override
    5454    {
    55         RunLoop::initializeMain();
     55        WTF::initializeMainThread();
    5656       
    5757        // create temp file
    … …  
    145145    EXPECT_TRUE(FileSystem::fileExists(tempFilePath()));
    146146
    147     RunLoop::initializeMain();
     147    WTF::initializeMainThread();
    148148
    149149    auto testQueue = WorkQueue::create("Test Work Queue");
    … …  
    187187    EXPECT_TRUE(FileSystem::fileExists(tempFilePath()));
    188188
    189     RunLoop::initializeMain();
     189    WTF::initializeMainThread();
    190190
    191191    auto testQueue = WorkQueue::create("Test Work Queue");
    … …  
    247247    EXPECT_TRUE(FileSystem::fileExists(tempFilePath()));
    248248
    249     RunLoop::initializeMain();
     249    WTF::initializeMainThread();
    250250
    251251    auto testQueue = WorkQueue::create("Test Work Queue");
    … …  
    286286    EXPECT_TRUE(FileSystem::fileExists(tempFilePath()));
    287287
    288     RunLoop::initializeMain();
     288    WTF::initializeMainThread();
    289289
    290290    auto testQueue = WorkQueue::create("Test Work Queue");
    … …  
    343343    EXPECT_TRUE(FileSystem::fileExists(tempFilePath()));
    344344
    345     RunLoop::initializeMain();
     345    WTF::initializeMainThread();
    346346
    347347    auto testQueue = WorkQueue::create("Test Work Queue");

  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm

    r262878 r263575  
    125125static void initializeInAppBrowserPrivacyTestSettings()
    126126{
    127     RunLoop::initializeMain();
     127    WTF::initializeMainThread();
    128128    WebCore::clearApplicationBundleIdentifierTestingOverride();
    129129    IN_APP_BROWSER_PRIVACY_ADDITIONS

  • trunk/Tools/TestWebKitAPI/TestsController.cpp

    r255695 r263575  
    7575    // We should make sure that all objects tested either initialize threading or inherit from
    7676    // ThreadSafeRefCounted so that we don't have to initialize threading at all here.
    77     WTF::initializeThreading();
    7877    WTF::initializeMainThread();
    7978    WTF::setProcessPrivileges(allPrivileges());

  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r263228 r263575  
    446446
    447447    JSC::initializeThreading();
    448     RunLoop::initializeMain();
     448    WTF::initializeMainThread();
    449449    WTF::setProcessPrivileges(allPrivileges());
    450450
Note: See TracChangeset for help on using the changeset viewer.