Changeset 261846 in webkit


Ignore:
Timestamp:
May 18, 2020 7:41:11 PM (4 years ago)
Author:
chris.reid@sony.com
Message:

[WinCairo] WKTR WebsiteDataStore is being overwritten by the default one
​https://bugs.webkit.org/show_bug.cgi?id=212044

Reviewed by Fujii Hironori.

Ensure TestController::defaultWebSiteDataStore is being used for WinCairo as done in r259705.

Also consolidate platformInitializeDataStore implementations with GTK/WPE since WinCairo WKTR
also started crashing since r261758.

  • WebKitTestRunner/TestController.cpp:
  • WebKitTestRunner/gtk/TestControllerGtk.cpp:
  • WebKitTestRunner/wpe/TestControllerWPE.cpp:
Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r261845 r261846  
     12020-05-18  Christopher Reid  <chris.reid@sony.com>
     2
     3        [WinCairo] WKTR WebsiteDataStore is being overwritten by the default one
     4        https://bugs.webkit.org/show_bug.cgi?id=212044
     5
     6        Reviewed by Fujii Hironori.
     7
     8        Ensure TestController::defaultWebSiteDataStore is being used for WinCairo as done in r259705.
     9
     10        Also consolidate platformInitializeDataStore implementations with GTK/WPE since WinCairo WKTR
     11        also started crashing since r261758.
     12
     13        * WebKitTestRunner/TestController.cpp:
     14        * WebKitTestRunner/gtk/TestControllerGtk.cpp:
     15        * WebKitTestRunner/wpe/TestControllerWPE.cpp:
     16
    1172020-05-18  Andy Estes  <aestes@apple.com>
    218

  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r261779 r261846  
    31173117}
    31183118
    3119 #if !PLATFORM(GTK) && !PLATFORM(WPE)
    3120 void TestController::platformInitializeDataStore(WKPageConfigurationRef configuration, const TestOptions&)
    3121 {
    3122     m_websiteDataStore = WKPageConfigurationGetWebsiteDataStore(configuration);
    3123 }
    3124 #endif
     3119void TestController::platformInitializeDataStore(WKPageConfigurationRef, const TestOptions&)
     3120{
     3121    m_websiteDataStore = defaultWebsiteDataStore();
     3122}
    31253123
    31263124void TestController::platformCreateWebView(WKPageConfigurationRef configuration, const TestOptions& options)
    … …  
    31363134WKContextRef TestController::platformAdjustContext(WKContextRef context, WKContextConfigurationRef contextConfiguration)
    31373135{
    3138 #if PLATFORM(GTK) || PLATFORM(WPE)
    31393136    WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(defaultWebsiteDataStore(), true);
    31403137    WKContextSetPrimaryWebsiteDataStore(context, defaultWebsiteDataStore());
    3141 #else
    3142     WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(WKContextGetWebsiteDataStore(context), true);
    3143 #endif
    31443138    return context;
    31453139}
    … …  
    32023196}
    32033197
    3204 #endif
     3198#endif // !PLATFORM(COCOA)
    32053199
    32063200struct ClearServiceWorkerRegistrationsCallbackContext {

  • trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp

    r261779 r261846  
    4545void TestController::platformInitialize()
    4646{
    47 }
    48 
    49 void TestController::platformInitializeDataStore(WKPageConfigurationRef, const TestOptions& options)
    50 {
    51     m_websiteDataStore = defaultWebsiteDataStore();
    5247}
    5348

  • trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp

    r261779 r261846  
    4444void TestController::platformInitialize()
    4545{
    46 }
    47 
    48 void TestController::platformInitializeDataStore(WKPageConfigurationRef, const TestOptions& options)
    49 {
    50     m_websiteDataStore = defaultWebsiteDataStore();
    5146}
    5247
Note: See TracChangeset for help on using the changeset viewer.