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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 3d2d10b0491cf815ccdf023233d677dcd11231df
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 22 05:04:54 2003 +0000

    	Fix selection so that it will go up to the parent node
    	if the innerNode is text, preserving the old behavior for
    	now until we can rewrite selection to not require this.
    
            Reviewed by cblu.
    
            * khtml/khtml_events.cpp:
            (khtml::MouseEvent::offset):
            * khtml/khtml_part.cpp:
            (KHTMLPart::khtmlMousePressEvent):
            (KHTMLPart::khtmlMouseMoveEvent):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3394 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1e82a44..36fa8ef 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-01-21  David Hyatt  <hyatt at apple.com>
+
+	Fix selection so that it will go up to the parent node
+	if the innerNode is text, preserving the old behavior for
+	now until we can rewrite selection to not require this.
+	
+        Reviewed by cblu.
+
+        * khtml/khtml_events.cpp:
+        (khtml::MouseEvent::offset):
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::khtmlMousePressEvent):
+        (KHTMLPart::khtmlMouseMoveEvent):
+
 2003-01-21  Trey Matteson  <trey at apple.com>
 
 	3121681 - "localhost" part of link is lost with relative links
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1e82a44..36fa8ef 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-01-21  David Hyatt  <hyatt at apple.com>
+
+	Fix selection so that it will go up to the parent node
+	if the innerNode is text, preserving the old behavior for
+	now until we can rewrite selection to not require this.
+	
+        Reviewed by cblu.
+
+        * khtml/khtml_events.cpp:
+        (khtml::MouseEvent::offset):
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::khtmlMousePressEvent):
+        (KHTMLPart::khtmlMouseMoveEvent):
+
 2003-01-21  Trey Matteson  <trey at apple.com>
 
 	3121681 - "localhost" part of link is lost with relative links
diff --git a/WebCore/khtml/khtml_events.cpp b/WebCore/khtml/khtml_events.cpp
index 5604965..7451efb 100644
--- a/WebCore/khtml/khtml_events.cpp
+++ b/WebCore/khtml/khtml_events.cpp
@@ -22,6 +22,7 @@
 #include "xml/dom_nodeimpl.h"
 
 using namespace khtml;
+using namespace DOM;
 
 class khtml::MouseEvent::MouseEventPrivate
 {
@@ -50,8 +51,12 @@ long khtml::MouseEvent::offset() const
     int absX, absY;
     absX = absY = 0;
     if (innerNode().handle()->renderer()) {
-        innerNode().handle()->renderer()->absolutePosition(absX, absY);
-        innerNode().handle()->renderer()->checkSelectionPoint( this, absX, absY, tempNode, offset );
+        // FIXME: Shouldn't be necessary to skip text nodes.
+        DOM::Node inner = innerNode();
+        if (inner.nodeType() == Node::TEXT_NODE)
+            inner = inner.parentNode();
+        inner.handle()->renderer()->absolutePosition(absX, absY);
+        inner.handle()->renderer()->checkSelectionPoint( this, absX, absY, tempNode, offset );
     }
     return offset;
 }
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index ccd4e14..4dcf78b 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4156,6 +4156,9 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
                 int startOffset = 0, endOffset = 0;
                 DOM::NodeImpl* node = 0;
                 
+                // FIXME: Shouldn't be necessary to skip text nodes.
+                if (innerNode.nodeType() == Node::TEXT_NODE)
+                    innerNode = innerNode.parentNode();
                 innerNode.handle()->renderer()->checkSelectionPoint( event,
                                             event->absX()-innerNode.handle()->renderer()->xPos(),
                                             event->absY()-innerNode.handle()->renderer()->yPos(), 
@@ -4204,6 +4207,9 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
                 int startOffset = 0;
                 DOM::NodeImpl* node = 0;
                 
+                // FIXME: Shouldn't be necessary to skip text nodes.
+                if (innerNode.nodeType() == Node::TEXT_NODE)
+                    innerNode = innerNode.parentNode();
                 innerNode.handle()->renderer()->checkSelectionPoint( event,
                                             event->absX()-innerNode.handle()->renderer()->xPos(),
                                             event->absY()-innerNode.handle()->renderer()->yPos(), 
@@ -4235,6 +4241,9 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
                 int offset = 0;
                 DOM::NodeImpl* node = 0;
 
+                // FIXME: Shouldn't be necessary to skip text nodes.
+                if (innerNode.nodeType() == Node::TEXT_NODE)
+                    innerNode = innerNode.parentNode();
                 innerNode.handle()->renderer()->checkSelectionPoint( event,
                                                                     event->absX()-innerNode.handle()->renderer()->xPos(),
                                                                     event->absY()-innerNode.handle()->renderer()->yPos(), node, offset);
@@ -4389,6 +4398,9 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
         //              << " nodeAbsX=" << event->nodeAbsX() << " nodeAbsY=" << event->nodeAbsY()
         //              << endl;
         DOM::NodeImpl* node=0;
+        // FIXME: Shouldn't be necessary to skip text nodes.
+        if (innerNode.nodeType() == Node::TEXT_NODE)
+            innerNode = innerNode.parentNode();
         innerNode.handle()->renderer()->checkSelectionPoint( event,
                                                             event->absX()-innerNode.handle()->renderer()->xPos(),
                                                             event->absY()-innerNode.handle()->renderer()->yPos(), node, offset);

-- 
WebKit Debian packaging