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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 8fc88c791a6b6b53ab9229252430d4ac954a72e3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 2 21:54:31 2003 +0000

            Reviewed by Dave.
    
    	- fixed 3213854 -- REGRESSION: can't click on a text field to select it
    	- fixed 3201477 -- friends links don't work on hyatt's blog
    
            * khtml/rendering/render_object.cpp: (RenderObject::nodeAtPoint): Skip floating objects when
            hit testing children.
            * khtml/rendering/render_inline.cpp: (RenderInline::nodeAtPoint): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3999 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e7e4a28..09666d9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-04-02  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3213854 -- REGRESSION: can't click on a text field to select it
+	- fixed 3201477 -- friends links don't work on hyatt's blog
+
+        * khtml/rendering/render_object.cpp: (RenderObject::nodeAtPoint): Skip floating objects when
+        hit testing children.
+        * khtml/rendering/render_inline.cpp: (RenderInline::nodeAtPoint): Ditto.
+
 2003-04-01  Trey Matteson  <trey at apple.com>
 
 	3119711 - redirects to anchors leave window half-loaded (was SCClib.org is half loaded, half rendered)
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e7e4a28..09666d9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-04-02  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3213854 -- REGRESSION: can't click on a text field to select it
+	- fixed 3201477 -- friends links don't work on hyatt's blog
+
+        * khtml/rendering/render_object.cpp: (RenderObject::nodeAtPoint): Skip floating objects when
+        hit testing children.
+        * khtml/rendering/render_inline.cpp: (RenderInline::nodeAtPoint): Ditto.
+
 2003-04-01  Trey Matteson  <trey at apple.com>
 
 	3119711 - redirects to anchors leave window half-loaded (was SCClib.org is half loaded, half rendered)
diff --git a/WebCore/khtml/rendering/render_inline.cpp b/WebCore/khtml/rendering/render_inline.cpp
index f8e61ce..9004799 100644
--- a/WebCore/khtml/rendering/render_inline.cpp
+++ b/WebCore/khtml/rendering/render_inline.cpp
@@ -342,7 +342,7 @@ bool RenderInline::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty,
 {
     // Always check our kids.
     for (RenderObject* child = lastChild(); child; child = child->previousSibling())
-        if (!child->layer() && child->nodeAtPoint(info, _x, _y, _tx, _ty))
+        if (!child->layer() && !child->isFloating() && child->nodeAtPoint(info, _x, _y, _tx, _ty))
             inside = true;
 
     // Check our line boxes if we're still not inside.
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index fba54aa..181fd5f 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1271,7 +1271,7 @@ bool RenderObject::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty,
     // ### table should have its own, more performant method
     if (overhangingContents() || isInline() || isRoot() || isTableRow() || isTableSection() || inside || mouseInside() || (childrenInline() && firstChild() && firstChild()->isCompact())) {
         for (RenderObject* child = lastChild(); child; child = child->previousSibling())
-            if (!child->layer() && child->nodeAtPoint(info, _x, _y, _tx+xPos(), _ty+yPos()))
+            if (!child->layer() && !child->isFloating() && child->nodeAtPoint(info, _x, _y, _tx+xPos(), _ty+yPos()))
                 inside = true;
     }
 

-- 
WebKit Debian packaging