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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 0dfe3a8c358a7055727901a5c72cc35ef653cdf5
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 21 01:58:01 2002 +0000

            Don't modify selection if no appropriate DOM::Node under
            mouse.
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::khtmlMouseMoveEvent):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2114 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 330f8a0..b98e793 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-09-20  Richard Williamson   <rjw at apple.com>
 
+        Don't modify selection if no appropriate DOM::Node under
+        mouse.
+        
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::khtmlMouseMoveEvent):
+
+2002-09-20  Richard Williamson   <rjw at apple.com>
+
         Assume triple click for selection if click count >= 3,
         not == 3, as in OS X.
         
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 330f8a0..b98e793 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-09-20  Richard Williamson   <rjw at apple.com>
 
+        Don't modify selection if no appropriate DOM::Node under
+        mouse.
+        
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::khtmlMouseMoveEvent):
+
+2002-09-20  Richard Williamson   <rjw at apple.com>
+
         Assume triple click for selection if click count >= 3,
         not == 3, as in OS X.
         
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 330f8a0..b98e793 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-09-20  Richard Williamson   <rjw at apple.com>
 
+        Don't modify selection if no appropriate DOM::Node under
+        mouse.
+        
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::khtmlMouseMoveEvent):
+
+2002-09-20  Richard Williamson   <rjw at apple.com>
+
         Assume triple click for selection if click count >= 3,
         not == 3, as in OS X.
         
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index f92bae7..a51936a 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4329,7 +4329,12 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
         //        if (d->m_selectionEnd.handle() && d->m_selectionEnd.handle()->renderer())
         //          kdDebug( 6000 ) << "setting end of selection to " << d->m_selectionEnd.handle()->renderer() << "/"
         //                          << d->m_endOffset << endl;
-        
+
+#ifdef APPLE_CHANGES
+        // Don't modify the selection if we're not on a node.
+        if (node == 0)
+            return;
+#endif        
         // we have to get to know if end is before start or not...
         DOM::Node n = d->m_selectionStart;
         d->m_startBeforeEnd = false;
@@ -4346,7 +4351,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
             }
             n = next;
         }
-#ifdef APPLE_CHANGES        
+#ifdef APPLE_CHANGES
         if ( d->m_selectionInitiatedWithDoubleClick){
             if (d->m_startBeforeEnd) {
                 if (node == d->m_initialSelectionStart.handle() && node == d->m_initialSelectionEnd.handle()){

-- 
WebKit Debian packaging