Changeset 21099 in webkit

Timestamp:

Apr 25, 2007 2:46:21 PM (17 years ago)

Author:

hyatt

Message:

Fix for bug 13373, make sure to invalidate the pref widths for objects
with percentage padding.

Reviewed by beth

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::layoutBlockChildren): (WebCore::RenderBlock::layoutPositionedObjects):
• rendering/bidi.cpp: (WebCore::RenderBlock::layoutInlineChildren):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (2 diffs)
• rendering/bidi.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-04-25  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 13373, make sure to invalidate the pref widths for objects
+        with percentage padding.
+
+        Reviewed by beth
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutBlockChildren):
+        (WebCore::RenderBlock::layoutPositionedObjects):
+        * rendering/bidi.cpp:
+        (WebCore::RenderBlock::layoutInlineChildren):
+
 2007-04-25  David Harrison  <harrison@apple.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -1132 +1132 @@
             child->setChildNeedsLayout(true, false);
 
+        // If relayoutChildren is set and we have percentage padding, we also need to invalidate the child's pref widths.
+        if (relayoutChildren && (child->style()->paddingLeft().isPercent() || child->style()->paddingRight().isPercent()))
+            child->setPrefWidthsDirty(true, false);
+
         // Handle the four types of special elements first.  These include positioned content, floating content, compacts and
         // run-ins.  When we encounter these four types of objects, we don't actually lay them out as normal flow blocks.
@@ -1250 +1254 @@
             if (relayoutChildren || (r->hasStaticY() && r->parent() != this && r->parent()->isBlockFlow()))
                 r->setChildNeedsLayout(true, false);
+                
+            // If relayoutChildren is set and we have percentage padding, we also need to invalidate the child's pref widths.
+            if (relayoutChildren && (r->style()->paddingLeft().isPercent() || r->style()->paddingRight().isPercent()))
+                r->setPrefWidthsDirty(true, false);
+                    
             r->layoutIfNeeded();
         }

trunk/WebCore/rendering/bidi.cpp

@@ -1612 +1612 @@
                 if (relayoutChildren || o->style()->width().isPercent() || o->style()->height().isPercent())
                     o->setChildNeedsLayout(true, false);
+                    
+                // If relayoutChildren is set and we have percentage padding, we also need to invalidate the child's pref widths.
+                if (relayoutChildren && (o->style()->paddingLeft().isPercent() || o->style()->paddingRight().isPercent()))
+                    o->setPrefWidthsDirty(true, false);
+            
                 if (o->isPositioned())
                     o->containingBlock()->insertPositionedObject(o);