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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 6451ee3ca5dba0dbffc83ce9162dd3d25383d8ef
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 15 21:28:27 2003 +0000

            - fixed <rdar://problem/3510459>: REGRESSION (100-113): Pressing button at google.com
            removes focus from text field
    
            Reviewed by Dave.
    
            * khtml/khtmlview.cpp:
            (KHTMLView::dispatchMouseEvent):
            Don't clear the focused widget when a mousedown occurs on a widget that is focusable
            in the abstract sense but is not mouse focusable or currently keyboard focusable. This
            matches the behavior of older Safaris (clicking in background or page text will make the
            webview itself be first responder, but clicking on a button won't).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5798 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b3d8246..76d49d7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-12-15  John Sullivan  <sullivan at apple.com>
+
+        - fixed <rdar://problem/3510459>: REGRESSION (100-113): Pressing button at google.com 
+        removes focus from text field
+
+        Reviewed by Dave.
+
+        * khtml/khtmlview.cpp:
+        (KHTMLView::dispatchMouseEvent):
+        Don't clear the focused widget when a mousedown occurs on a widget that is focusable
+        in the abstract sense but is not mouse focusable or currently keyboard focusable. This
+        matches the behavior of older Safaris (clicking in background or page text will make the
+        webview itself be first responder, but clicking on a button won't).
+
 2003-12-14  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 9a1e9c9..1a798ae 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -1679,7 +1679,7 @@ bool KHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode, bool
 	    for ( ; nodeImpl && !nodeImpl->isFocusable(); nodeImpl = nodeImpl->parentNode());
             if (nodeImpl && nodeImpl->isMouseFocusable())
                 m_part->xmlDocImpl()->setFocusNode(nodeImpl);
-            else if (!nodeImpl || !nodeImpl->isKeyboardFocusable())
+            else if (!nodeImpl)
                 m_part->xmlDocImpl()->setFocusNode(0);
         }
     }

-- 
WebKit Debian packaging