Changeset 32635 in webkit

Timestamp:

Apr 28, 2008 7:29:57 AM (16 years ago)

Author:

Simon Hausmann

Message:

Tor Arne Vestbø <​tavestbo@trolltech.com>

Prevent middle-click from triggering open URL from clipboard when the event has already been accepted.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/qt/PlatformScrollBarQt.cpp (modified) (1 diff)
• WebKit/qt/Api/qwebpage.cpp (modified) (5 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-28  Tor Arne Vestbø  <tavestbo@trolltech.com>
+
+        Reviewed by Simon.
+
+        Prevent middle-click from triggering open URL from clipboard when the event has already been accepted.
+
+        * platform/qt/PlatformScrollBarQt.cpp:
+        (WebCore::PlatformScrollbar::handleMousePressEvent):
+
 2008-04-28  Tor Arne Vestbø  <tavestbo@trolltech.com>
 

trunk/WebCore/platform/qt/PlatformScrollBarQt.cpp

@@ -314 +314 @@
                                         pos.x() : pos.y()) - thumbLength() / 2));
 
-    } else { // Left button
+    } else { // Left button, or if middle click centering is not supported
         const QPoint topLeft = m_opt.rect.topLeft();
         m_opt.rect.moveTo(QPoint(0, 0));

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -374 +374 @@
         return;
 
-    frame->eventHandler()->mouseMoved(PlatformMouseEvent(ev, 0));
+    bool accepted = frame->eventHandler()->mouseMoved(PlatformMouseEvent(ev, 0));
+    ev->setAccepted(accepted);
 }
 
@@ -383 +384 @@
         return;
 
-    if (tripleClickTimer.isActive() && (ev->pos() - tripleClick).manhattanLength() <
-         QApplication::startDragDistance()) {
+    if (tripleClickTimer.isActive()
+            && (ev->pos() - tripleClick).manhattanLength()
+                < QApplication::startDragDistance()) {
         mouseTripleClickEvent(ev);
         return;
     }
 
-    frame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(ev, 1));
+    bool accepted = frame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(ev, 1));
+    ev->setAccepted(accepted);
 }
 
@@ -398 +401 @@
         return;
 
-    frame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(ev, 2));
+    bool accepted = frame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(ev, 2));
+    ev->setAccepted(accepted);
 
     tripleClickTimer.start(QApplication::doubleClickInterval(), q);
@@ -410 +414 @@
         return;
 
-    frame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(ev, 3));
+    bool accepted = frame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(ev, 3));
+    ev->setAccepted(accepted);
 }
 
@@ -419 +424 @@
         return;
 
-    frame->eventHandler()->handleMouseReleaseEvent(PlatformMouseEvent(ev, 0));
+    bool accepted = frame->eventHandler()->handleMouseReleaseEvent(PlatformMouseEvent(ev, 0));
+    ev->setAccepted(accepted);
 
 #ifndef QT_NO_CLIPBOARD

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2008-04-28  Tor Arne Vestbø  <tavestbo@trolltech.com>
+
+        Reviewed by Simon.
+
+        Prevent middle-click from triggering open URL from clipboard when the event has already been accepted.
+        
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::mouseMoveEvent):
+        (QWebPagePrivate::mousePressEvent):
+        (QWebPagePrivate::mouseDoubleClickEvent):
+        (QWebPagePrivate::mouseTripleClickEvent):
+        (QWebPagePrivate::mouseReleaseEvent):
+
 2008-04-28  Tor Arne Vestbø  <tavestbo@trolltech.com>