<!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>[210961] 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/210961">210961</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-20 08:25:48 -0800 (Fri, 20 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210939">r210939</a>. rdar://problem/29885052</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoredomDocumentcpp">branches/safari-603-branch/Source/WebCore/dom/Document.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="#branchessafari603branchLayoutTestsfastformsresourcesformvalidationiframehtml">branches/safari-603-branch/LayoutTests/fast/forms/resources/form-validation-iframe.html</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastformsvalidationmessagedetachediframeexpectedtxt">branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastformsvalidationmessagedetachediframehtml">branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe.html</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastformsvalidationmessagedetachediframe2expectedtxt">branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe2-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastformsvalidationmessagedetachediframe2html">branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe2.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 (210960 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-20 16:25:41 UTC (rev 210960)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r210939. rdar://problem/29885052
+
+ 2017-01-19 Chris Dumez <cdumez@apple.com>
+
+ Make sure HTML validation bubble gets dismissed when its associated element's frame gets detached
+ https://bugs.webkit.org/show_bug.cgi?id=167215
+ <rdar://problem/29885052>
+
+ Reviewed by Andreas Kling.
+
+ Add layout test coverage.
+
+ * fast/forms/resources/form-validation-iframe.html: Added.
+ * fast/forms/validation-message-detached-iframe-expected.txt: Added.
+ * fast/forms/validation-message-detached-iframe.html: Added.
+ * fast/forms/validation-message-detached-iframe2-expected.txt: Added.
+ * fast/forms/validation-message-detached-iframe2.html: Added.
+
</ins><span class="cx"> 2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r210862. rdar://problem/30055009
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastformsresourcesformvalidationiframehtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/forms/resources/form-validation-iframe.html (0 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/forms/resources/form-validation-iframe.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/forms/resources/form-validation-iframe.html 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<form>
+ Required text input: <input type="text" id="required_text_input" required><input id="required_text_input_submit" type="submit">
+</form>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastformsvalidationmessagedetachediframeexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe-expected.txt (0 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe-expected.txt 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Tests that the form validation message goes away when its element's iframe gets detached.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS validationBubbleContents.message is ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastformsvalidationmessagedetachediframehtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe.html (0 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe.html 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<iframe id="testFrame" src="resources/form-validation-iframe.html"></iframe>
+<div id="description"></div>
+<div id="console"></div>
+<script>
+description("Tests that the form validation message goes away when its element's iframe gets detached.");
+jsTestIsAsync = true;
+
+function getValidationBubbleContents()
+{
+ return `
+ (function() {
+ return JSON.stringify(uiController.contentsOfUserInterfaceItem('validationBubble'));
+ })();`
+}
+
+onload = function() {
+ var testFrame = document.getElementById("testFrame");
+ testFrame.contentDocument.getElementById("required_text_input_submit").click();
+
+ testFrame.remove();
+ testFrame = null;
+ gc();
+
+ testRunner.runUIScript(getValidationBubbleContents(), function(result) {
+ validationBubbleContents = JSON.parse(result).validationBubble;
+ shouldBeEqualToString("validationBubbleContents.message", "");
+ finishJSTest();
+ });
+}
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+<html>
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastformsvalidationmessagedetachediframe2expectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe2-expected.txt (0 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe2-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe2-expected.txt 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Tests that the form validation message goes away when its element's iframe gets detached.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS validationBubbleContents.message is ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastformsvalidationmessagedetachediframe2html"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe2.html (0 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe2.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/forms/validation-message-detached-iframe2.html 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<iframe id="testFrame1" srcdoc="<iframe id='testFrame2' src='resources/form-validation-iframe.html'></iframe>"></iframe>
+<div id="description"></div>
+<div id="console"></div>
+<script>
+description("Tests that the form validation message goes away when its element's iframe gets detached.");
+jsTestIsAsync = true;
+
+function getValidationBubbleContents()
+{
+ return `
+ (function() {
+ return JSON.stringify(uiController.contentsOfUserInterfaceItem('validationBubble'));
+ })();`
+}
+
+onload = function() {
+ var testFrame1 = document.getElementById("testFrame1");
+ testFrame1.contentDocument.getElementById("testFrame2").contentDocument.getElementById("required_text_input_submit").click();
+
+ testFrame1.remove();
+ testFrame1 = null;
+ gc();
+
+ testRunner.runUIScript(getValidationBubbleContents(), function(result) {
+ validationBubbleContents = JSON.parse(result).validationBubble;
+ gc();
+ shouldBeEqualToString("validationBubbleContents.message", "");
+ finishJSTest();
+ });
+}
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+<html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210960 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-20 16:25:41 UTC (rev 210960)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r210939. rdar://problem/29885052
+
+ 2017-01-19 Chris Dumez <cdumez@apple.com>
+
+ Make sure HTML validation bubble gets dismissed when its associated element's frame gets detached
+ https://bugs.webkit.org/show_bug.cgi?id=167215
+ <rdar://problem/29885052>
+
+ Reviewed by Andreas Kling.
+
+ Make sure HTML validation bubble gets dismissed when its associated
+ element's frame gets detached and that we do not crash.
+
+ Tests: fast/forms/validation-message-detached-iframe.html
+ fast/forms/validation-message-detached-iframe2.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::prepareForDestruction):
+ * page/ValidationMessageClient.h:
+
</ins><span class="cx"> 2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r210888. rdar://problem/30068195
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/dom/Document.cpp (210960 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-01-20 16:25:41 UTC (rev 210960)
+++ branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -177,6 +177,7 @@
</span><span class="cx"> #include "TextNodeTraversal.h"
</span><span class="cx"> #include "TransformSource.h"
</span><span class="cx"> #include "TreeWalker.h"
</span><ins>+#include "ValidationMessageClient.h"
</ins><span class="cx"> #include "VisitedLinkState.h"
</span><span class="cx"> #include "WheelEvent.h"
</span><span class="cx"> #include "WindowFeatures.h"
</span><span class="lines">@@ -2287,6 +2288,11 @@
</span><span class="cx"> page()->pointerLockController().documentDetached(*this);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ if (auto* page = this->page()) {
+ if (auto* validationMessageClient = page->validationMessageClient())
+ validationMessageClient->documentDetached(*this);
+ }
+
</ins><span class="cx"> InspectorInstrumentation::documentDetached(*this);
</span><span class="cx">
</span><span class="cx"> stopActiveDOMObjects();
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepageValidationMessageClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/ValidationMessageClient.h (210960 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/ValidationMessageClient.h 2017-01-20 16:25:41 UTC (rev 210960)
+++ branches/safari-603-branch/Source/WebCore/page/ValidationMessageClient.h 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class Document;
</ins><span class="cx"> class Element;
</span><span class="cx">
</span><span class="cx"> class ValidationMessageClient {
</span><span class="lines">@@ -49,6 +50,8 @@
</span><span class="cx"> virtual bool isValidationMessageVisible(const Element& anchor) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void updateValidationBubbleStateIfNeeded() = 0;
</span><ins>+
+ virtual void documentDetached(Document&) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (210960 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-01-20 16:25:41 UTC (rev 210960)
+++ branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r210939. rdar://problem/29885052
+
+ 2017-01-19 Chris Dumez <cdumez@apple.com>
+
+ Make sure HTML validation bubble gets dismissed when its associated element's frame gets detached
+ https://bugs.webkit.org/show_bug.cgi?id=167215
+ <rdar://problem/29885052>
+
+ Reviewed by Andreas Kling.
+
+ Make sure HTML validation bubble gets dismissed when its associated
+ element's frame gets detached and that we do not crash.
+
+ * WebCoreSupport/WebValidationMessageClient.h:
+ * WebCoreSupport/WebValidationMessageClient.mm:
+ (WebValidationMessageClient::documentDetached):
+
</ins><span class="cx"> 2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r210822. rdar://problem/15607819
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebCoreSupportWebValidationMessageClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.h (210960 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.h 2017-01-20 16:25:41 UTC (rev 210960)
+++ branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.h 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> ~WebValidationMessageClient();
</span><span class="cx">
</span><span class="cx"> // ValidationMessageClient API.
</span><ins>+ void documentDetached(WebCore::Document&) final;
</ins><span class="cx"> void showValidationMessage(const WebCore::Element& anchor, const String& message) final;
</span><span class="cx"> void hideValidationMessage(const WebCore::Element& anchor) final;
</span><span class="cx"> bool isValidationMessageVisible(const WebCore::Element& anchor) final;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebCoreSupportWebValidationMessageClientmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.mm (210960 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.mm 2017-01-20 16:25:41 UTC (rev 210960)
+++ branches/safari-603-branch/Source/WebKit/mac/WebCoreSupport/WebValidationMessageClient.mm 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -42,6 +42,14 @@
</span><span class="cx"> hideValidationMessage(*m_currentAnchor);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebValidationMessageClient::documentDetached(Document& document)
+{
+ if (!m_currentAnchor)
+ return;
+ if (&m_currentAnchor->document() == &document)
+ hideValidationMessage(*m_currentAnchor);
+}
+
</ins><span class="cx"> void WebValidationMessageClient::showValidationMessage(const Element& anchor, const String& message)
</span><span class="cx"> {
</span><span class="cx"> if (m_currentAnchor)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210960 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-20 16:25:41 UTC (rev 210960)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r210939. rdar://problem/29885052
+
+ 2017-01-19 Chris Dumez <cdumez@apple.com>
+
+ Make sure HTML validation bubble gets dismissed when its associated element's frame gets detached
+ https://bugs.webkit.org/show_bug.cgi?id=167215
+ <rdar://problem/29885052>
+
+ Reviewed by Andreas Kling.
+
+ Make sure HTML validation bubble gets dismissed when its associated
+ element's frame gets detached and that we do not crash.
+
+ * WebProcess/WebCoreSupport/WebValidationMessageClient.cpp:
+ (WebKit::WebValidationMessageClient::documentDetached):
+ * WebProcess/WebCoreSupport/WebValidationMessageClient.h:
+
</ins><span class="cx"> 2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r210861. rdar://problem/30015304
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebCoreSupportWebValidationMessageClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.cpp (210960 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.cpp 2017-01-20 16:25:41 UTC (rev 210960)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.cpp 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -46,6 +46,14 @@
</span><span class="cx"> hideValidationMessage(*m_currentAnchor);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebValidationMessageClient::documentDetached(Document& document)
+{
+ if (!m_currentAnchor)
+ return;
+ if (&m_currentAnchor->document() == &document)
+ hideValidationMessage(*m_currentAnchor);
+}
+
</ins><span class="cx"> void WebValidationMessageClient::showValidationMessage(const Element& anchor, const String& message)
</span><span class="cx"> {
</span><span class="cx"> if (m_currentAnchor)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebCoreSupportWebValidationMessageClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.h (210960 => 210961)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.h 2017-01-20 16:25:41 UTC (rev 210960)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebValidationMessageClient.h 2017-01-20 16:25:48 UTC (rev 210961)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> ~WebValidationMessageClient();
</span><span class="cx">
</span><span class="cx"> // ValidationMessageClient API.
</span><ins>+ void documentDetached(WebCore::Document&) final;
</ins><span class="cx"> void showValidationMessage(const WebCore::Element& anchor, const String& message) final;
</span><span class="cx"> void hideValidationMessage(const WebCore::Element& anchor) final;
</span><span class="cx"> bool isValidationMessageVisible(const WebCore::Element& anchor) final;
</span></span></pre>
</div>
</div>
</body>
</html>