<!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>[211727] branches/safari-603-branch</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/211727">211727</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-06 09:07:24 -0800 (Mon, 06 Feb 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211653">r211653</a>. rdar://problem/29872943</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformiossimulatorTestExpectations">branches/safari-603-branch/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorepageEventHandlercpp">branches/safari-603-branch/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorepageValidationMessageClienth">branches/safari-603-branch/Source/WebCore/page/ValidationMessageClient.h</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacChangeLog">branches/safari-603-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebCoreSupportWebValidationMessageClienth">branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.h</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebCoreSupportWebValidationMessageClientmm">branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessWebCoreSupportWebValidationMessageClientcpp">branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessWebCoreSupportWebValidationMessageClienth">branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfastformsvalidationbubbleescapekeydismissexpectedtxt">branches/safari-603-branch/LayoutTests/fast/forms/validation-bubble-escape-key-dismiss-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastformsvalidationbubbleescapekeydismisshtml">branches/safari-603-branch/LayoutTests/fast/forms/validation-bubble-escape-key-dismiss.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (211726 => 211727)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog        2017-02-06 16:54:31 UTC (rev 211726)
+++ branches/safari-603-branch/LayoutTests/ChangeLog        2017-02-06 17:07:24 UTC (rev 211727)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-02-06  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Merge r211653. rdar://problem/29872943
+
+    2017-02-03  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+            Dismiss HTML form validation popover when pressing Escape key
+            https://bugs.webkit.org/show_bug.cgi?id=167716
+            &lt;rdar://problem/29872943&gt;
+
+            Reviewed by Simon Fraser.
+
+            Add layout test coverage.
+
+            * fast/forms/validation-bubble-escape-key-dismiss-expected.txt: Added.
+            * fast/forms/validation-bubble-escape-key-dismiss.html: Added.
+            * platform/ios-simulator/TestExpectations:
+
</ins><span class="cx"> 2017-02-05  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r211523. rdar://problem/29453068
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastformsvalidationbubbleescapekeydismissexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/forms/validation-bubble-escape-key-dismiss-expected.txt (0 => 211727)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/forms/validation-bubble-escape-key-dismiss-expected.txt                                (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/forms/validation-bubble-escape-key-dismiss-expected.txt        2017-02-06 17:07:24 UTC (rev 211727)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Required text input: 
+Tests that the HTML form validation bubble gets dismissed when pressing the Escape key.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+PASS validationBubbleContents.message is &quot;Fill out this field&quot;
+PASS validationBubbleContents.message is &quot;&quot;
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastformsvalidationbubbleescapekeydismisshtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/forms/validation-bubble-escape-key-dismiss.html (0 => 211727)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/forms/validation-bubble-escape-key-dismiss.html                                (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/forms/validation-bubble-escape-key-dismiss.html        2017-02-06 17:07:24 UTC (rev 211727)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body&gt;
+&lt;script src=&quot;../../resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;form&gt;
+  Required text input: &lt;input type=&quot;text&quot; id=&quot;required_text_input&quot; required&gt;&lt;input id=&quot;required_text_input_submit&quot; type=&quot;submit&quot;&gt;
+&lt;/form&gt;
+&lt;div id=&quot;description&quot;&gt;&lt;/div&gt;
+&lt;div id=&quot;console&quot;&gt;&lt;/div&gt;
+&lt;script&gt;
+description(&quot;Tests that the HTML form validation bubble gets dismissed when pressing the Escape key.&quot;);
+jsTestIsAsync = true;
+
+function getValidationBubbleContents()
+{
+    return `
+    (function() {
+        return JSON.stringify(uiController.contentsOfUserInterfaceItem('validationBubble'));
+    })();`
+}
+
+onload = function() {
+    input = document.getElementById(&quot;required_text_input&quot;);
+    submit = document.getElementById(&quot;required_text_input_submit&quot;);
+    submit.click();
+
+    testRunner.runUIScript(getValidationBubbleContents(), function(result) {
+        validationBubbleContents = JSON.parse(result).validationBubble;
+        shouldBeEqualToString(&quot;validationBubbleContents.message&quot;, &quot;Fill out this field&quot;);
+
+        // Press Escape key.
+        eventSender.keyDown(&quot;escape&quot;);
+
+        testRunner.runUIScript(getValidationBubbleContents(), function(result) {
+            validationBubbleContents = JSON.parse(result).validationBubble;
+            shouldBeEqualToString(&quot;validationBubbleContents.message&quot;, &quot;&quot;); // No longer visible.
+            finishJSTest();
+        });
+    });
+}
+&lt;/script&gt;
+&lt;script src=&quot;../../resources/js-test-post.js&quot;&gt;&lt;/script&gt;
+&lt;/body&gt;
+&lt;html&gt;
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/ios-simulator/TestExpectations (211726 => 211727)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/ios-simulator/TestExpectations        2017-02-06 16:54:31 UTC (rev 211726)
+++ branches/safari-603-branch/LayoutTests/platform/ios-simulator/TestExpectations        2017-02-06 17:07:24 UTC (rev 211727)
</span><span class="lines">@@ -350,6 +350,7 @@
</span><span class="cx"> 
</span><span class="cx"> # This test relies on EventSender.keydown(), which is not supported on iOS
</span><span class="cx"> webkit.org/b/155233 fast/events/max-tabindex-focus.html [ Skip ]
</span><ins>+fast/forms/validation-bubble-escape-key-dismiss.html [ Skip ]
</ins><span class="cx"> fast/forms/validation-message-maxLength.html [ Skip ]
</span><span class="cx"> fast/shadow-dom/shadow-host-removal-crash.html [ Skip ]
</span><span class="cx"> fast/shadow-dom/input-element-in-shadow.html [ Skip ]
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (211726 => 211727)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog        2017-02-06 16:54:31 UTC (rev 211726)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog        2017-02-06 17:07:24 UTC (rev 211727)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-02-06  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Merge r211653. rdar://problem/29872943
+
+    2017-02-03  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+            Dismiss HTML form validation popover when pressing Escape key
+            https://bugs.webkit.org/show_bug.cgi?id=167716
+            &lt;rdar://problem/29872943&gt;
+
+            Reviewed by Simon Fraser.
+
+            Dismiss any visible HTML form validation popover when pressing
+            the Escape key.
+
+            Test: fast/forms/validation-bubble-escape-key-dismiss.html
+
+            * page/EventHandler.cpp:
+            (WebCore::EventHandler::keyEvent):
+            * page/ValidationMessageClient.h:
+
</ins><span class="cx"> 2017-02-05  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r211504. rdar://problem/30301117
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/EventHandler.cpp (211726 => 211727)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/EventHandler.cpp        2017-02-06 16:54:31 UTC (rev 211726)
+++ branches/safari-603-branch/Source/WebCore/page/EventHandler.cpp        2017-02-06 17:07:24 UTC (rev 211727)
</span><span class="lines">@@ -92,6 +92,7 @@
</span><span class="cx"> #include &quot;TextIterator.h&quot;
</span><span class="cx"> #include &quot;UserGestureIndicator.h&quot;
</span><span class="cx"> #include &quot;UserTypingGestureIndicator.h&quot;
</span><ins>+#include &quot;ValidationMessageClient.h&quot;
</ins><span class="cx"> #include &quot;VisibleUnits.h&quot;
</span><span class="cx"> #include &quot;WheelEvent.h&quot;
</span><span class="cx"> #include &quot;WindowsKeyboardCodes.h&quot;
</span><span class="lines">@@ -3114,6 +3115,13 @@
</span><span class="cx">     }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+    if (initialKeyEvent.type() == PlatformEvent::KeyDown &amp;&amp; initialKeyEvent.windowsVirtualKeyCode() == VK_ESCAPE) {
+        if (auto* page = m_frame.page()) {
+            if (auto* validationMessageClient = page-&gt;validationMessageClient())
+                validationMessageClient-&gt;hideAnyValidationMessage();
+        }
+    }
+
</ins><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx">     if (m_frame.document()-&gt;webkitIsFullScreen()) {
</span><span class="cx">         if (initialKeyEvent.type() == PlatformEvent::KeyDown &amp;&amp; initialKeyEvent.windowsVirtualKeyCode() == VK_ESCAPE) {
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepageValidationMessageClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/ValidationMessageClient.h (211726 => 211727)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/ValidationMessageClient.h        2017-02-06 16:54:31 UTC (rev 211726)
+++ branches/safari-603-branch/Source/WebCore/page/ValidationMessageClient.h        2017-02-06 17:07:24 UTC (rev 211727)
</span><span class="lines">@@ -45,6 +45,9 @@
</span><span class="cx">     // anchor is already visible.
</span><span class="cx">     virtual void hideValidationMessage(const Element&amp; anchor) = 0;
</span><span class="cx"> 
</span><ins>+    // Hide any validation message currently displayed.
+    virtual void hideAnyValidationMessage() = 0;
+
</ins><span class="cx">     // Returns true if the validation message for the specified anchor element
</span><span class="cx">     // is visible.
</span><span class="cx">     virtual bool isValidationMessageVisible(const Element&amp; anchor) = 0;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (211726 => 211727)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/ChangeLog        2017-02-06 16:54:31 UTC (rev 211726)
+++ branches/safari-603-branch/Source/WebKit/mac/ChangeLog        2017-02-06 17:07:24 UTC (rev 211727)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-02-06  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Merge r211653. rdar://problem/29872943
+
+    2017-02-03  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+            Dismiss HTML form validation popover when pressing Escape key
+            https://bugs.webkit.org/show_bug.cgi?id=167716
+            &lt;rdar://problem/29872943&gt;
+
+            Reviewed by Simon Fraser.
+
+            Override ValidationMessageClient::hideAnyValidationMessage().
+
+            * WebCoreSupport/WebValidationMessageClient.h:
+            * WebCoreSupport/WebValidationMessageClient.mm:
+            (WebValidationMessageClient::hideAnyValidationMessage):
+
</ins><span class="cx"> 2017-02-05  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r211569. rdar://problem/30229990
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebCoreSupportWebValidationMessageClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.h (211726 => 211727)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.h        2017-02-06 16:54:31 UTC (rev 211726)
+++ branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.h        2017-02-06 17:07:24 UTC (rev 211727)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx">     void documentDetached(WebCore::Document&amp;) final;
</span><span class="cx">     void showValidationMessage(const WebCore::Element&amp; anchor, const String&amp; message) final;
</span><span class="cx">     void hideValidationMessage(const WebCore::Element&amp; anchor) final;
</span><ins>+    void hideAnyValidationMessage() final;
</ins><span class="cx">     bool isValidationMessageVisible(const WebCore::Element&amp; anchor) final;
</span><span class="cx">     void updateValidationBubbleStateIfNeeded() final;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebCoreSupportWebValidationMessageClientmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.mm (211726 => 211727)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.mm        2017-02-06 16:54:31 UTC (rev 211726)
+++ branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.mm        2017-02-06 17:07:24 UTC (rev 211727)
</span><span class="lines">@@ -70,6 +70,16 @@
</span><span class="cx">     [m_view hideFormValidationMessage];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void WebValidationMessageClient::hideAnyValidationMessage()
+{
+    if (!m_currentAnchor)
+        return;
+
+    m_currentAnchor = nullptr;
+    m_currentAnchorRect = { };
+    [m_view hideFormValidationMessage];
+}
+
</ins><span class="cx"> bool WebValidationMessageClient::isValidationMessageVisible(const Element&amp; anchor)
</span><span class="cx"> {
</span><span class="cx">     return m_currentAnchor == &amp;anchor;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211726 => 211727)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog        2017-02-06 16:54:31 UTC (rev 211726)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog        2017-02-06 17:07:24 UTC (rev 211727)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-02-06  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Merge r211653. rdar://problem/29872943
+
+    2017-02-03  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+            Dismiss HTML form validation popover when pressing Escape key
+            https://bugs.webkit.org/show_bug.cgi?id=167716
+            &lt;rdar://problem/29872943&gt;
+
+            Reviewed by Simon Fraser.
+
+            Override ValidationMessageClient::hideAnyValidationMessage().
+
+            * WebProcess/WebCoreSupport/WebValidationMessageClient.cpp:
+            (WebKit::WebValidationMessageClient::hideAnyValidationMessage):
+            * WebProcess/WebCoreSupport/WebValidationMessageClient.h:
+
</ins><span class="cx"> 2017-02-05  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r211482. rdar://problem/29711409
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebCoreSupportWebValidationMessageClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.cpp (211726 => 211727)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.cpp        2017-02-06 16:54:31 UTC (rev 211726)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.cpp        2017-02-06 17:07:24 UTC (rev 211727)
</span><span class="lines">@@ -74,6 +74,16 @@
</span><span class="cx">     m_page.send(Messages::WebPageProxy::HideValidationMessage());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void WebValidationMessageClient::hideAnyValidationMessage()
+{
+    if (!m_currentAnchor)
+        return;
+
+    m_currentAnchor = nullptr;
+    m_currentAnchorRect = { };
+    m_page.send(Messages::WebPageProxy::HideValidationMessage());
+}
+
</ins><span class="cx"> bool WebValidationMessageClient::isValidationMessageVisible(const Element&amp; anchor)
</span><span class="cx"> {
</span><span class="cx">     return m_currentAnchor == &amp;anchor;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebCoreSupportWebValidationMessageClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.h (211726 => 211727)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.h        2017-02-06 16:54:31 UTC (rev 211726)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.h        2017-02-06 17:07:24 UTC (rev 211727)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx">     void documentDetached(WebCore::Document&amp;) final;
</span><span class="cx">     void showValidationMessage(const WebCore::Element&amp; anchor, const String&amp; message) final;
</span><span class="cx">     void hideValidationMessage(const WebCore::Element&amp; anchor) final;
</span><ins>+    void hideAnyValidationMessage() final;
</ins><span class="cx">     bool isValidationMessageVisible(const WebCore::Element&amp; anchor) final;
</span><span class="cx">     void updateValidationBubbleStateIfNeeded() final;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>