Title: [167678] trunk/Source/WebCore
Revision
167678
Author
hy...@apple.com
Date
2014-04-22 13:31:47 -0700 (Tue, 22 Apr 2014)

Log Message

[New Multicolumn] widows/orphans cause assertion failures.
https://bugs.webkit.org/show_bug.cgi?id=131233

Reviewed by Dean Jackson.

* rendering/RenderMultiColumnSet.cpp:
(WebCore::RenderMultiColumnSet::recordSpaceShortage):
Fix an obvious bug where the space shortage is recorded twice (and the
if statement that kept it from being negative is accidentally ignored).

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (167677 => 167678)


--- trunk/Source/WebCore/ChangeLog	2014-04-22 20:05:29 UTC (rev 167677)
+++ trunk/Source/WebCore/ChangeLog	2014-04-22 20:31:47 UTC (rev 167678)
@@ -1,5 +1,17 @@
 2014-04-22  David Hyatt  <hy...@apple.com>
 
+        [New Multicolumn] widows/orphans cause assertion failures.
+        https://bugs.webkit.org/show_bug.cgi?id=131233
+
+        Reviewed by Dean Jackson.
+
+        * rendering/RenderMultiColumnSet.cpp:
+        (WebCore::RenderMultiColumnSet::recordSpaceShortage):
+        Fix an obvious bug where the space shortage is recorded twice (and the
+        if statement that kept it from being negative is accidentally ignored).
+
+2014-04-22  David Hyatt  <hy...@apple.com>
+
         [New Multicolumn] Make sure columnTranslationForOffset has the same column-span-aware
         translation that fragment collection does.
         https://bugs.webkit.org/show_bug.cgi?id=131738

Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (167677 => 167678)


--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp	2014-04-22 20:05:29 UTC (rev 167677)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp	2014-04-22 20:31:47 UTC (rev 167678)
@@ -301,8 +301,6 @@
     // order to get anywhere. Some lines actually have zero height. Ignore them.
     if (spaceShortage > 0)
         m_minSpaceShortage = spaceShortage;
-
-    m_minSpaceShortage = spaceShortage;
 }
 
 void RenderMultiColumnSet::updateLogicalWidth()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to