Title: [120505] trunk/Source/WebKit/blackberry
Revision
120505
Author
commit-qu...@webkit.org
Date
2012-06-15 15:58:17 -0700 (Fri, 15 Jun 2012)

Log Message

[BlackBerry] Remove touch events handling hook for popup
https://bugs.webkit.org/show_bug.cgi?id=89245

Patch by Crystal Zhang <haizh...@rim.com> on 2012-06-15
Reviewed by Rob Buis.

In the old patches we create our own WebPage for popup, so we need to hook up our own
touch handling functions, since we don't use our own WebPage any more, no need to keep
the touch handling code, because it just does nothing other than passing out the events
which might cause the touch events being handled twice.

* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::handleMouseEvent):
* WebCoreSupport/PagePopupBlackBerry.cpp:
* WebCoreSupport/PagePopupBlackBerry.h:
(PagePopupBlackBerry):

Modified Paths

Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (120504 => 120505)


--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-06-15 22:49:04 UTC (rev 120504)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2012-06-15 22:58:17 UTC (rev 120505)
@@ -3917,9 +3917,6 @@
     if (mouseEvent.type() == WebCore::PlatformEvent::MouseScroll)
         return true;
 
-    if (m_parentPopup)
-        m_parentPopup->handleMouseEvent(mouseEvent);
-
     Node* node = 0;
     if (mouseEvent.inputMethod() == TouchScreen) {
         const FatFingersResult lastFatFingersResult = m_touchEventHandler->lastFatFingersResult();

Modified: trunk/Source/WebKit/blackberry/ChangeLog (120504 => 120505)


--- trunk/Source/WebKit/blackberry/ChangeLog	2012-06-15 22:49:04 UTC (rev 120504)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-06-15 22:58:17 UTC (rev 120505)
@@ -1,3 +1,21 @@
+2012-06-15  Crystal Zhang  <haizh...@rim.com>
+
+        [BlackBerry] Remove touch events handling hook for popup
+        https://bugs.webkit.org/show_bug.cgi?id=89245
+
+        Reviewed by Rob Buis.
+
+        In the old patches we create our own WebPage for popup, so we need to hook up our own
+        touch handling functions, since we don't use our own WebPage any more, no need to keep
+        the touch handling code, because it just does nothing other than passing out the events
+        which might cause the touch events being handled twice.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::handleMouseEvent):
+        * WebCoreSupport/PagePopupBlackBerry.cpp:
+        * WebCoreSupport/PagePopupBlackBerry.h:
+        (PagePopupBlackBerry):
+
 2012-06-15  Antonio Gomes  <ago...@rim.com>
 
         [BlackBerry] Disable WebCore::EventHandler synthesized mouse events during touch scrolling

Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp (120504 => 120505)


--- trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp	2012-06-15 22:49:04 UTC (rev 120504)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp	2012-06-15 22:58:17 UTC (rev 120505)
@@ -159,20 +159,6 @@
     JSClassRelease(clientClass);
 }
 
-bool PagePopupBlackBerry::handleMouseEvent(PlatformMouseEvent& event)
-{
-    switch (event.type()) {
-    case PlatformEvent::MouseMoved:
-        return m_webPagePrivate->mainFrame()->eventHandler()->handleMouseMoveEvent(event);
-    case PlatformEvent::MousePressed:
-        return m_webPagePrivate->mainFrame()->eventHandler()->handleMousePressEvent(event);
-    case PlatformEvent::MouseReleased:
-        return m_webPagePrivate->mainFrame()->eventHandler()->handleMouseReleaseEvent(event);
-    default:
-        return false;
-    }
-}
-
 void PagePopupBlackBerry::closePopup()
 {
     m_client->didClosePopup();

Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.h (120504 => 120505)


--- trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.h	2012-06-15 22:49:04 UTC (rev 120504)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.h	2012-06-15 22:58:17 UTC (rev 120505)
@@ -47,9 +47,6 @@
     void installDomFunction(Frame*);
     void setRect();
 
-    bool handleMouseEvent(PlatformMouseEvent&);
-
-
 private:
     BlackBerry::WebKit::WebPagePrivate* m_webPagePrivate;
     OwnPtr<PagePopupClient> m_client;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to