The following commit has been merged in the debian/unstable branch:
commit d0258bad0b48ee63499d32ce645eb1e883d0d18e
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 31 04:59:51 2003 +0000
3161486 - REGRESSION: double click on a widget causes crash
Slight enhancement to the earlier fix of this bug. When handling a doubleclick we
don't want to try to pass the current event down the Cocoa widgets, because Cocoa
has no double-click event, and we just end up resending one we already sent.
The upshot is that we do not pass an extra mouseup event to the widgets at the
end of a double click sequence.
Reviewed by Darin.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::passWidgetMouseDownEventToWidget):
Do not pass event down to the widget for doubleclick events.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3521 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5a6dce0..13bb8f6 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,20 @@
+2003-01-30 Trey Matteson <trey at apple.com>
+
+ 3161486 - REGRESSION: double click on a widget causes crash
+
+ Slight enhancement to the earlier fix of this bug. When handling a doubleclick we
+ don't want to try to pass the current event down the Cocoa widgets, because Cocoa
+ has no double-click event, and we just end up resending one we already sent.
+
+ The upshot is that we do not pass an extra mouseup event to the widgets at the
+ end of a double click sequence.
+
+ Reviewed by Darin.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::passWidgetMouseDownEventToWidget):
+ Do not pass event down to the widget for doubleclick events.
+
=== Safari-55 ===
2003-01-30 Darin Adler <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5a6dce0..13bb8f6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2003-01-30 Trey Matteson <trey at apple.com>
+
+ 3161486 - REGRESSION: double click on a widget causes crash
+
+ Slight enhancement to the earlier fix of this bug. When handling a doubleclick we
+ don't want to try to pass the current event down the Cocoa widgets, because Cocoa
+ has no double-click event, and we just end up resending one we already sent.
+
+ The upshot is that we do not pass an extra mouseup event to the widgets at the
+ end of a double click sequence.
+
+ Reviewed by Darin.
+
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::passWidgetMouseDownEventToWidget):
+ Do not pass event down to the widget for doubleclick events.
+
=== Safari-55 ===
2003-01-30 Darin Adler <darin at apple.com>
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 14d8914..d2f2e42 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -863,7 +863,15 @@ bool KWQKHTMLPart::passWidgetMouseDownEventToWidget(khtml::MouseEvent *event)
if (!target || !target->isWidget()) {
return false;
}
- return passWidgetMouseDownEventToWidget(static_cast<RenderWidget *>(target));
+
+ // Doubleclick events don't exist in Cocoa. Since passWidgetMouseDownEventToWidget will
+ // just pass _currentEvent down to the widget, we don't want to call it for events that
+ // don't correspond to Cocoa events. The mousedown/ups will have already been passed on as
+ // part of the pressed/released handling.
+ if (!khtml::MouseDoubleClickEvent::test(event))
+ return passWidgetMouseDownEventToWidget(static_cast<RenderWidget *>(target));
+ else
+ return true;
}
bool KWQKHTMLPart::passWidgetMouseDownEventToWidget(RenderWidget *renderWidget)
--
WebKit Debian packaging