Changeset 58046 in webkit

Timestamp:

Apr 21, 2010 8:22:10 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-21 Jay Civelli <​jcivelli@chromium.org>

Reviewed by Darin Fisher.

[Chromium] Don't notify the WebView that a popup was
opened when the popup is handled externally, as the popup
is in that case transparent to the WebView.
The notification was causing an ASSERT on Mac (where
the popup is handled externally) as there would be no
notification that the popup was closed.
​https://bugs.webkit.org/show_bug.cgi?id=37825

• src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::popupOpened):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/ChromeClientImpl.cpp (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-04-21  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Don't notify the WebView that a popup was
+        opened when the popup is handled externally, as the popup
+        is in that case transparent to the WebView.
+        The notification was causing an ASSERT on Mac (where
+        the popup is handled externally) as there would be no
+        notification that the popup was closed.
+        https://bugs.webkit.org/show_bug.cgi?id=37825
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::popupOpened):
+
 2010-04-21  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -630 +630 @@
         if (!webwidget)
             webwidget = m_webView->client()->createPopupMenu(false);
-    }
-    m_webView->popupOpened(popupContainer);
+        // We only notify when the WebView has to handle the popup, as when
+        // the popup is handled externally, the fact that a popup is showing is
+        // transparent to the WebView.
+        m_webView->popupOpened(popupContainer);
+    }
     static_cast<WebPopupMenuImpl*>(webwidget)->Init(popupContainer, bounds);
 }