<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[243657] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/243657">243657</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2019-03-29 13:11:54 -0700 (Fri, 29 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/243523">r243523</a>): Six form-related watchOS layout tests are timing out
https://bugs.webkit.org/show_bug.cgi?id=196405
<rdar://problem/49428130>

Reviewed by Wenson Hsieh.

Tools:

Add a shouldPresentPopovers=false WebKitTestRunner option to cause WKTR to swizzle
the popover presentation methods to be no-ops. Use this in the new test added in
<a href="http://trac.webkit.org/projects/webkit/changeset/243523">r243523</a> so that we do not swizzle those methods for all tests. This is needed because
those WatchOS tests rely on the popover getting presented and interactive.

* WebKitTestRunner/TestController.cpp:
(WTR::updateTestOptionsFromTestHeader):
* WebKitTestRunner/TestController.h:
* WebKitTestRunner/TestOptions.h:
(WTR::TestOptions::hasSameInitializationOptions const):
* WebKitTestRunner/ios/TestControllerIOS.mm:
(WTR::TestController::platformInitialize):
(WTR::TestController::platformResetStateToConsistentValues):

LayoutTests:

* fast/forms/ios/file-upload-panel.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastformsiosfileuploadpanelhtml">trunk/LayoutTests/fast/forms/ios/file-upload-panel.html</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllerh">trunk/Tools/WebKitTestRunner/TestController.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestOptionsh">trunk/Tools/WebKitTestRunner/TestOptions.h</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosTestControllerIOSmm">trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (243656 => 243657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-03-29 20:09:02 UTC (rev 243656)
+++ trunk/LayoutTests/ChangeLog 2019-03-29 20:11:54 UTC (rev 243657)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2019-03-29  Chris Dumez  <cdumez@apple.com>
+
+        REGRESSION (r243523): Six form-related watchOS layout tests are timing out
+        https://bugs.webkit.org/show_bug.cgi?id=196405
+        <rdar://problem/49428130>
+
+        Reviewed by Wenson Hsieh.
+
+        * fast/forms/ios/file-upload-panel.html:
+
</ins><span class="cx"> 2019-03-29  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r243250): Text interactions are no longer suppressed when editing in some websites
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsiosfileuploadpanelhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/ios/file-upload-panel.html (243656 => 243657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/ios/file-upload-panel.html  2019-03-29 20:09:02 UTC (rev 243656)
+++ trunk/LayoutTests/fast/forms/ios/file-upload-panel.html     2019-03-29 20:11:54 UTC (rev 243657)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true, shouldHandleRunOpenPanel=false ] -->
</del><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true, shouldHandleRunOpenPanel=false, shouldPresentPopovers=false ] -->
</ins><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <meta name="viewport" content="width=device-width">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (243656 => 243657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-03-29 20:09:02 UTC (rev 243656)
+++ trunk/Tools/ChangeLog       2019-03-29 20:11:54 UTC (rev 243657)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2019-03-29  Chris Dumez  <cdumez@apple.com>
+
+        REGRESSION (r243523): Six form-related watchOS layout tests are timing out
+        https://bugs.webkit.org/show_bug.cgi?id=196405
+        <rdar://problem/49428130>
+
+        Reviewed by Wenson Hsieh.
+
+        Add a shouldPresentPopovers=false WebKitTestRunner option to cause WKTR to swizzle
+        the popover presentation methods to be no-ops. Use this in the new test added in
+        r243523 so that we do not swizzle those methods for all tests. This is needed because
+        those WatchOS tests rely on the popover getting presented and interactive.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::updateTestOptionsFromTestHeader):
+        * WebKitTestRunner/TestController.h:
+        * WebKitTestRunner/TestOptions.h:
+        (WTR::TestOptions::hasSameInitializationOptions const):
+        * WebKitTestRunner/ios/TestControllerIOS.mm:
+        (WTR::TestController::platformInitialize):
+        (WTR::TestController::platformResetStateToConsistentValues):
+
</ins><span class="cx"> 2019-03-29  Takashi Komori  <Takashi.Komori@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [Curl] Add Server Trust Evaluation Support.
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (243656 => 243657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp  2019-03-29 20:09:02 UTC (rev 243656)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp     2019-03-29 20:11:54 UTC (rev 243657)
</span><span class="lines">@@ -1346,6 +1346,8 @@
</span><span class="cx">             testOptions.enableUndoManagerAPI = parseBooleanTestHeaderValue(value);
</span><span class="cx">         else if (key == "shouldHandleRunOpenPanel")
</span><span class="cx">             testOptions.shouldHandleRunOpenPanel = parseBooleanTestHeaderValue(value);
</span><ins>+        else if (key == "shouldPresentPopovers")
+            testOptions.shouldPresentPopovers = parseBooleanTestHeaderValue(value);
</ins><span class="cx">         else if (key == "contentInset.top")
</span><span class="cx">             testOptions.contentInsetTop = std::stod(value);
</span><span class="cx">         else if (key == "ignoreSynchronousMessagingTimeouts")
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.h (243656 => 243657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.h    2019-03-29 20:09:02 UTC (rev 243656)
+++ trunk/Tools/WebKitTestRunner/TestController.h       2019-03-29 20:11:54 UTC (rev 243657)
</span><span class="lines">@@ -489,6 +489,7 @@
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><span class="cx">     Vector<std::unique_ptr<InstanceMethodSwizzler>> m_inputModeSwizzlers;
</span><span class="cx">     RetainPtr<UIKeyboardInputMode> m_overriddenKeyboardInputMode;
</span><ins>+    Vector<std::unique_ptr<InstanceMethodSwizzler>> m_presentPopoverSwizzlers;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     enum State {
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestOptions.h (243656 => 243657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestOptions.h       2019-03-29 20:09:02 UTC (rev 243656)
+++ trunk/Tools/WebKitTestRunner/TestOptions.h  2019-03-29 20:11:54 UTC (rev 243657)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx">     bool editable { false };
</span><span class="cx">     bool enableUndoManagerAPI { false };
</span><span class="cx">     bool shouldHandleRunOpenPanel { true };
</span><ins>+    bool shouldPresentPopovers { true };
</ins><span class="cx"> 
</span><span class="cx">     double contentInsetTop { 0 };
</span><span class="cx"> 
</span><span class="lines">@@ -138,6 +139,7 @@
</span><span class="cx">             || editable != options.editable
</span><span class="cx">             || enableUndoManagerAPI != options.enableUndoManagerAPI
</span><span class="cx">             || shouldHandleRunOpenPanel != options.shouldHandleRunOpenPanel
</span><ins>+            || shouldPresentPopovers != options.shouldPresentPopovers
</ins><span class="cx">             || contentInsetTop != options.contentInsetTop)
</span><span class="cx">             return false;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosTestControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (243656 => 243657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm    2019-03-29 20:09:02 UTC (rev 243656)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm       2019-03-29 20:11:54 UTC (rev 243657)
</span><span class="lines">@@ -100,9 +100,6 @@
</span><span class="cx">     // Override the implementation of +[UIKeyboard isInHardwareKeyboardMode] to ensure that test runs are deterministic
</span><span class="cx">     // regardless of whether a hardware keyboard is attached. We intentionally never restore the original implementation.
</span><span class="cx">     method_setImplementation(class_getClassMethod([UIKeyboard class], @selector(isInHardwareKeyboardMode)), reinterpret_cast<IMP>(overrideIsInHardwareKeyboardMode));
</span><del>-
-    method_setImplementation(class_getInstanceMethod([UIViewController class], @selector(presentViewController:animated:completion:)), reinterpret_cast<IMP>(overridePresentViewControllerOrPopover));
-    method_setImplementation(class_getInstanceMethod([UIPopoverController class], @selector(presentPopoverFromRect:inView:permittedArrowDirections:animated:)), reinterpret_cast<IMP>(overridePresentViewControllerOrPopover));
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void TestController::platformDestroy()
</span><span class="lines">@@ -147,6 +144,12 @@
</span><span class="cx"> 
</span><span class="cx">     m_inputModeSwizzlers.clear();
</span><span class="cx">     m_overriddenKeyboardInputMode = nil;
</span><ins>+
+    m_presentPopoverSwizzlers.clear();
+    if (!options.shouldPresentPopovers) {
+        m_presentPopoverSwizzlers.append(std::make_unique<InstanceMethodSwizzler>([UIViewController class], @selector(presentViewController:animated:completion:), reinterpret_cast<IMP>(overridePresentViewControllerOrPopover)));
+        m_presentPopoverSwizzlers.append(std::make_unique<InstanceMethodSwizzler>([UIPopoverController class], @selector(presentPopoverFromRect:inView:permittedArrowDirections:animated:), reinterpret_cast<IMP>(overridePresentViewControllerOrPopover)));
+    }
</ins><span class="cx">     
</span><span class="cx">     BOOL shouldRestoreFirstResponder = NO;
</span><span class="cx">     if (PlatformWebView* platformWebView = mainWebView()) {
</span></span></pre>
</div>
</div>

</body>
</html>