[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 3b4943e66e604f6ff728971a43b8d95b60c6655f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 6 01:09:45 2004 +0000

            Reviewed by Dave.
    
            - rolled over fix from KHTML tree; anchor inside another anchor
    
            * khtml/rendering/render_layer.cpp: (RenderLayer::nodeAtPoint):
            Make sure the URL element is the innermost one, by not setting it once
            it's already set.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6312 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index dd591da..725629f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-04-05  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - rolled over fix from KHTML tree; anchor inside another anchor
+
+        * khtml/rendering/render_layer.cpp: (RenderLayer::nodeAtPoint):
+        Make sure the URL element is the innermost one, by not setting it once
+        it's already set.
+
 2004-04-05  David Hyatt  <hyatt at apple.com>
 
 	Implement overflow: overlay so that a scrollbar can show/hide without causing a layout.
diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index 0622b8d..a5eef43 100644
--- a/WebCore/khtml/rendering/render_layer.cpp
+++ b/WebCore/khtml/rendering/render_layer.cpp
@@ -837,10 +837,11 @@ RenderLayer::nodeAtPoint(RenderObject::NodeInfo& info, int x, int y)
     QRect damageRect(m_x, m_y, width(), height());
     RenderLayer* insideLayer = nodeAtPointForLayer(this, info, x, y, damageRect);
 
-    // Now determine if the result is inside an anchor.
+    // Now determine if the result is inside an anchor; make sure an image map wins if
+    // it already set URLElement and only use the innermost.
     DOM::NodeImpl* node = info.innerNode();
     while (node) {
-        if (node->hasAnchor())
+        if (node->hasAnchor() && !info.URLElement())
             info.setURLElement(node);
         node = node->parentNode();
     }

-- 
WebKit Debian packaging