[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 684103343c841f0de415f23257b2333edf87a3a4
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 9 23:35:03 2002 +0000

    	Fix a subtle bug with layers.  When a parent is sorted with its
    	children the parent's zindex must be treated as 0, so that
    	negative children draw behind the layer's content and positive
    	children (or auto children) draw in front of the layer's content.
    
    	This fix makes chrysler.com work again (and doubtless many other
    	messed up DHTML sites).
    
            * khtml/rendering/render_layer.cpp:
            (RenderLayer::constructZTree):
            (RenderLayer::RenderZTreeNode::constructLayerList):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2295 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 2e6ea9d..a778984 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-10-10  David Hyatt  <hyatt at apple.com>
+
+	Fix a subtle bug with layers.  When a parent is sorted with its
+	children the parent's zindex must be treated as 0, so that
+	negative children draw behind the layer's content and positive
+	children (or auto children) draw in front of the layer's content.
+
+	This fix makes chrysler.com work again (and doubtless many other
+	messed up DHTML sites).
+	
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::constructZTree):
+        (RenderLayer::RenderZTreeNode::constructLayerList):
+
 2002-10-09  Richard Williamson  <rjw at apple.com>
 
         Implemented string conversion functions.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2e6ea9d..a778984 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-10-10  David Hyatt  <hyatt at apple.com>
+
+	Fix a subtle bug with layers.  When a parent is sorted with its
+	children the parent's zindex must be treated as 0, so that
+	negative children draw behind the layer's content and positive
+	children (or auto children) draw in front of the layer's content.
+
+	This fix makes chrysler.com work again (and doubtless many other
+	messed up DHTML sites).
+	
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::constructZTree):
+        (RenderLayer::RenderZTreeNode::constructLayerList):
+
 2002-10-09  Richard Williamson  <rjw at apple.com>
 
         Implemented string conversion functions.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2e6ea9d..a778984 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-10-10  David Hyatt  <hyatt at apple.com>
+
+	Fix a subtle bug with layers.  When a parent is sorted with its
+	children the parent's zindex must be treated as 0, so that
+	negative children draw behind the layer's content and positive
+	children (or auto children) draw in front of the layer's content.
+
+	This fix makes chrysler.com work again (and doubtless many other
+	messed up DHTML sites).
+	
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::constructZTree):
+        (RenderLayer::RenderZTreeNode::constructLayerList):
+
 2002-10-09  Richard Williamson  <rjw at apple.com>
 
         Implemented string conversion functions.
diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index 11e8d35..d1c003b 100644
--- a/WebCore/khtml/rendering/render_layer.cpp
+++ b/WebCore/khtml/rendering/render_layer.cpp
@@ -315,6 +315,12 @@ RenderLayer::constructZTree(QRect damageRect,
             RenderZTreeNode* leaf = new RenderZTreeNode(layerElt);
             leaf->next = returnNode->child;
             returnNode->child = leaf;
+            
+            // We are an interior node and have other child layers.  Our layer
+            // will need to be sorted with the other layers as though it has
+            // a z-index of 0.
+            if (!layerElt->zauto)
+                layerElt->zindex = 0;
         }
         else
             returnNode->layerElement = layerElt;
@@ -443,7 +449,6 @@ void RenderLayer::RenderZTreeNode::constructLayerList(QPtrVector<RenderLayerElem
             buffer->resize(2*(buffer->size()+1));
         
         buffer->insert(buffer->count(), layerElement);
-        layerElement->zindex = explicitZIndex;
         return;
     }
 

-- 
WebKit Debian packaging