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

[trey]

The following commit has been merged in the debian/unstable branch:
commit f5a6216845e2b59ce8f6a10911e39fe780397cf3
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jun 6 04:28:57 2004 +0000

    	As agreed with Hyatt and Louch, do not post incoming dragging events
    	to text nodes.
    
            Reviewed by Maciej
    
            * khtml/khtmlview.cpp:
            (KHTMLView::updateDragAndDrop):  For any drag target that is a text node,
    	use its parent instead.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6780 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0a286c5..ff6b104 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-06-05  Trey Matteson  <trey at apple.com>
+
+	As agreed with Hyatt and Louch, do not post incoming dragging events
+	to text nodes.
+
+        Reviewed by Maciej
+
+        * khtml/khtmlview.cpp:
+        (KHTMLView::updateDragAndDrop):  For any drag target that is a text node,
+	use its parent instead.
+
 2004-06-03  Trey Matteson  <trey at apple.com>
 
 	DHTML dragging uses the Cocoa NSDragOperation on both the source and dest ends.
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 77363be..393f9b0 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -1191,7 +1191,12 @@ bool KHTMLView::updateDragAndDrop(const QPoint &loc, DOM::ClipboardImpl *clipboa
     DOM::NodeImpl::MouseEvent mev(0, DOM::NodeImpl::MouseMove);
     m_part->xmlDocImpl()->prepareMouseEvent(true, xm, ym, &mev);
     DOM::Node newTarget = mev.innerNode;
-    
+
+    // Drag events should never go to text nodes (following IE, and proper mouseover/out dispatch)
+    if (newTarget.nodeType() == Node::TEXT_NODE) {
+        newTarget = newTarget.parentNode();
+    }
+
     if (d->dragTarget != newTarget) {
         // note this ordering is explicitly chosen to match WinIE
         if (!newTarget.isNull()) {

-- 
WebKit Debian packaging