[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 e3897674bcd23f62a7e000f145de2681fcd1e54b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 11 04:28:46 2002 +0000

    	Get more elements on mrskin painting as well as the menus
    	on brainjar.com.
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layout):
            * khtml/rendering/render_layer.cpp:
            (RenderLayer::constructZTree):
            * khtml/rendering/render_object.cpp:
            (RenderObject::setLayouted):
            * khtml/rendering/render_object.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2029 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 57ad420..65c7285 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,18 @@
 2002-09-10  David Hyatt  <hyatt at apple.com>
 
+	Get more elements on mrskin painting as well as the menus
+	on brainjar.com.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layout):
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::constructZTree):
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+        * khtml/rendering/render_object.h:
+
+2002-09-10  David Hyatt  <hyatt at apple.com>
+
 	Fix the CSS clip property.
 	
         * khtml/css/cssparser.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 57ad420..65c7285 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,18 @@
 2002-09-10  David Hyatt  <hyatt at apple.com>
 
+	Get more elements on mrskin painting as well as the menus
+	on brainjar.com.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layout):
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::constructZTree):
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+        * khtml/rendering/render_object.h:
+
+2002-09-10  David Hyatt  <hyatt at apple.com>
+
 	Fix the CSS clip property.
 	
         * khtml/css/cssparser.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 57ad420..65c7285 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,18 @@
 2002-09-10  David Hyatt  <hyatt at apple.com>
 
+	Get more elements on mrskin painting as well as the menus
+	on brainjar.com.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layout):
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::constructZTree):
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::setLayouted):
+        * khtml/rendering/render_object.h:
+
+2002-09-10  David Hyatt  <hyatt at apple.com>
+
 	Fix the CSS clip property.
 	
         * khtml/css/cssparser.cpp:
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index be97db3..7d943be 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -299,13 +299,6 @@ void RenderFlow::layout()
 
     //kdDebug() << renderName() << " layout width=" << m_width << " height=" << m_height << endl;
 
-    RenderLayer* l = layer();
-    if (l) {
-        l->setWidth(m_width);
-        l->setHeight(m_height);
-        l->updateLayerPosition();
-    }
-      
     setLayouted();
 }
 
diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index aee09b9..e0bef16 100644
--- a/WebCore/khtml/rendering/render_layer.cpp
+++ b/WebCore/khtml/rendering/render_layer.cpp
@@ -251,8 +251,11 @@ RenderLayer::constructZTree(const QRect& damageRect,
     }
 
     // Now add a leaf node for ourselves, but only if we intersect the damage
-    // rect.
-    if (!m_parent ||
+    // rect.  This intersection test is valid only for replaced elements or
+    // block elements, since inline non-replaced elements have a width of 0 (and
+    // thus the layer does too).  We also exclude the root from this test, since
+    // the HTML can be much taller than the root (because of scrolling).
+    if (!m_parent || (renderer()->isInline() && !renderer()->isReplaced()) ||
         (eventProcessing && layerBounds.contains(x,y)) ||
         (!eventProcessing && layerBounds.intersects(damageRect))) {
         RenderLayerElement* layerElt = new RenderLayerElement(this, layerBounds, x, y);
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 76b1a94..9142baf 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -150,6 +150,30 @@ void RenderObject::insertChildNode(RenderObject*, RenderObject*)
     KHTMLAssert(0);
 }
 
+
+void RenderObject::setLayouted(bool b) 
+{
+    m_layouted = b;
+    if (b) {
+        RenderLayer* l = layer();
+        if (l) {
+            l->setWidth(width());
+            l->setHeight(height());
+            l->updateLayerPosition();
+        }
+    }
+    else {
+        RenderObject *o = m_parent;
+        RenderObject *root = this;
+        while( o ) {
+            o->m_layouted = false;
+            root = o;
+            o = o->m_parent;
+        }
+        root->scheduleRelayout();
+    }
+}
+    
 RenderObject *RenderObject::containingBlock() const
 {
     if(isTableCell()) {
diff --git a/WebCore/khtml/rendering/render_object.h b/WebCore/khtml/rendering/render_object.h
index ceccc3c..cf7a140 100644
--- a/WebCore/khtml/rendering/render_object.h
+++ b/WebCore/khtml/rendering/render_object.h
@@ -184,20 +184,8 @@ public:
       close();
     }
 
-    void setLayouted(bool b=true) {
-        m_layouted = b;
-        if(!b) {
-            RenderObject *o = m_parent;
-            RenderObject *root = this;
-            while( o ) {
-                o->m_layouted = false;
-                root = o;
-                o = o->m_parent;
-            }
-            root->scheduleRelayout();
-        }
-    }
-    
+    void setLayouted(bool b=true);
+        
     // hack to block inline layouts during parsing
     // evil, evil. I didn't do it. <tm>
     virtual void setBlockBidi() {}

-- 
WebKit Debian packaging