Changeset 162768 in webkit

Timestamp:

Jan 25, 2014 10:48:02 AM (10 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK] Remove null check for WebPopupMenuProxy::Client in WebPopupMenuProxyGtk::showPopupMenu
​https://bugs.webkit.org/show_bug.cgi?id=107036

Reviewed by Andreas Kling.

• UIProcess/gtk/WebPopupMenuProxyGtk.cpp:

(WebKit::WebPopupMenuProxyGtk::showPopupMenu): Don't perform an early return
if the client is not available - it always should be. The client is set to null
only when the proxy is invalidated. This happens immediately after this function
returns, either with the popup being forced to close or being closed by the user
with possibly an item being chosen. Rather than the early return, use an ASSERT.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/WebPopupMenuProxyGtk.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-25  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Remove null check for WebPopupMenuProxy::Client in WebPopupMenuProxyGtk::showPopupMenu
+        https://bugs.webkit.org/show_bug.cgi?id=107036
+
+        Reviewed by Andreas Kling.
+
+        * UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
+        (WebKit::WebPopupMenuProxyGtk::showPopupMenu): Don't perform an early return
+        if the client is not available - it always should be. The client is set to null
+        only when the proxy is invalidated. This happens immediately after this function
+        returns, either with the popup being forced to close or being closed by the user
+        with possibly an item being chosen. Rather than the early return, use an ASSERT.
+
 2014-01-24  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp

@@ -106 +106 @@
     g_signal_handler_disconnect(m_popup->platformMenu(), unmapHandler);
 
-    if (!m_client)
-        return;
-
+    ASSERT(m_client);
     m_client->valueChangedForPopupMenu(this, m_activeItem);
 }