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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit cda655dfe9c8deb99da5e6b17af63d2dec7a140d
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 21 00:28:48 2003 +0000

            Revert Dave's patch to these files, since it turned out to cause
    	layout regressions.
    
            * khtml/rendering/render_layer.cpp:
            (RenderLayer::updateLayerPosition):
            * khtml/rendering/render_object.cpp:
            (RenderObject::setLayouted):
            (RenderObject::container):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3683 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b91b6a9..39122d7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-02-20  Maciej Stachowiak  <mjs at apple.com>
 
+        Revert Dave's patch to these files, since it turned out to cause
+	layout regressions.
+
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::updateLayerPosition):
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+        (RenderObject::container):
+
+2003-02-20  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Darin Adler.
 
 	- fixed 3173276 - hang in kjs string at iteslj.org page
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b91b6a9..39122d7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-02-20  Maciej Stachowiak  <mjs at apple.com>
 
+        Revert Dave's patch to these files, since it turned out to cause
+	layout regressions.
+
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::updateLayerPosition):
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+        (RenderObject::container):
+
+2003-02-20  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Darin Adler.
 
 	- fixed 3173276 - hang in kjs string at iteslj.org page
diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index 3bd8f47..8ab7383 100644
--- a/WebCore/khtml/rendering/render_layer.cpp
+++ b/WebCore/khtml/rendering/render_layer.cpp
@@ -99,10 +99,10 @@ void RenderLayer::updateLayerPosition()
         static_cast<RenderBox*>(m_object)->relativePositionOffset(x, y);
     
     setPos(x,y);
-
-    if (m_object->overflowWidth() > m_width)
+    
+    if (m_object->overflowWidth() > m_object->width())
         setWidth(m_object->overflowWidth());
-    if (m_object->overflowHeight() > m_height)
+    if (m_object->overflowHeight() > m_object->height())
         setHeight(m_object->overflowHeight());
 }
 
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index f9a4994..ce25084 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -339,7 +339,15 @@ RenderObject* RenderObject::offsetParent() const
 void RenderObject::setLayouted(bool b) 
 {
     m_layouted = b;
-    if (!b) {
+    if (b) {
+        RenderLayer* l = layer();
+        if (l) {
+            l->setWidth(width());
+            l->setHeight(height());
+            l->updateLayerPosition();
+        }
+    }
+    else {
         RenderObject *o = container();
         RenderObject *root = this;
 
@@ -989,24 +997,22 @@ RenderRoot* RenderObject::root() const
     return static_cast<RenderRoot*>( o );
 }
 
-inline RenderObject *RenderObject::container() const
+RenderObject *RenderObject::container() const
 {
+    EPosition pos = m_style->position();
     RenderObject *o = 0;
-    if (isPositioned()) {
-        EPosition pos = m_style->position();
-        if( pos == FIXED ) {
-            // container() can be called on an object that is not in the
-            // tree yet.  We don't call root() since it will assert if it
-            // can't get back to the root.  Instead we just walk as high up
-            // as we can.  If we're in the tree, we'll get the root.  If we
-            // aren't we'll get the root of our little subtree (most likely
-            // we'll just return 0).
-            o = parent();
-            while ( o && o->parent() ) o = o->parent();
-        }
-        else // ABSOLUTE
-            o = containingBlock();
+    if( pos == FIXED ) {
+        // container() can be called on an object that is not in the
+        // tree yet.  We don't call root() since it will assert if it
+        // can't get back to the root.  Instead we just walk as high up
+        // as we can.  If we're in the tree, we'll get the root.  If we
+        // aren't we'll get the root of our little subtree (most likely
+        // we'll just return 0).
+        o = parent();
+        while ( o && o->parent() ) o = o->parent();
     }
+    else if ( pos == ABSOLUTE )
+	o = containingBlock();
     else
 	o = parent();
     return o;

-- 
WebKit Debian packaging