[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 c717701455034a6d981088324aa106259bf9ef81
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 20 03:41:43 2003 +0000

    	Update layers to not fix their positions during setLayouted.
    	Inline container() within render_object.cpp so setLayouted can
    	use it inline.
    
            Reviewed by mjs
    
            * 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@3674 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c725062..b0a3b74 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,19 @@
 2003-02-19  David Hyatt  <hyatt at apple.com>
 
+	Update layers to not fix their positions during setLayouted.
+	Inline container() within render_object.cpp so setLayouted can
+	use it inline.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::updateLayerPosition):
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+        (RenderObject::container):
+
+2003-02-19  David Hyatt  <hyatt at apple.com>
+
 	Just chain BidiRuns using an internal next ptr and dump the
 	use of QPtrList (which has to malloc internal nodes to wrap
 	each run).
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c725062..b0a3b74 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,19 @@
 2003-02-19  David Hyatt  <hyatt at apple.com>
 
+	Update layers to not fix their positions during setLayouted.
+	Inline container() within render_object.cpp so setLayouted can
+	use it inline.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::updateLayerPosition):
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+        (RenderObject::container):
+
+2003-02-19  David Hyatt  <hyatt at apple.com>
+
 	Just chain BidiRuns using an internal next ptr and dump the
 	use of QPtrList (which has to malloc internal nodes to wrap
 	each run).
diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index 8ab7383..3bd8f47 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_object->width())
+
+    if (m_object->overflowWidth() > m_width)
         setWidth(m_object->overflowWidth());
-    if (m_object->overflowHeight() > m_object->height())
+    if (m_object->overflowHeight() > m_height)
         setHeight(m_object->overflowHeight());
 }
 
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index ce25084..f9a4994 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -339,15 +339,7 @@ RenderObject* RenderObject::offsetParent() const
 void RenderObject::setLayouted(bool b) 
 {
     m_layouted = b;
-    if (b) {
-        RenderLayer* l = layer();
-        if (l) {
-            l->setWidth(width());
-            l->setHeight(height());
-            l->updateLayerPosition();
-        }
-    }
-    else {
+    if (!b) {
         RenderObject *o = container();
         RenderObject *root = this;
 
@@ -997,22 +989,24 @@ RenderRoot* RenderObject::root() const
     return static_cast<RenderRoot*>( o );
 }
 
-RenderObject *RenderObject::container() const
+inline RenderObject *RenderObject::container() const
 {
-    EPosition pos = m_style->position();
     RenderObject *o = 0;
-    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();
+    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();
     }
-    else if ( pos == ABSOLUTE )
-	o = containingBlock();
     else
 	o = parent();
     return o;

-- 
WebKit Debian packaging