[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:49:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 67af00d50455042dd070b3f5289e6f5ac2f2ec8e
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 8 21:31:58 2004 +0000
Reviewed by Ken.
- fixed <rdar://problem/3691569> REGRESSION (142): cmd-shift-clicking on a link
now also extends selection (even if there wasn't one before)
* khtml/khtml_part.cpp:
(KHTMLPart::handleMousePressEventSingleClick):
if there's a URL associated with the event, don't extend the selection
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6981 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 36f64e3..55613ca 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-07-08 John Sullivan <sullivan at apple.com>
+
+ Reviewed by Ken.
+
+ - fixed <rdar://problem/3691569> REGRESSION (142): cmd-shift-clicking on a link
+ now also extends selection (even if there wasn't one before)
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::handleMousePressEventSingleClick):
+ if there's a URL associated with the event, don't extend the selection
+
2004-07-08 Ken Kocienda <kocienda at apple.com>
Reviewed by Vicki
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 5f0acad..be41a84 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4401,7 +4401,8 @@ void KHTMLPart::handleMousePressEventSingleClick(khtml::MousePressEvent *event)
if (!innerNode.isNull() && innerNode.handle()->renderer() &&
innerNode.handle()->renderer()->shouldSelect()) {
- bool extendSelection = mouse->state() & ShiftButton;
+ // Extend the selection if the Shift key is down, unless the click is in a link.
+ bool extendSelection = (mouse->state() & ShiftButton) && (!event->url().isNull());
// Don't restart the selection when the mouse is pressed on an
// existing selection so we can allow for text dragging.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list