[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 4343d1503d5b21ab09435c58e08afba620f6f76d
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 25 23:45:07 2004 +0000

    	Fixed a regression where selections that were created via double or triple were not draggable.
    
            Reviewed by darin.
    
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::khtmlMousePressEvent): if the click count is greater than 1, don't allow drags
            (KWQKHTMLPart::khtmlMouseMoveEvent): allow drags to occur even if the selection was originally created via double or triple click
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6689 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 53d2037..8fb0aad 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2004-05-25  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed a regression where selections that were created via double or triple were not draggable.
+
+        Reviewed by darin.
+
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::khtmlMousePressEvent): if the click count is greater than 1, don't allow drags
+        (KWQKHTMLPart::khtmlMouseMoveEvent): allow drags to occur even if the selection was originally created via double or triple click
+
+2004-05-25  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed regression where undoing typing would undo character-by-character.
 
         Reviewed by kocienda.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 4990760..5bc1a6b 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1672,16 +1672,18 @@ void KWQKHTMLPart::khtmlMousePressEvent(MousePressEvent *event)
 {
     // If we got the event back, that must mean it wasn't prevented,
     // so it's allowed to start a drag or selection.
-    _mouseDownMayStartDrag = true;
     _mouseDownMayStartSelect = true;
 
+    bool oneClick = [_currentEvent clickCount] <= 1 ? true : false;
+    _mouseDownMayStartDrag = oneClick;
+
     if (!passWidgetMouseDownEventToWidget(event)) {
         // We don't do this at the start of mouse down handling (before calling into WebCore),
         // because we don't want to do it until we know we didn't hit a widget.
         NSView *view = d->m_view->getDocumentView();
 
 	KWQ_BLOCK_EXCEPTIONS;
-        if ([_currentEvent clickCount] <= 1 && [_bridge firstResponder] != view) {
+        if (oneClick && [_bridge firstResponder] != view) {
             [_bridge makeFirstResponder:view];
         }
 	KWQ_UNBLOCK_EXCEPTIONS;
@@ -1874,9 +1876,7 @@ void KWQKHTMLPart::khtmlMouseMoveEvent(MouseMoveEvent *event)
             return;
         }
 
-	if (_mouseDownMayStartDrag
-                && d->m_selectionGranularity == DOM::Selection::CHARACTER
-                && [_bridge mayStartDragWithMouseDragged:_currentEvent]) {
+	if (_mouseDownMayStartDrag && [_bridge mayStartDragWithMouseDragged:_currentEvent]) {
 
             // We are starting a text/image/url drag, so the cursor should be an arrow
             d->m_view->resetCursor();

-- 
WebKit Debian packaging