[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 b64004bf7d4ab40da7a22779eedd035ec951e8df
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 23 00:25:24 2003 +0000

    	Fixed: 3153969 - Should not be able drag text while double or triple-click selecting it
    	Fixed: 3154153 - Can drag an empty selection
    
            Reviewed by rjw.
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::isPointInsideSelection): consider an empty selection like no selection
            * kwq/KWQKHTMLPart.mm:
            (KWQKHTMLPart::khtmlMouseMoveEvent): don't allow dragging after selection has started using double or triple click
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3408 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 094f8c6..f02b578 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-01-22  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3153969 - Should not be able drag text while double or triple-click selecting it
+	Fixed: 3154153 - Can drag an empty selection
+
+        Reviewed by rjw.
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::isPointInsideSelection): consider an empty selection like no selection
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::khtmlMouseMoveEvent): don't allow dragging after selection has started using double or triple click
+
 2003-01-22  David Hyatt  <hyatt at apple.com>
 
 	Fix absolute positioning problem for bottom-positioned elements.  
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 094f8c6..f02b578 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-01-22  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3153969 - Should not be able drag text while double or triple-click selecting it
+	Fixed: 3154153 - Can drag an empty selection
+
+        Reviewed by rjw.
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::isPointInsideSelection): consider an empty selection like no selection
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::khtmlMouseMoveEvent): don't allow dragging after selection has started using double or triple click
+
 2003-01-22  David Hyatt  <hyatt at apple.com>
 
 	Fix absolute positioning problem for bottom-positioned elements.  
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 7c5e035..4fc3fda 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4118,6 +4118,10 @@ static void findWordBoundary(QChar *chars, int len, int position, int *start, in
 
 bool KHTMLPart::isPointInsideSelection(int x, int y)
 {
+    // Treat an empty selection like no selection.
+    if (d->m_selectionStart == d->m_selectionEnd && d->m_startOffset == d->m_endOffset) {
+        return false;
+    }
     if (!xmlDocImpl()->renderer()) {
         return false;
     }
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index f78b0b5..2541a61 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -950,7 +950,10 @@ void KWQKHTMLPart::khtmlMouseMoveEvent(MouseMoveEvent *event)
             return;
         }
 
-	if (_mouseDownMayStartDrag && [_bridge mayStartDragWithMouseDragged:_currentEvent]) {
+	if (_mouseDownMayStartDrag &&
+            !d->m_selectionInitiatedWithDoubleClick &&
+            !d->m_selectionInitiatedWithTripleClick &&
+            [_bridge mayStartDragWithMouseDragged:_currentEvent]) {
 	    [_bridge handleMouseDragged:_currentEvent];
 	    return;
 	} else if (_mouseDownMayStartSelect) {

-- 
WebKit Debian packaging