Changeset 18857 in webkit

Timestamp:

Jan 15, 2007 2:10:49 AM (17 years ago)

Author:

hyatt

Message:

Fix for 12275, negative margins confuse page breaks.

Reviewed by Eric

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paintChildren):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-15  David Hyatt  <hyatt@apple.com>
+
+        Fix  for 12275, negative margins confuse page breaks.
+
+        Reviewed by Eric
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintChildren):
+
 2007-01-15  Eric Seidel  <eric@eseidel.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -1431 +1431 @@
             inRootBlockContext() && (ty + child->yPos() + child->height()) > paintInfo.rect.y() && 
             (ty + child->yPos() + child->height()) < paintInfo.rect.bottom()) {
-            view()->setBestTruncatedAt(ty + child->yPos() + child->height() + child->collapsedMarginBottom(), this, true);
+            view()->setBestTruncatedAt(ty + child->yPos() + child->height() + max(0, child->collapsedMarginBottom()), this, true);
             return;
         }