Title: [123470] trunk/Source/WebKit/chromium
- Revision
- 123470
- Author
- commit-qu...@webkit.org
- Date
- 2012-07-24 06:42:56 -0700 (Tue, 24 Jul 2012)
Log Message
Unreviewed, rolling out r123463.
http://trac.webkit.org/changeset/123463
https://bugs.webkit.org/show_bug.cgi?id=92110
Broke Android build (Requested by keishi on #webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-07-24
* src/WebPagePopupImpl.h:
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::handleMouseDown):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (123469 => 123470)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-24 13:41:32 UTC (rev 123469)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-24 13:42:56 UTC (rev 123470)
@@ -1,3 +1,15 @@
+2012-07-24 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r123463.
+ http://trac.webkit.org/changeset/123463
+ https://bugs.webkit.org/show_bug.cgi?id=92110
+
+ Broke Android build (Requested by keishi on #webkit).
+
+ * src/WebPagePopupImpl.h:
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::handleMouseDown):
+
2012-07-24 Keishi Hattori <kei...@webkit.org>
[Chromium] Page popup should close on mouse down
Modified: trunk/Source/WebKit/chromium/src/WebPagePopupImpl.h (123469 => 123470)
--- trunk/Source/WebKit/chromium/src/WebPagePopupImpl.h 2012-07-24 13:41:32 UTC (rev 123469)
+++ trunk/Source/WebKit/chromium/src/WebPagePopupImpl.h 2012-07-24 13:42:56 UTC (rev 123470)
@@ -63,7 +63,6 @@
bool handleKeyEvent(const WebCore::PlatformKeyboardEvent&);
void closePopup();
WebWidgetClient* widgetClient() const { return m_widgetClient; }
- bool hasSamePopupClient(WebPagePopupImpl* other) { return other && m_popupClient == other->m_popupClient; }
private:
// WebWidget functions
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (123469 => 123470)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-07-24 13:41:32 UTC (rev 123469)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-07-24 13:42:56 UTC (rev 123470)
@@ -522,15 +522,13 @@
void WebViewImpl::handleMouseDown(Frame& mainFrame, const WebMouseEvent& event)
{
- // If there is a popup open, close it as the user is clicking on the page (outside of the
- // popup). We also save it so we can prevent a click on an element from immediately
- // reopening the same popup.
+ // If there is a select popup open, close it as the user is clicking on
+ // the page (outside of the popup). We also save it so we can prevent a
+ // click on the select element from immediately reopening the popup.
RefPtr<WebCore::PopupContainer> selectPopup;
- RefPtr<WebPagePopupImpl> pagePopup;
if (event.button == WebMouseEvent::ButtonLeft) {
selectPopup = m_selectPopup;
- pagePopup = m_pagePopup;
- hidePopups();
+ hideSelectPopup();
ASSERT(!m_selectPopup);
}
@@ -557,12 +555,6 @@
hideSelectPopup();
}
- if (m_pagePopup && pagePopup && m_pagePopup->hasSamePopupClient(pagePopup.get())) {
- // That click triggered a page popup that is the same as the one we just closed.
- // It needs to be closed.
- closePagePopup(m_pagePopup.get());
- }
-
// Dispatch the contextmenu event regardless of if the click was swallowed.
// On Windows, we handle it on mouse up, not down.
#if OS(DARWIN)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
