Title: [269324] trunk/Tools
Revision
269324
Author
hironori.fu...@sony.com
Date
2020-11-03 11:54:44 -0800 (Tue, 03 Nov 2020)

Log Message

WebKitTestRunner --show-webview doesn't work since r268238
https://bugs.webkit.org/show_bug.cgi?id=218430

Reviewed by Simon Fraser.

* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize): Use insert_or_assign() of
std::unordered_map instead of insert() which does nothing if the
key already exists.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (269323 => 269324)


--- trunk/Tools/ChangeLog	2020-11-03 19:38:41 UTC (rev 269323)
+++ trunk/Tools/ChangeLog	2020-11-03 19:54:44 UTC (rev 269324)
@@ -1,3 +1,15 @@
+2020-11-03  Fujii Hironori  <hironori.fu...@sony.com>
+
+        WebKitTestRunner --show-webview doesn't work since r268238
+        https://bugs.webkit.org/show_bug.cgi?id=218430
+
+        Reviewed by Simon Fraser.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::initialize): Use insert_or_assign() of
+        std::unordered_map instead of insert() which does nothing if the
+        key already exists.
+
 2020-11-03  Keith Rollin  <krol...@apple.com>
 
         Extend check-for-inappropriate-files-in-framework to WebKitLegacy and _javascript_Core

Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (269323 => 269324)


--- trunk/Tools/WebKitTestRunner/TestController.cpp	2020-11-03 19:38:41 UTC (rev 269323)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp	2020-11-03 19:54:44 UTC (rev 269324)
@@ -472,10 +472,10 @@
     m_globalFeatures = TestOptions::defaults();
     m_globalFeatures.internalDebugFeatures = options.internalFeatures;
     m_globalFeatures.experimentalFeatures = options.experimentalFeatures;
-    m_globalFeatures.boolWebPreferenceFeatures.insert({ "AcceleratedDrawingEnabled", options.shouldUseAcceleratedDrawing });
-    m_globalFeatures.boolTestRunnerFeatures.insert({ "useRemoteLayerTree", options.shouldUseRemoteLayerTree });
-    m_globalFeatures.boolTestRunnerFeatures.insert({ "shouldShowWebView", options.shouldShowWebView });
-    m_globalFeatures.boolTestRunnerFeatures.insert({ "shouldShowTouches", options.shouldShowTouches });
+    m_globalFeatures.boolWebPreferenceFeatures.insert_or_assign("AcceleratedDrawingEnabled", options.shouldUseAcceleratedDrawing);
+    m_globalFeatures.boolTestRunnerFeatures.insert_or_assign("useRemoteLayerTree", options.shouldUseRemoteLayerTree);
+    m_globalFeatures.boolTestRunnerFeatures.insert_or_assign("shouldShowWebView", options.shouldShowWebView);
+    m_globalFeatures.boolTestRunnerFeatures.insert_or_assign("shouldShowTouches", options.shouldShowTouches);
 
 #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
     m_accessibilityIsolatedTreeMode = options.accessibilityIsolatedTreeMode;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to