Rename TestOptions.ignoreSynchronousMessagingTimeoutsForTesting
authorwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Feb 2019 04:26:54 +0000 (04:26 +0000)
committerwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Feb 2019 04:26:54 +0000 (04:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=194324

Reviewed by Andy Estes.

Tools:

Rename ignoreSynchronousMessagingTimeoutsForTesting to just ignoreSynchronousMessagingTimeouts. The -ForTesting
part of the name is already implicit, since this is in testing code in TestOptions.

* WebKitTestRunner/TestController.cpp:
(WTR::TestController::generateContextConfiguration const):
(WTR::updateTestOptionsFromTestHeader):
* WebKitTestRunner/TestOptions.h:
(WTR::TestOptions::hasSameInitializationOptions const):

LayoutTests:

* fast/events/touch/ios/show-modal-alert-during-touch-start.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241009 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/events/touch/ios/show-modal-alert-during-touch-start.html
Tools/ChangeLog
Tools/WebKitTestRunner/TestController.cpp
Tools/WebKitTestRunner/TestOptions.h

index 74908a7..ac34beb 100644 (file)
@@ -1,3 +1,12 @@
+2019-02-05  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Rename TestOptions.ignoreSynchronousMessagingTimeoutsForTesting
+        https://bugs.webkit.org/show_bug.cgi?id=194324
+
+        Reviewed by Andy Estes.
+
+        * fast/events/touch/ios/show-modal-alert-during-touch-start.html:
+
 2019-02-05  Nikita Vasilyev  <nvasilyev@apple.com>
 
         Web Inspector: Fix modify-css-property-race.html test failures
index 9b3abc0..0032817 100644 (file)
@@ -1,4 +1,4 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true, ignoreSynchronousMessagingTimeoutsForTesting=true ] -->
+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true, ignoreSynchronousMessagingTimeouts=true ] -->
 <html>
 <head>
 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
index 5e72be5..aa37c3d 100644 (file)
@@ -1,3 +1,19 @@
+2019-02-05  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Rename TestOptions.ignoreSynchronousMessagingTimeoutsForTesting
+        https://bugs.webkit.org/show_bug.cgi?id=194324
+
+        Reviewed by Andy Estes.
+
+        Rename ignoreSynchronousMessagingTimeoutsForTesting to just ignoreSynchronousMessagingTimeouts. The -ForTesting
+        part of the name is already implicit, since this is in testing code in TestOptions.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::generateContextConfiguration const):
+        (WTR::updateTestOptionsFromTestHeader):
+        * WebKitTestRunner/TestOptions.h:
+        (WTR::TestOptions::hasSameInitializationOptions const):
+
 2019-02-05  Aakash Jain  <aakash_jain@apple.com>
 
         [ews-build] Allow * as platform for builders and workers
index 172e809..4cc4ccc 100644 (file)
@@ -458,7 +458,7 @@ WKRetainPtr<WKContextConfigurationRef> TestController::generateContextConfigurat
     auto configuration = adoptWK(WKContextConfigurationCreate());
     WKContextConfigurationSetInjectedBundlePath(configuration.get(), injectedBundlePath());
     WKContextConfigurationSetFullySynchronousModeIsAllowedForTesting(configuration.get(), true);
-    WKContextConfigurationSetIgnoreSynchronousMessagingTimeoutsForTesting(configuration.get(), options.ignoreSynchronousMessagingTimeoutsForTesting);
+    WKContextConfigurationSetIgnoreSynchronousMessagingTimeoutsForTesting(configuration.get(), options.ignoreSynchronousMessagingTimeouts);
 
     if (const char* dumpRenderTreeTemp = libraryPathForTesting()) {
         String temporaryFolder = String::fromUTF8(dumpRenderTreeTemp);
@@ -1286,8 +1286,8 @@ static void updateTestOptionsFromTestHeader(TestOptions& testOptions, const std:
             testOptions.enableUndoManagerAPI = parseBooleanTestHeaderValue(value);
         else if (key == "contentInset.top")
             testOptions.contentInsetTop = std::stod(value);
-        else if (key == "ignoreSynchronousMessagingTimeoutsForTesting")
-            testOptions.ignoreSynchronousMessagingTimeoutsForTesting = parseBooleanTestHeaderValue(value);
+        else if (key == "ignoreSynchronousMessagingTimeouts")
+            testOptions.ignoreSynchronousMessagingTimeouts = parseBooleanTestHeaderValue(value);
         pairStart = pairEnd + 1;
     }
 }
index f91dd50..0ac586e 100644 (file)
@@ -68,7 +68,7 @@ struct TestOptions {
     bool enableEditableImages { false };
     bool editable { false };
     bool enableUndoManagerAPI { false };
-    bool ignoreSynchronousMessagingTimeoutsForTesting { false };
+    bool ignoreSynchronousMessagingTimeouts { false };
 
     double contentInsetTop { 0 };
 
@@ -118,7 +118,7 @@ struct TestOptions {
             || editable != options.editable
             || enableUndoManagerAPI != options.enableUndoManagerAPI
             || contentInsetTop != options.contentInsetTop
-            || ignoreSynchronousMessagingTimeoutsForTesting != options.ignoreSynchronousMessagingTimeoutsForTesting)
+            || ignoreSynchronousMessagingTimeouts != options.ignoreSynchronousMessagingTimeouts)
             return false;
 
         if (experimentalFeatures != options.experimentalFeatures)