Correct '--show-webview' option for Tiled Drawing tests

https://bugs.webkit.org/show_bug.cgi?id=144621

Reviewed by Simon Fraser.

The scrolling thread/tiled drawing tests recreate the standard test runner web view. My earlier patch did not make
sure that the state of the '--show-webview' option was propagated to this additional view creation routine.

* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::platformConfigureViewForTest): Include the value of the 'shouldShowWebView' state in the
WKMutableDictionary passed to the 'ensureViewSupportsOptions' method.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 82dd5513d0d1126c5ba80a870edf9b333dc058db..1cfa6cefe4f4381f75581f32f70bf3b8d2ac1c2d 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2015-05-04  Brent Fulgham  <bfulgham@apple.com>
+
+        Correct '--show-webview' option for Tiled Drawing tests
+        https://bugs.webkit.org/show_bug.cgi?id=144621
+
+        Reviewed by Simon Fraser.
+
+        The scrolling thread/tiled drawing tests recreate the standard test runner web view. My earlier patch did not make
+        sure that the state of the '--show-webview' option was propagated to this additional view creation routine.
+
+        * WebKitTestRunner/mac/TestControllerMac.mm:
+        (WTR::TestController::platformConfigureViewForTest): Include the value of the 'shouldShowWebView' state in the
+        WKMutableDictionary passed to the 'ensureViewSupportsOptions' method.
+
 2015-05-04  Filip Pizlo  <fpizlo@apple.com>
 
         Large array shouldn't be slow

diff --git a/Tools/WebKitTestRunner/mac/TestControllerMac.mm b/Tools/WebKitTestRunner/mac/TestControllerMac.mm
index 2aa96edab6829794ddf58df6328c6b3ccc91ad3f..eda456fc8fbce84e580e2053da01617d7c2f7efb 100644 (file)
--- a/Tools/WebKitTestRunner/mac/TestControllerMac.mm
+++ b/Tools/WebKitTestRunner/mac/TestControllerMac.mm
@@ -107,6 +107,10 @@ void TestController::platformConfigureViewForTest(const TestInvocation& test)
     auto useRemoteLayerTreeValue = adoptWK(WKBooleanCreate(shouldUseRemoteLayerTree()));
     WKDictionarySetItem(viewOptions.get(), useRemoteLayerTreeKey.get(), useRemoteLayerTreeValue.get());
 
+    auto shouldShowWebViewKey = adoptWK(WKStringCreateWithUTF8CString("ShouldShowWebView"));
+    auto shouldShowWebViewValue = adoptWK(WKBooleanCreate(shouldShowWebView()));
+    WKDictionarySetItem(viewOptions.get(), shouldShowWebViewKey.get(), shouldShowWebViewValue.get());
+
     ensureViewSupportsOptions(viewOptions.get());
 
     if (!test.urlContains("contentextensions/"))