<!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>[180094] trunk/Source/WebKit2</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/180094">180094</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-02-13 17:25:07 -0800 (Fri, 13 Feb 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Crash closing a tab when a context or popup menu is open
https://bugs.webkit.org/show_bug.cgi?id=141582
rdar://problem/17700475

Reviewed by Anders Carlsson.

If a context menu or a popup menu is open when a tab is programmatically closed,
then we'd crash because both the WebContextMenuProxyMac/WebPopupMenuProxyMac
and the WebPageProxy would be deleted while still in use, via messages
handled via the nested event tracking runloop.

Fix by protecting those things while showing the popup. Also programmatically
dismiss the popup when closing the WebPageProxy.

* UIProcess/WebContextMenuProxy.h:
(WebKit::WebContextMenuProxy::cancelTracking):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::close):
(WebKit::WebPageProxy::showPopupMenu): Clean up some EFL-related confusion that we don't need.
Retaining |this| will also retain m_activePopupMenu.
(WebKit::WebPageProxy::hidePopupMenu):
(WebKit::WebPageProxy::showContextMenu):
(WebKit::WebPageProxy::resetState):
* UIProcess/WebPopupMenuProxy.h:
(WebKit::WebPopupMenuProxy::cancelTracking):
* UIProcess/mac/WebContextMenuProxyMac.h:
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::showContextMenu):
(WebKit::WebContextMenuProxyMac::cancelTracking):
* UIProcess/mac/WebPopupMenuProxyMac.h: For popups, we need to remember if we were
canceled to avoid trying to send events after closing.
* UIProcess/mac/WebPopupMenuProxyMac.mm:
(WebKit::WebPopupMenuProxyMac::WebPopupMenuProxyMac):
(WebKit::WebPopupMenuProxyMac::showPopupMenu):
(WebKit::WebPopupMenuProxyMac::cancelTracking):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextMenuProxyh">trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPopupMenuProxyh">trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMach">trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180093 => 180094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-02-14 01:20:57 UTC (rev 180093)
+++ trunk/Source/WebKit2/ChangeLog        2015-02-14 01:25:07 UTC (rev 180094)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2015-02-13  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        Crash closing a tab when a context or popup menu is open
+        https://bugs.webkit.org/show_bug.cgi?id=141582
+        rdar://problem/17700475
+
+        Reviewed by Anders Carlsson.
+
+        If a context menu or a popup menu is open when a tab is programmatically closed,
+        then we'd crash because both the WebContextMenuProxyMac/WebPopupMenuProxyMac
+        and the WebPageProxy would be deleted while still in use, via messages
+        handled via the nested event tracking runloop.
+
+        Fix by protecting those things while showing the popup. Also programmatically
+        dismiss the popup when closing the WebPageProxy.
+
+        * UIProcess/WebContextMenuProxy.h:
+        (WebKit::WebContextMenuProxy::cancelTracking):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::close):
+        (WebKit::WebPageProxy::showPopupMenu): Clean up some EFL-related confusion that we don't need.
+        Retaining |this| will also retain m_activePopupMenu.
+        (WebKit::WebPageProxy::hidePopupMenu):
+        (WebKit::WebPageProxy::showContextMenu):
+        (WebKit::WebPageProxy::resetState):
+        * UIProcess/WebPopupMenuProxy.h:
+        (WebKit::WebPopupMenuProxy::cancelTracking):
+        * UIProcess/mac/WebContextMenuProxyMac.h:
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        (WebKit::WebContextMenuProxyMac::showContextMenu):
+        (WebKit::WebContextMenuProxyMac::cancelTracking):
+        * UIProcess/mac/WebPopupMenuProxyMac.h: For popups, we need to remember if we were
+        canceled to avoid trying to send events after closing.
+        * UIProcess/mac/WebPopupMenuProxyMac.mm:
+        (WebKit::WebPopupMenuProxyMac::WebPopupMenuProxyMac):
+        (WebKit::WebPopupMenuProxyMac::showPopupMenu):
+        (WebKit::WebPopupMenuProxyMac::cancelTracking):
+
</ins><span class="cx"> 2015-02-13  Timothy Horton  &lt;timothy_horton@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix the iOS build.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextMenuProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h (180093 => 180094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h        2015-02-14 01:20:57 UTC (rev 180093)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h        2015-02-14 01:25:07 UTC (rev 180094)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> 
</span><span class="cx">     virtual void showContextMenu(const WebCore::IntPoint&amp;, const Vector&lt;WebContextMenuItemData&gt;&amp;, const ContextMenuContextData&amp;) = 0;
</span><span class="cx">     virtual void hideContextMenu() = 0;
</span><ins>+    virtual void cancelTracking() { }
</ins><span class="cx"> 
</span><span class="cx"> protected:
</span><span class="cx">     WebContextMenuProxy();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (180093 => 180094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2015-02-14 01:20:57 UTC (rev 180093)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2015-02-14 01:25:07 UTC (rev 180094)
</span><span class="lines">@@ -736,6 +736,14 @@
</span><span class="cx"> 
</span><span class="cx">     m_isClosed = true;
</span><span class="cx"> 
</span><ins>+    if (m_activePopupMenu)
+        m_activePopupMenu-&gt;cancelTracking();
+
+#if ENABLE(CONTEXT_MENUS)
+    if (m_activeContextMenu)
+        m_activeContextMenu-&gt;cancelTracking();
+#endif
+
</ins><span class="cx">     m_backForwardList-&gt;pageClosed();
</span><span class="cx">     m_pageClient.pageClosed();
</span><span class="cx"> 
</span><span class="lines">@@ -3913,7 +3921,7 @@
</span><span class="cx">         m_activePopupMenu-&gt;hidePopupMenu();
</span><span class="cx"> #endif
</span><span class="cx">         m_activePopupMenu-&gt;invalidate();
</span><del>-        m_activePopupMenu = 0;
</del><ins>+        m_activePopupMenu = nullptr;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     m_activePopupMenu = m_pageClient.createPopupMenuProxy(this);
</span><span class="lines">@@ -3928,14 +3936,10 @@
</span><span class="cx">     UNUSED_PARAM(data);
</span><span class="cx">     m_uiPopupMenuClient.showPopupMenu(this, m_activePopupMenu.get(), rect, static_cast&lt;TextDirection&gt;(textDirection), m_pageScaleFactor, items, selectedIndex);
</span><span class="cx"> #else
</span><del>-    RefPtr&lt;WebPopupMenuProxy&gt; protectedActivePopupMenu = m_activePopupMenu;
</del><span class="cx"> 
</span><del>-    protectedActivePopupMenu-&gt;showPopupMenu(rect, static_cast&lt;TextDirection&gt;(textDirection), m_pageScaleFactor, items, data, selectedIndex);
-
-    // Since Efl doesn't use a nested mainloop to show the popup and get the answer, we need to keep the client pointer valid.
-    // FIXME: The above comment doesn't make any sense since this code is compiled out for EFL.
-    protectedActivePopupMenu-&gt;invalidate();
-    protectedActivePopupMenu = 0;
</del><ins>+    // Showing a popup menu runs a nested runloop, which can handle messages that cause |this| to get closed.
+    Ref&lt;WebPageProxy&gt; protect(*this);
+    m_activePopupMenu-&gt;showPopupMenu(rect, static_cast&lt;TextDirection&gt;(textDirection), m_pageScaleFactor, items, data, selectedIndex);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -3950,12 +3954,15 @@
</span><span class="cx">     m_activePopupMenu-&gt;hidePopupMenu();
</span><span class="cx"> #endif
</span><span class="cx">     m_activePopupMenu-&gt;invalidate();
</span><del>-    m_activePopupMenu = 0;
</del><ins>+    m_activePopupMenu = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> void WebPageProxy::showContextMenu(const IntPoint&amp; menuLocation, const ContextMenuContextData&amp; contextMenuContextData, const Vector&lt;WebContextMenuItemData&gt;&amp; proposedItems, const UserData&amp; userData)
</span><span class="cx"> {
</span><ins>+    // Showing a context menu runs a nested runloop, which can handle messages that cause |this| to get closed.
+    Ref&lt;WebPageProxy&gt; protect(*this);
+
</ins><span class="cx">     internalShowContextMenu(menuLocation, contextMenuContextData, proposedItems, ContextMenuClientEligibility::EligibleForClient, userData);
</span><span class="cx">     
</span><span class="cx">     // No matter the result of internalShowContextMenu, always notify the WebProcess that the menu is hidden so it starts handling mouse events again.
</span><span class="lines">@@ -4710,7 +4717,7 @@
</span><span class="cx">     for (size_t i = 0, size = editCommandVector.size(); i &lt; size; ++i)
</span><span class="cx">         editCommandVector[i]-&gt;invalidate();
</span><span class="cx"> 
</span><del>-    m_activePopupMenu = 0;
</del><ins>+    m_activePopupMenu = nullptr;
</ins><span class="cx">     m_isPlayingAudio = false;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPopupMenuProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h (180093 => 180094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h        2015-02-14 01:20:57 UTC (rev 180093)
+++ trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h        2015-02-14 01:25:07 UTC (rev 180094)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx">     virtual void showPopupMenu(const WebCore::IntRect&amp; rect, WebCore::TextDirection, double pageScaleFactor, const Vector&lt;WebPopupItem&gt;&amp; items, const PlatformPopupMenuData&amp;, int32_t selectedIndex) = 0;
</span><span class="cx">     virtual void hidePopupMenu() = 0;
</span><span class="cx"> #endif
</span><ins>+    virtual void cancelTracking() { }
</ins><span class="cx"> 
</span><span class="cx">     void invalidate() { m_client = 0; }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (180093 => 180094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h        2015-02-14 01:20:57 UTC (rev 180093)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h        2015-02-14 01:25:07 UTC (rev 180094)
</span><span class="lines">@@ -49,7 +49,9 @@
</span><span class="cx">     ~WebContextMenuProxyMac();
</span><span class="cx"> 
</span><span class="cx">     virtual void showContextMenu(const WebCore::IntPoint&amp;, const Vector&lt;WebContextMenuItemData&gt;&amp;, const ContextMenuContextData&amp;) override;
</span><ins>+
</ins><span class="cx">     virtual void hideContextMenu() override;
</span><ins>+    virtual void cancelTracking() override;
</ins><span class="cx">     
</span><span class="cx">     void contextMenuItemSelected(const WebContextMenuItemData&amp;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (180093 => 180094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm        2015-02-14 01:20:57 UTC (rev 180093)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm        2015-02-14 01:25:07 UTC (rev 180094)
</span><span class="lines">@@ -496,6 +496,8 @@
</span><span class="cx">     location = [m_webView.window convertBaseToScreen:location];
</span><span class="cx"> #pragma clang diagnostic pop
</span><span class="cx"> 
</span><ins>+    Ref&lt;WebContextMenuProxyMac&gt; protect(*this);
+
</ins><span class="cx">     WKPopupContextMenu(menu, location);
</span><span class="cx"> 
</span><span class="cx">     hideContextMenu();
</span><span class="lines">@@ -506,6 +508,11 @@
</span><span class="cx">     [m_popup dismissPopUp];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void WebContextMenuProxyMac::cancelTracking()
+{
+    [[m_popup menu] cancelTracking];
+}
+
</ins><span class="cx"> NSWindow *WebContextMenuProxyMac::window() const
</span><span class="cx"> {
</span><span class="cx">     return [m_webView window];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h (180093 => 180094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h        2015-02-14 01:20:57 UTC (rev 180093)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h        2015-02-14 01:25:07 UTC (rev 180094)
</span><span class="lines">@@ -46,8 +46,9 @@
</span><span class="cx">     }
</span><span class="cx">     ~WebPopupMenuProxyMac();
</span><span class="cx"> 
</span><del>-    virtual void showPopupMenu(const WebCore::IntRect&amp;, WebCore::TextDirection, double pageScaleFactor, const Vector&lt;WebPopupItem&gt;&amp;, const PlatformPopupMenuData&amp;, int32_t selectedIndex);
-    virtual void hidePopupMenu();
</del><ins>+    virtual void showPopupMenu(const WebCore::IntRect&amp;, WebCore::TextDirection, double pageScaleFactor, const Vector&lt;WebPopupItem&gt;&amp;, const PlatformPopupMenuData&amp;, int32_t selectedIndex) override;
+    virtual void hidePopupMenu() override;
+    virtual void cancelTracking() override;
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     WebPopupMenuProxyMac(WKView *, WebPopupMenuProxy::Client*);
</span><span class="lines">@@ -56,6 +57,7 @@
</span><span class="cx"> 
</span><span class="cx">     RetainPtr&lt;NSPopUpButtonCell&gt; m_popup;
</span><span class="cx">     WKView *m_webView;
</span><ins>+    bool m_wasCanceled;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPopupMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm (180093 => 180094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm        2015-02-14 01:20:57 UTC (rev 180093)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm        2015-02-14 01:25:07 UTC (rev 180094)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> WebPopupMenuProxyMac::WebPopupMenuProxyMac(WKView *webView, WebPopupMenuProxy::Client* client)
</span><span class="cx">     : WebPopupMenuProxy(client)
</span><span class="cx">     , m_webView(webView)
</span><ins>+    , m_wasCanceled(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -147,12 +148,13 @@
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    Ref&lt;WebPopupMenuProxyMac&gt; protect(*this);
</ins><span class="cx">     WKPopupMenu(menu, location, roundf(NSWidth(rect)), dummyView.get(), selectedIndex, font, controlSize, data.hideArrows);
</span><span class="cx"> 
</span><span class="cx">     [m_popup dismissPopUp];
</span><span class="cx">     [dummyView removeFromSuperview];
</span><span class="cx">     
</span><del>-    if (!m_client)
</del><ins>+    if (!m_client || m_wasCanceled)
</ins><span class="cx">         return;
</span><span class="cx">     
</span><span class="cx">     m_client-&gt;valueChangedForPopupMenu(this, [m_popup indexOfSelectedItem]);
</span><span class="lines">@@ -196,6 +198,12 @@
</span><span class="cx">     [m_popup dismissPopUp];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void WebPopupMenuProxyMac::cancelTracking()
+{
+    [[m_popup menu] cancelTracking];
+    m_wasCanceled = true;
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><span class="cx"> #endif // USE(APPKIT)
</span></span></pre>
</div>
</div>

</body>
</html>