Changeset 41769 in webkit

Timestamp:

Mar 17, 2009 10:30:52 AM (15 years ago)

Author:

hyatt@apple.com

Message:

WebCore:

2009-03-16 David Hyatt <​hyatt@apple.com>

<rdar://problem/6648411> REGRESSION: Layout of page is wrong at ​http://www.popcap.com/

Make sure that the initial shouldPaint check that looks at enclosingLayers properly skips over
layers that don't paint themselves. This is done by adding a new boolean parameter to enclosingLayer
so that RenderObjects can walk up the enclosing layer chain and skip any layers that don't paint
themselves.

Reviewed by Darin Adler.

Added fast/block/float/overlapping-floats-with-overflow-hidden.html

• WebCore.base.exp:
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::addOverhangingFloats):
• rendering/RenderObject.cpp: (WebCore::RenderObject::enclosingSelfPaintingLayer):
• rendering/RenderObject.h:

LayoutTests:

2009-03-16 David Hyatt <​hyatt@apple.com>

<rdar://problem/6648411> REGRESSION: Layout of page is wrong at ​http://www.popcap.com/

Make sure that the initial shouldPaint check that looks at enclosingLayers properly skips over
layers that don't paint themselves. This is done by adding a new enclosingSelfPaintingLayer method
so that RenderObjects can walk up the enclosing layer chain and skip any layers that don't paint
themselves.

Reviewed by Darin Adler.

• fast/block/float/overlapping-floats-with-overflow-hidden.html: Added.
• platform/mac/fast/block/float/overlapping-floats-with-overflow-hidden-expected.checksum: Added.
• platform/mac/fast/block/float/overlapping-floats-with-overflow-hidden-expected.png: Added.
• platform/mac/fast/block/float/overlapping-floats-with-overflow-hidden-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/float/overlapping-floats-with-overflow-hidden.html (added)
• LayoutTests/platform/mac/fast/block/float/overlapping-floats-with-overflow-hidden-expected.checksum (added)
• LayoutTests/platform/mac/fast/block/float/overlapping-floats-with-overflow-hidden-expected.png (added)
• LayoutTests/platform/mac/fast/block/float/overlapping-floats-with-overflow-hidden-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (1 diff)
• WebCore/rendering/RenderObject.cpp (modified) (1 diff)
• WebCore/rendering/RenderObject.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-03-16  David Hyatt  <hyatt@apple.com>
+
+        <rdar://problem/6648411> REGRESSION: Layout of page is wrong at http://www.popcap.com/
+
+        Make sure that the initial shouldPaint check that looks at enclosingLayers properly skips over
+        layers that don't paint themselves.  This is done by adding a new enclosingSelfPaintingLayer method
+        so that RenderObjects can walk up the enclosing layer chain and skip any layers that don't paint
+        themselves.
+
+        Reviewed by Darin Adler.
+
+        * fast/block/float/overlapping-floats-with-overflow-hidden.html: Added.
+        * platform/mac/fast/block/float/overlapping-floats-with-overflow-hidden-expected.checksum: Added.
+        * platform/mac/fast/block/float/overlapping-floats-with-overflow-hidden-expected.png: Added.
+        * platform/mac/fast/block/float/overlapping-floats-with-overflow-hidden-expected.txt: Added.
+
 2009-03-17  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-03-16  David Hyatt  <hyatt@apple.com>
+
+        <rdar://problem/6648411> REGRESSION: Layout of page is wrong at http://www.popcap.com/
+
+        Make sure that the initial shouldPaint check that looks at enclosingLayers properly skips over
+        layers that don't paint themselves.  This is done by adding a new boolean parameter to enclosingLayer
+        so that RenderObjects can walk up the enclosing layer chain and skip any layers that don't paint
+        themselves.
+
+        Reviewed by Darin Adler.
+
+        Added fast/block/float/overlapping-floats-with-overflow-hidden.html
+
+        * WebCore.base.exp:
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::addOverhangingFloats):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::enclosingSelfPaintingLayer):
+        * rendering/RenderObject.h:
+
 2009-03-17  Xan Lopez  <xlopez@igalia.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -3077 +3077 @@
                 // behaves properly).  We always want to propagate the desire to paint the float as
                 // far out as we can, to the outermost block that overlaps the float, stopping only
-                // if we hit a layer boundary.
-                if (r->m_renderer->enclosingLayer() == enclosingLayer())
+                // if we hit a self-painting layer boundary.
+                if (r->m_renderer->enclosingSelfPaintingLayer() == enclosingSelfPaintingLayer())
                     r->m_shouldPaint = false;
                 else

trunk/WebCore/rendering/RenderObject.cpp

@@ -514 +514 @@
         RenderLayer* layer = curr->hasLayer() ? toRenderBoxModelObject(curr)->layer() : 0;
         if (layer)
+            return layer;
+        curr = curr->parent();
+    }
+    return 0;
+}
+
+RenderLayer* RenderObject::enclosingSelfPaintingLayer() const
+{
+    const RenderObject* curr = this;
+    while (curr) {
+        RenderLayer* layer = curr->hasLayer() ? toRenderBoxModelObject(curr)->layer() : 0;
+        if (layer && layer->isSelfPaintingLayer())
             return layer;
         curr = curr->parent();

trunk/WebCore/rendering/RenderObject.h

@@ -166 +166 @@
     RenderObject* lastLeafChild() const;
 
-    // The following five functions are used when the render tree hierarchy changes to make sure layers get
+    // The following six functions are used when the render tree hierarchy changes to make sure layers get
     // properly added and removed.  Since containership can be implemented by any subclass, and since a hierarchy
     // can contain a mixture of boxes and other object types, these functions need to be in the base class.
     RenderLayer* enclosingLayer() const;
-    
+    RenderLayer* enclosingSelfPaintingLayer() const;
     void addLayers(RenderLayer* parentLayer, RenderObject* newObject);
     void removeLayers(RenderLayer* parentLayer);