[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 328bb2dc4fd5a777c466103960116e08ccd2464c
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 10 03:27:37 2002 +0000

    	Fix for the CSS test suite link.  Need to make sure inlines
    	that are obscured by blocks are properly considered to be
    	above the block background.
    
            Reviewed by LUCKY WINNER
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::nodeAtPoint):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2983 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1e61fbd..3b1ff28 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-12-09  David Hyatt  <hyatt at apple.com>
+
+	Fix for the CSS test suite link.  Need to make sure inlines
+	that are obscured by blocks are properly considered to be
+	above the block background.
+	
+        Reviewed by LUCKY WINNER
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::nodeAtPoint):
+
 2002-12-09  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1e61fbd..3b1ff28 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-12-09  David Hyatt  <hyatt at apple.com>
+
+	Fix for the CSS test suite link.  Need to make sure inlines
+	that are obscured by blocks are properly considered to be
+	above the block background.
+	
+        Reviewed by LUCKY WINNER
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::nodeAtPoint):
+
 2002-12-09  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 1eba145..f400f56 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1046,6 +1046,16 @@ bool RenderObject::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty,
     }
 
     if (inside) {
+        if (info.innerNode() && info.innerNode()->renderer() && 
+            !info.innerNode()->renderer()->isInline() && element() && isInline()) {
+            // Within the same layer, inlines are ALWAYS fully above blocks.  Change inner node.
+            info.setInnerNode(element());
+            
+            // Clear everything else.
+            info.setInnerNonSharedNode(0);
+            info.setURLElement(0);
+        }
+        
         if (!info.innerNode() && element())
             info.setInnerNode(element());
 

-- 
WebKit Debian packaging