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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 5340a08d1745ff40d503e5e9b79b6e6b6d6783f6
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 6 16:01:01 2004 +0000

            Reviewed by Dave
    
            * khtml/dom/dom_node.cpp:
            (Node::isContentEditable): Added. Calls through to impl function of same name.
            * khtml/dom/dom_node.h: Added isContentEditable declaration.
            * khtml/khtmlview.cpp:
            (KHTMLView::viewportMouseMoveEvent): Now, the cursor will change
            to an i-beam whenever it is over a node that is contenteditable, and nothing,
            like a link, takes precedence.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6318 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6d769ba..1823102 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,18 @@
 
         Reviewed by Dave
 
+        * khtml/dom/dom_node.cpp:
+        (Node::isContentEditable): Added. Calls through to impl function of same name.
+        * khtml/dom/dom_node.h: Added isContentEditable declaration.
+        * khtml/khtmlview.cpp:
+        (KHTMLView::viewportMouseMoveEvent): Now, the cursor will change
+        to an i-beam whenever it is over a node that is contenteditable, and nothing, 
+        like a link, takes precedence.
+
+2004-04-06  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Dave
+
         * khtml/css/html4.css: Refine focus rules so that HTML and BODY
         elements do not draw a focus ring around themselves when focused.
         This prevents a silly-looking focus ring from drawing around a 
diff --git a/WebCore/khtml/dom/dom_node.cpp b/WebCore/khtml/dom/dom_node.cpp
index c846148..9713cea 100644
--- a/WebCore/khtml/dom/dom_node.cpp
+++ b/WebCore/khtml/dom/dom_node.cpp
@@ -423,6 +423,12 @@ NodeImpl *Node::handle() const
     return impl;
 }
 
+bool Node::isContentEditable() const
+{
+    if (!impl) return false;
+    return impl->isContentEditable();
+}
+
 //-----------------------------------------------------------------------------
 
 NodeList::NodeList()
diff --git a/WebCore/khtml/dom/dom_node.h b/WebCore/khtml/dom/dom_node.h
index 51aa4eb..d59c6a6 100644
--- a/WebCore/khtml/dom/dom_node.h
+++ b/WebCore/khtml/dom/dom_node.h
@@ -874,6 +874,12 @@ public:
      */
     QRect getRect();
 
+    /**
+     * not part of the DOM.
+     * @returns whether this node is contenteditable.
+     */
+    bool isContentEditable() const;
+
 protected:
     NodeImpl *impl;
 };
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index 99e6b0f..c13952c 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -39,6 +39,7 @@
 #include "rendering/render_replaced.h"
 #include "rendering/render_line.h"
 #include "rendering/render_text.h"
+#include "xml/dom_nodeimpl.h"
 #include "xml/dom2_eventsimpl.h"
 #include "css/cssstyleselector.h"
 #include "misc/htmlhashes.h"
@@ -832,7 +833,8 @@ void KHTMLView::viewportMouseMoveEvent( QMouseEvent * _mouse )
             c = m_part->urlCursor();
         else if ( !mev.innerNode.isNull()
                   && (mev.innerNode.nodeType() == Node::TEXT_NODE
-                      || mev.innerNode.nodeType() == Node::CDATA_SECTION_NODE) )
+                      || mev.innerNode.nodeType() == Node::CDATA_SECTION_NODE
+                      || (mev.innerNode.isContentEditable())))
             c = KCursor::ibeamCursor();
         break;
     case CURSOR_CROSS:

-- 
WebKit Debian packaging