[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 92fd788d1b01bf6f2c3d72612282708011046dbb
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 18:56:37 2004 +0000

    	3705624	REGRESSION: can't rearrange photos on homepage.mac.com album
    
    	A subtle problem stemming from some interaction between focus handing and
    	event propagation.  We previously made it so when a focus shift fails we
    	don't propagate the event to KHTML.  The fix is to get rid of the inverse
    	effect, so now even if a focus shift succeeds, we don't propagate to KHTML if
    	the page already canceled default behavior.
    
    	In this specific case, the page is cancelling default behavior since it
    	does its own dragging, and the bug was our new system dragging was
    	kicking in.
    
            Reviewed by Ken.
    
            * khtml/khtmlview.cpp:
            (KHTMLView::dispatchMouseEvent):  What he said.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7063 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 75edb49..140699d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,22 @@
+2004-07-20  Trey Matteson  <trey at apple.com>
+
+	3705624	REGRESSION: can't rearrange photos on homepage.mac.com album
+
+	A subtle problem stemming from some interaction between focus handing and
+	event propagation.  We previously made it so when a focus shift fails we
+	don't propagate the event to KHTML.  The fix is to get rid of the inverse
+	effect, so now even if a focus shift succeeds, we don't propagate to KHTML if
+	the page already canceled default behavior.
+
+	In this specific case, the page is cancelling default behavior since it
+	does its own dragging, and the bug was our new system dragging was
+	kicking in.
+
+        Reviewed by Ken.
+
+        * khtml/khtmlview.cpp:
+        (KHTMLView::dispatchMouseEvent):  What he said.
+
 2004-07-20  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Darin
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index d49fc86..f829ee5 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -1850,10 +1850,12 @@ bool KHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode, bool
             // from form fields before the button click is processed.
 	    DOM::NodeImpl* nodeImpl = targetNode;
 	    for ( ; nodeImpl && !nodeImpl->isFocusable(); nodeImpl = nodeImpl->parentNode());
+            // If focus shift is blocked, we eat the event.  Note we should never clear swallowEvent
+            // if the page already set it (e.g., by canceling default behavior).
             if (nodeImpl && nodeImpl->isMouseFocusable())
-                swallowEvent = !m_part->xmlDocImpl()->setFocusNode(nodeImpl);
+                swallowEvent |= !m_part->xmlDocImpl()->setFocusNode(nodeImpl);
             else if (!nodeImpl || !nodeImpl->focused())
-                swallowEvent = !m_part->xmlDocImpl()->setFocusNode(0);
+                swallowEvent |= !m_part->xmlDocImpl()->setFocusNode(0);
         }
     }
 

-- 
WebKit Debian packaging