[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 a7a58c6e166b5f3331d961c31e1ffe34d8477098
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 16 23:28:31 2002 +0000

    	When render objects were being dynamically wrapped in anonymous
    	blocks, the layer parenting connection was being broken without
    	being reconnected when the wrapping finished.  This patch
    	shifts the layer connection into the functions that are also
    	called in the dynamic case.
    
    	With this fix, all objects on mrskin finally show up.  Yeehah.
    	brainjar.com's brain is back too.
    
    	This patch also stops treating images as inline if they are
    	using abs/fixed positioning, since according to the CSS spec,
    	abs/fixed positioned elements should be treated as block-level
    	content.
    
            * khtml/rendering/render_container.cpp:
            (RenderContainer::addChild):
            (RenderContainer::appendChildNode):
            (RenderContainer::insertChildNode):
            * khtml/rendering/render_image.cpp:
            (RenderImage::setStyle):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2345 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 631612d..9e64f82 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,26 @@
+2002-10-16  David Hyatt  <hyatt at apple.com>
+
+	When render objects were being dynamically wrapped in anonymous
+	blocks, the layer parenting connection was being broken without
+	being reconnected when the wrapping finished.  This patch
+	shifts the layer connection into the functions that are also
+	called in the dynamic case.
+
+	With this fix, all objects on mrskin finally show up.  Yeehah.
+	brainjar.com's brain is back too.
+
+	This patch also stops treating images as inline if they are
+	using abs/fixed positioning, since according to the CSS spec,
+	abs/fixed positioned elements should be treated as block-level
+	content.
+	
+        * khtml/rendering/render_container.cpp:
+        (RenderContainer::addChild):
+        (RenderContainer::appendChildNode):
+        (RenderContainer::insertChildNode):
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::setStyle):
+
 2002-10-16  Darin Adler  <darin at apple.com>
 
 	- fixed 3045570 -- can't select a printer at inkfinder.com
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 631612d..9e64f82 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,26 @@
+2002-10-16  David Hyatt  <hyatt at apple.com>
+
+	When render objects were being dynamically wrapped in anonymous
+	blocks, the layer parenting connection was being broken without
+	being reconnected when the wrapping finished.  This patch
+	shifts the layer connection into the functions that are also
+	called in the dynamic case.
+
+	With this fix, all objects on mrskin finally show up.  Yeehah.
+	brainjar.com's brain is back too.
+
+	This patch also stops treating images as inline if they are
+	using abs/fixed positioning, since according to the CSS spec,
+	abs/fixed positioned elements should be treated as block-level
+	content.
+	
+        * khtml/rendering/render_container.cpp:
+        (RenderContainer::addChild):
+        (RenderContainer::appendChildNode):
+        (RenderContainer::insertChildNode):
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::setStyle):
+
 2002-10-16  Darin Adler  <darin at apple.com>
 
 	- fixed 3045570 -- can't select a printer at inkfinder.com
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 631612d..9e64f82 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,26 @@
+2002-10-16  David Hyatt  <hyatt at apple.com>
+
+	When render objects were being dynamically wrapped in anonymous
+	blocks, the layer parenting connection was being broken without
+	being reconnected when the wrapping finished.  This patch
+	shifts the layer connection into the functions that are also
+	called in the dynamic case.
+
+	With this fix, all objects on mrskin finally show up.  Yeehah.
+	brainjar.com's brain is back too.
+
+	This patch also stops treating images as inline if they are
+	using abs/fixed positioning, since according to the CSS spec,
+	abs/fixed positioned elements should be treated as block-level
+	content.
+	
+        * khtml/rendering/render_container.cpp:
+        (RenderContainer::addChild):
+        (RenderContainer::appendChildNode):
+        (RenderContainer::insertChildNode):
+        * khtml/rendering/render_image.cpp:
+        (RenderImage::setStyle):
+
 2002-10-16  Darin Adler  <darin at apple.com>
 
 	- fixed 3045570 -- can't select a printer at inkfinder.com
diff --git a/WebCore/khtml/rendering/render_container.cpp b/WebCore/khtml/rendering/render_container.cpp
index 406beab..e601596 100644
--- a/WebCore/khtml/rendering/render_container.cpp
+++ b/WebCore/khtml/rendering/render_container.cpp
@@ -134,10 +134,6 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild
     }
     newChild->setLayouted( false );
     newChild->setMinMaxKnown( false );
-
-    // Keep our layer hierarchy updated.
-    if (newChild->layer())
-        enclosingLayer()->addChild(newChild->layer());
 }
 
 RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild)
@@ -252,6 +248,10 @@ void RenderContainer::appendChildNode(RenderObject* newChild)
     setLastChild(newChild);
     newChild->setLayouted( false );
     newChild->setMinMaxKnown( false );
+    
+    // Keep our layer hierarchy updated.
+    if (newChild->layer())
+        enclosingLayer()->addChild(newChild->layer());
 }
 
 void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeChild)
@@ -278,6 +278,12 @@ void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeC
     child->setParent(this);
     child->setLayouted( false );
     child->setMinMaxKnown( false );
+    
+    // Keep our layer hierarchy updated.
+    // XXX Need this to do an insertion and really find the right place to
+    // put the new layer. -dwh
+    if (child->layer())
+        enclosingLayer()->addChild(child->layer());
 }
 
 
diff --git a/WebCore/khtml/rendering/render_image.cpp b/WebCore/khtml/rendering/render_image.cpp
index d1024e3..d13ff20 100644
--- a/WebCore/khtml/rendering/render_image.cpp
+++ b/WebCore/khtml/rendering/render_image.cpp
@@ -68,7 +68,7 @@ void RenderImage::setStyle(RenderStyle* _style)
 {
     RenderReplaced::setStyle(_style);
     // init RenderObject attributes
-    setInline( style()->display()==INLINE );
+    setInline( !isPositioned() && style()->display()==INLINE );
     setOverhangingContents(style()->height().isPercent());
     setSpecialObjects(true);
 

-- 
WebKit Debian packaging