<!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>[242858] branches/safari-607-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/242858">242858</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2019-03-13 01:24:42 -0700 (Wed, 13 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/242587">r242587</a>. rdar://problem/48839354

    Crash when attempting to change input type while dismissing datalist suggestions
    https://bugs.webkit.org/show_bug.cgi?id=195384
    <rdar://problem/48563718>

    Reviewed by Brent Fulgham.

    Source/WebCore:

    When closing a datalist suggestion menu, WebPageProxy sends a message to WebPage instructing it to tell its
    active datalist suggestions picker to close. However, for a myriad of reasons, the suggestions picker (kept
    alive by its text input type) may have already gone away by this point. To mitigate this, make WebPage weakly
    reference its active datalist suggestions picker.

    Test: fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html

    * platform/DataListSuggestionPicker.h:

    Make DataListSuggestionPicker capable of being weakly referenced. Additionally, fix some minor preexisting
    issues in this header (#imports instead of #includes, as well as an unnecessary include of IntRect.h).

    Source/WebKit:

    See WebCore ChangeLog for more details.

    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::setActiveDataListSuggestionPicker):
    (WebKit::WebPage::didSelectDataListOption):
    (WebKit::WebPage::didCloseSuggestions):
    * WebProcess/WebPage/WebPage.h:

    Turn m_activeDataListSuggestionPicker from a raw pointer into a WeakPtr.

    LayoutTests:

    Add a new layout test to exercise this scenario.

    * fast/forms/datalist/change-input-type-after-closing-datalist-suggestions-expected.txt: Added.
    * fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html: Added.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242587 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari607branchLayoutTestsChangeLog">branches/safari-607-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari607branchSourceWebCoreChangeLog">branches/safari-607-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari607branchSourceWebCoreplatformDataListSuggestionPickerh">branches/safari-607-branch/Source/WebCore/platform/DataListSuggestionPicker.h</a></li>
<li><a href="#branchessafari607branchSourceWebKitChangeLog">branches/safari-607-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari607branchSourceWebKitWebProcessWebPageWebPagecpp">branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#branchessafari607branchSourceWebKitWebProcessWebPageWebPageh">branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari607branchLayoutTestsfastformsdatalistchangeinputtypeafterclosingdatalistsuggestionsexpectedtxt">branches/safari-607-branch/LayoutTests/fast/forms/datalist/change-input-type-after-closing-datalist-suggestions-expected.txt</a></li>
<li><a href="#branchessafari607branchLayoutTestsfastformsdatalistchangeinputtypeafterclosingdatalistsuggestionshtml">branches/safari-607-branch/LayoutTests/fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari607branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/LayoutTests/ChangeLog (242857 => 242858)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/LayoutTests/ChangeLog 2019-03-13 08:24:38 UTC (rev 242857)
+++ branches/safari-607-branch/LayoutTests/ChangeLog    2019-03-13 08:24:42 UTC (rev 242858)
</span><span class="lines">@@ -1,5 +1,63 @@
</span><span class="cx"> 2019-03-13  Babak Shafiei  <bshafiei@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r242587. rdar://problem/48839354
+
+    Crash when attempting to change input type while dismissing datalist suggestions
+    https://bugs.webkit.org/show_bug.cgi?id=195384
+    <rdar://problem/48563718>
+    
+    Reviewed by Brent Fulgham.
+    
+    Source/WebCore:
+    
+    When closing a datalist suggestion menu, WebPageProxy sends a message to WebPage instructing it to tell its
+    active datalist suggestions picker to close. However, for a myriad of reasons, the suggestions picker (kept
+    alive by its text input type) may have already gone away by this point. To mitigate this, make WebPage weakly
+    reference its active datalist suggestions picker.
+    
+    Test: fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html
+    
+    * platform/DataListSuggestionPicker.h:
+    
+    Make DataListSuggestionPicker capable of being weakly referenced. Additionally, fix some minor preexisting
+    issues in this header (#imports instead of #includes, as well as an unnecessary include of IntRect.h).
+    
+    Source/WebKit:
+    
+    See WebCore ChangeLog for more details.
+    
+    * WebProcess/WebPage/WebPage.cpp:
+    (WebKit::WebPage::setActiveDataListSuggestionPicker):
+    (WebKit::WebPage::didSelectDataListOption):
+    (WebKit::WebPage::didCloseSuggestions):
+    * WebProcess/WebPage/WebPage.h:
+    
+    Turn m_activeDataListSuggestionPicker from a raw pointer into a WeakPtr.
+    
+    LayoutTests:
+    
+    Add a new layout test to exercise this scenario.
+    
+    * fast/forms/datalist/change-input-type-after-closing-datalist-suggestions-expected.txt: Added.
+    * fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242587 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-06  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            Crash when attempting to change input type while dismissing datalist suggestions
+            https://bugs.webkit.org/show_bug.cgi?id=195384
+            <rdar://problem/48563718>
+
+            Reviewed by Brent Fulgham.
+
+            Add a new layout test to exercise this scenario.
+
+            * fast/forms/datalist/change-input-type-after-closing-datalist-suggestions-expected.txt: Added.
+            * fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html: Added.
+
+2019-03-13  Babak Shafiei  <bshafiei@apple.com>
+
</ins><span class="cx">         Cherry-pick r242515. rdar://problem/48839275
</span><span class="cx"> 
</span><span class="cx">     SVGPathSegList.insertItemBefore() should fail if the newItem belongs to an animating animPathSegList
</span></span></pre></div>
<a id="branchessafari607branchLayoutTestsfastformsdatalistchangeinputtypeafterclosingdatalistsuggestionsexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-607-branch/LayoutTests/fast/forms/datalist/change-input-type-after-closing-datalist-suggestions-expected.txt (0 => 242858)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/LayoutTests/fast/forms/datalist/change-input-type-after-closing-datalist-suggestions-expected.txt                             (rev 0)
+++ branches/safari-607-branch/LayoutTests/fast/forms/datalist/change-input-type-after-closing-datalist-suggestions-expected.txt        2019-03-13 08:24:42 UTC (rev 242858)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test verifies that the type of an input with an associated datalist can be changed immediately after the datalist suggestions menu is closed. To test manually, load this page and check that it does not crash.
+
+
</ins></span></pre></div>
<a id="branchessafari607branchLayoutTestsfastformsdatalistchangeinputtypeafterclosingdatalistsuggestionshtml"></a>
<div class="addfile"><h4>Added: branches/safari-607-branch/LayoutTests/fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html (0 => 242858)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/LayoutTests/fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html                             (rev 0)
+++ branches/safari-607-branch/LayoutTests/fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html        2019-03-13 08:24:42 UTC (rev 242858)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+    <p>This test verifies that the type of an input with an associated datalist can be changed immediately after the datalist suggestions menu is closed. To test manually, load this page and check that it does not crash.</p>
+    <input value="a" id="input" list="datalist">
+    <datalist id="datalist">
+        <option>a</option>
+    </datalist>
+</body>
+<script>
+    if (window.testRunner)
+        testRunner.dumpAsText();
+
+    input.select();
+    document.execCommand("Delete");
+    input.type = "button";
+</script>
+</html>
</ins></span></pre></div>
<a id="branchessafari607branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (242857 => 242858)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/ChangeLog      2019-03-13 08:24:38 UTC (rev 242857)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-03-13 08:24:42 UTC (rev 242858)
</span><span class="lines">@@ -1,5 +1,70 @@
</span><span class="cx"> 2019-03-13  Babak Shafiei  <bshafiei@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r242587. rdar://problem/48839354
+
+    Crash when attempting to change input type while dismissing datalist suggestions
+    https://bugs.webkit.org/show_bug.cgi?id=195384
+    <rdar://problem/48563718>
+    
+    Reviewed by Brent Fulgham.
+    
+    Source/WebCore:
+    
+    When closing a datalist suggestion menu, WebPageProxy sends a message to WebPage instructing it to tell its
+    active datalist suggestions picker to close. However, for a myriad of reasons, the suggestions picker (kept
+    alive by its text input type) may have already gone away by this point. To mitigate this, make WebPage weakly
+    reference its active datalist suggestions picker.
+    
+    Test: fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html
+    
+    * platform/DataListSuggestionPicker.h:
+    
+    Make DataListSuggestionPicker capable of being weakly referenced. Additionally, fix some minor preexisting
+    issues in this header (#imports instead of #includes, as well as an unnecessary include of IntRect.h).
+    
+    Source/WebKit:
+    
+    See WebCore ChangeLog for more details.
+    
+    * WebProcess/WebPage/WebPage.cpp:
+    (WebKit::WebPage::setActiveDataListSuggestionPicker):
+    (WebKit::WebPage::didSelectDataListOption):
+    (WebKit::WebPage::didCloseSuggestions):
+    * WebProcess/WebPage/WebPage.h:
+    
+    Turn m_activeDataListSuggestionPicker from a raw pointer into a WeakPtr.
+    
+    LayoutTests:
+    
+    Add a new layout test to exercise this scenario.
+    
+    * fast/forms/datalist/change-input-type-after-closing-datalist-suggestions-expected.txt: Added.
+    * fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242587 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-06  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            Crash when attempting to change input type while dismissing datalist suggestions
+            https://bugs.webkit.org/show_bug.cgi?id=195384
+            <rdar://problem/48563718>
+
+            Reviewed by Brent Fulgham.
+
+            When closing a datalist suggestion menu, WebPageProxy sends a message to WebPage instructing it to tell its
+            active datalist suggestions picker to close. However, for a myriad of reasons, the suggestions picker (kept
+            alive by its text input type) may have already gone away by this point. To mitigate this, make WebPage weakly
+            reference its active datalist suggestions picker.
+
+            Test: fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html
+
+            * platform/DataListSuggestionPicker.h:
+
+            Make DataListSuggestionPicker capable of being weakly referenced. Additionally, fix some minor preexisting
+            issues in this header (#imports instead of #includes, as well as an unnecessary include of IntRect.h).
+
+2019-03-13  Babak Shafiei  <bshafiei@apple.com>
+
</ins><span class="cx">         Cherry-pick r242515. rdar://problem/48839275
</span><span class="cx"> 
</span><span class="cx">     SVGPathSegList.insertItemBefore() should fail if the newItem belongs to an animating animPathSegList
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCoreplatformDataListSuggestionPickerh"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/platform/DataListSuggestionPicker.h (242857 => 242858)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/platform/DataListSuggestionPicker.h    2019-03-13 08:24:38 UTC (rev 242857)
+++ branches/safari-607-branch/Source/WebCore/platform/DataListSuggestionPicker.h       2019-03-13 08:24:42 UTC (rev 242858)
</span><span class="lines">@@ -27,14 +27,13 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><span class="cx"> 
</span><del>-#import "DataListSuggestionInformation.h"
-#import "IntRect.h"
</del><ins>+#include "DataListSuggestionInformation.h"
+#include <wtf/WeakPtr.h>
+#include <wtf/text/WTFString.h>
</ins><span class="cx"> 
</span><del>-#import <wtf/text/WTFString.h>
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-class DataListSuggestionPicker {
</del><ins>+class DataListSuggestionPicker : public CanMakeWeakPtr<DataListSuggestionPicker> {
</ins><span class="cx"> public:
</span><span class="cx">     virtual ~DataListSuggestionPicker() = default;
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari607branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (242857 => 242858)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebKit/ChangeLog       2019-03-13 08:24:38 UTC (rev 242857)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog  2019-03-13 08:24:42 UTC (rev 242858)
</span><span class="lines">@@ -1,5 +1,68 @@
</span><span class="cx"> 2019-03-13  Babak Shafiei  <bshafiei@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r242587. rdar://problem/48839354
+
+    Crash when attempting to change input type while dismissing datalist suggestions
+    https://bugs.webkit.org/show_bug.cgi?id=195384
+    <rdar://problem/48563718>
+    
+    Reviewed by Brent Fulgham.
+    
+    Source/WebCore:
+    
+    When closing a datalist suggestion menu, WebPageProxy sends a message to WebPage instructing it to tell its
+    active datalist suggestions picker to close. However, for a myriad of reasons, the suggestions picker (kept
+    alive by its text input type) may have already gone away by this point. To mitigate this, make WebPage weakly
+    reference its active datalist suggestions picker.
+    
+    Test: fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html
+    
+    * platform/DataListSuggestionPicker.h:
+    
+    Make DataListSuggestionPicker capable of being weakly referenced. Additionally, fix some minor preexisting
+    issues in this header (#imports instead of #includes, as well as an unnecessary include of IntRect.h).
+    
+    Source/WebKit:
+    
+    See WebCore ChangeLog for more details.
+    
+    * WebProcess/WebPage/WebPage.cpp:
+    (WebKit::WebPage::setActiveDataListSuggestionPicker):
+    (WebKit::WebPage::didSelectDataListOption):
+    (WebKit::WebPage::didCloseSuggestions):
+    * WebProcess/WebPage/WebPage.h:
+    
+    Turn m_activeDataListSuggestionPicker from a raw pointer into a WeakPtr.
+    
+    LayoutTests:
+    
+    Add a new layout test to exercise this scenario.
+    
+    * fast/forms/datalist/change-input-type-after-closing-datalist-suggestions-expected.txt: Added.
+    * fast/forms/datalist/change-input-type-after-closing-datalist-suggestions.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242587 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-06  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            Crash when attempting to change input type while dismissing datalist suggestions
+            https://bugs.webkit.org/show_bug.cgi?id=195384
+            <rdar://problem/48563718>
+
+            Reviewed by Brent Fulgham.
+
+            See WebCore ChangeLog for more details.
+
+            * WebProcess/WebPage/WebPage.cpp:
+            (WebKit::WebPage::setActiveDataListSuggestionPicker):
+            (WebKit::WebPage::didSelectDataListOption):
+            (WebKit::WebPage::didCloseSuggestions):
+            * WebProcess/WebPage/WebPage.h:
+
+            Turn m_activeDataListSuggestionPicker from a raw pointer into a WeakPtr.
+
+2019-03-13  Babak Shafiei  <bshafiei@apple.com>
+
</ins><span class="cx">         Cherry-pick r241452. rdar://problem/48839390
</span><span class="cx"> 
</span><span class="cx">     Make WebRTCUnifiedPlanEnabled true by default
</span></span></pre></div>
<a id="branchessafari607branchSourceWebKitWebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp (242857 => 242858)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp  2019-03-13 08:24:38 UTC (rev 242857)
+++ branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp     2019-03-13 08:24:42 UTC (rev 242858)
</span><span class="lines">@@ -3862,19 +3862,19 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPage::setActiveDataListSuggestionPicker(WebDataListSuggestionPicker* dataListSuggestionPicker)
</span><span class="cx"> {
</span><del>-    m_activeDataListSuggestionPicker = dataListSuggestionPicker;
</del><ins>+    m_activeDataListSuggestionPicker = makeWeakPtr(dataListSuggestionPicker);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebPage::didSelectDataListOption(const String& selectedOption)
</span><span class="cx"> {
</span><del>-    m_activeDataListSuggestionPicker->didSelectOption(selectedOption);
</del><ins>+    if (m_activeDataListSuggestionPicker)
+        m_activeDataListSuggestionPicker->didSelectOption(selectedOption);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebPage::didCloseSuggestions()
</span><span class="cx"> {
</span><del>-    if (m_activeDataListSuggestionPicker)
-        m_activeDataListSuggestionPicker->didCloseSuggestions();
-    m_activeDataListSuggestionPicker = nullptr;
</del><ins>+    if (auto picker = std::exchange(m_activeDataListSuggestionPicker, nullptr))
+        picker->didCloseSuggestions();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari607branchSourceWebKitWebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.h (242857 => 242858)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.h    2019-03-13 08:24:38 UTC (rev 242857)
+++ branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.h       2019-03-13 08:24:42 UTC (rev 242858)
</span><span class="lines">@@ -1630,7 +1630,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><del>-    WebDataListSuggestionPicker* m_activeDataListSuggestionPicker { nullptr };
</del><ins>+    WeakPtr<WebDataListSuggestionPicker> m_activeDataListSuggestionPicker;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     RefPtr<WebOpenPanelResultListener> m_activeOpenPanelResultListener;
</span></span></pre>
</div>
</div>

</body>
</html>