Changeset 70004 in webkit

Timestamp:

Oct 18, 2010 3:40:38 PM (14 years ago)

Author:

andersca@apple.com

Message:

WebKit2 should handle dismissing the Find overlay on mouse-down
​https://bugs.webkit.org/show_bug.cgi?id=47854

Reviewed by John Sullivan.

• WebProcess/WebPage/FindPageOverlay.cpp:

(WebKit::FindPageOverlay::mouseEvent):
Dismiss the find UI on MouseDown.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::mouseEvent):
If there's a page overlay, let it have a go at the event.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/FindPageOverlay.cpp (modified) (1 diff)
• WebProcess/WebPage/FindPageOverlay.h (modified) (1 diff)
• WebProcess/WebPage/PageOverlay.h (modified) (2 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-18  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by John Sullivan.
+
+        WebKit2 should handle dismissing the Find overlay on mouse-down
+        https://bugs.webkit.org/show_bug.cgi?id=47854
+
+        * WebProcess/WebPage/FindPageOverlay.cpp:
+        (WebKit::FindPageOverlay::mouseEvent):
+        Dismiss the find UI on MouseDown.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::mouseEvent):
+        If there's a page overlay, let it have a go at the event.
+
 2010-10-18  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/WebProcess/WebPage/FindPageOverlay.cpp

@@ -141 +141 @@
 }
 
+bool FindPageOverlay::mouseEvent(const WebMouseEvent& event)
+{
+    if (event.type() == WebEvent::MouseDown) {
+        // Dismiss the overlay.
+        m_findController->hideFindUI();
+        return false;
+    }
+
+    return false;
+}
+
 } // namespace WebKit

trunk/WebKit2/WebProcess/WebPage/FindPageOverlay.h

@@ -47 +47 @@
     // PageOverlay.
     virtual void drawRect(WebCore::GraphicsContext&, const WebCore::IntRect& dirtyRect);
+    virtual bool mouseEvent(const WebMouseEvent&);
 
     FindController* m_findController;

trunk/WebKit2/WebProcess/WebPage/PageOverlay.h

@@ -36 +36 @@
 namespace WebKit {
 
+class WebMouseEvent;
 class WebPage;
 
@@ -44 +45 @@
     virtual ~PageOverlay();
     virtual void drawRect(WebCore::GraphicsContext&, const WebCore::IntRect& dirtyRect) = 0;
-    
+    virtual bool mouseEvent(const WebMouseEvent&) = 0;
+
     void setPage(WebPage*);
     void setNeedsDisplay();

trunk/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -494 +494 @@
 void WebPage::mouseEvent(const WebMouseEvent& mouseEvent)
 {
-    CurrentEvent currentEvent(mouseEvent);
-
-    bool handled = handleMouseEvent(mouseEvent, m_page.get());
+    bool handled = false;
+    
+    if (m_pageOverlay) {
+        // Let the page overlay handle the event.
+        handled = m_pageOverlay->mouseEvent(mouseEvent);
+    }
+
+    if (!handled) {
+        CurrentEvent currentEvent(mouseEvent);
+
+        handled = handleMouseEvent(mouseEvent, m_page.get());
+    }
+
     WebProcess::shared().connection()->send(Messages::WebPageProxy::DidReceiveEvent(static_cast<uint32_t>(mouseEvent.type()), handled), m_pageID);
 }