[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 a219209337df0e1d57e557056a81a5bb2fa610d6
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 17 18:53:19 2003 +0000

    	2938062 Mouse cursor does not change to link cursor over non-button form submission controls
    
            Reviewed by Darin
    
            * khtml/khtmlview.cpp:
            (isSubmitImage):  Helper function to ID submit buttons with images.
            (KHTMLView::viewportMouseMoveEvent):  Set cursor for submit buttons with images.
            * kwq/WebCoreBridge.mm:
            (inputElementFromDOMElement):  Simplify previously written casting goop.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3653 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5846e9c..12fdf44 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-02-17  Trey Matteson  <trey at apple.com>
+
+	2938062 Mouse cursor does not change to link cursor over non-button form submission controls
+	
+        Reviewed by Darin
+
+        * khtml/khtmlview.cpp:
+        (isSubmitImage):  Helper function to ID submit buttons with images.
+        (KHTMLView::viewportMouseMoveEvent):  Set cursor for submit buttons with images.
+        * kwq/WebCoreBridge.mm:
+        (inputElementFromDOMElement):  Simplify previously written casting goop.
+
 2003-02-16  David Hyatt  <hyatt at apple.com>
 
 	Fix "Almost Strict" mode to not match @konq-quirks.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5846e9c..12fdf44 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-02-17  Trey Matteson  <trey at apple.com>
+
+	2938062 Mouse cursor does not change to link cursor over non-button form submission controls
+	
+        Reviewed by Darin
+
+        * khtml/khtmlview.cpp:
+        (isSubmitImage):  Helper function to ID submit buttons with images.
+        (KHTMLView::viewportMouseMoveEvent):  Set cursor for submit buttons with images.
+        * kwq/WebCoreBridge.mm:
+        (inputElementFromDOMElement):  Simplify previously written casting goop.
+
 2003-02-16  David Hyatt  <hyatt at apple.com>
 
 	Fix "Almost Strict" mode to not match @konq-quirks.
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 70b1df9..dc54be6 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -30,6 +30,7 @@
 
 #include "html/html_documentimpl.h"
 #include "html/html_inlineimpl.h"
+#include "html/html_formimpl.h"
 #include "rendering/render_object.h"
 #include "rendering/render_root.h"
 #include "rendering/render_style.h"
@@ -539,6 +540,14 @@ void KHTMLView::viewportMouseDoubleClickEvent( QMouseEvent *_mouse )
 #endif    
 }
 
+static bool isSubmitImage(DOM::NodeImpl *node)
+{
+    return node->isHTMLElement()
+//        && static_cast<HTMLElementImpl*>(node)->id() == ID_INPUT
+        && node->id() == ID_INPUT
+        && static_cast<HTMLInputElementImpl*>(node)->inputType() == HTMLInputElementImpl::IMAGE;
+}
+
 void KHTMLView::viewportMouseMoveEvent( QMouseEvent * _mouse )
 {
     if(!m_part->xmlDocImpl()) return;
@@ -584,7 +593,8 @@ void KHTMLView::viewportMouseMoveEvent( QMouseEvent * _mouse )
         if ( d->mousePressed )
             // during selection, use an IBeam no matter what we're over
             c = KCursor::ibeamCursor();
-        else if ( mev.url.length() && m_part->settings()->changeCursor() )
+        else if ( (mev.url.length() || isSubmitImage(mev.innerNode.handle()))
+                  && m_part->settings()->changeCursor() )
             c = m_part->urlCursor();
         else if ( mev.innerNode.nodeType() == Node::TEXT_NODE
                   || mev.innerNode.nodeType() == Node::CDATA_SECTION_NODE )
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index abed6b5..d5f20b5 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -462,12 +462,9 @@ static bool initializedObjectCacheSize = FALSE;
 static HTMLInputElementImpl *inputElementFromDOMElement(id <WebDOMElement>element)
 {
     ASSERT([(NSObject *)element isKindOfClass:[WebCoreDOMElement class]]);
-DOM::ElementImpl *domElement = [(WebCoreDOMElement *)element elementImpl];
-    if (domElement->isHTMLElement()) {
-        HTMLElementImpl *htmlElement = static_cast<HTMLElementImpl *>(domElement);
-        if (idFromNode(htmlElement) == ID_INPUT) {
-            return static_cast<HTMLInputElementImpl *>(htmlElement);
-        }
+    DOM::ElementImpl *domElement = [(WebCoreDOMElement *)element elementImpl];
+    if (idFromNode(domElement) == ID_INPUT) {
+        return static_cast<HTMLInputElementImpl *>(domElement);
     }
     return nil;
 }

-- 
WebKit Debian packaging