Title: [91582] branches/safari-534.51-branch
Diff
Modified: branches/safari-534.51-branch/LayoutTests/ChangeLog (91581 => 91582)
--- branches/safari-534.51-branch/LayoutTests/ChangeLog 2011-07-22 18:32:15 UTC (rev 91581)
+++ branches/safari-534.51-branch/LayoutTests/ChangeLog 2011-07-22 18:42:42 UTC (rev 91582)
@@ -1,3 +1,17 @@
+2011-07-22 Lucas Forschler <[email protected]>
+
+ Merged 90573.
+
+ 2011-07-07 Dan Bernstein <[email protected]>
+
+ <rdar://problem/9737435> Re-enable -webkit-column-break-inside: avoid
+ https://bugs.webkit.org/show_bug.cgi?id=64102
+
+ Reviewed by Simon Fraser.
+
+ * fast/multicol/break-properties-expected.txt:
+ * fast/multicol/break-properties.html:
+
2011-07-21 Lucas Forschler <[email protected]>
Merged 90166.
Modified: branches/safari-534.51-branch/LayoutTests/fast/multicol/break-properties-expected.txt (91581 => 91582)
--- branches/safari-534.51-branch/LayoutTests/fast/multicol/break-properties-expected.txt 2011-07-22 18:32:15 UTC (rev 91581)
+++ branches/safari-534.51-branch/LayoutTests/fast/multicol/break-properties-expected.txt 2011-07-22 18:42:42 UTC (rev 91582)
@@ -1,3 +1,4 @@
PASS: 'break-before' is at (218, 8)
PASS: 'after-break' is at (428, 8)
+PASS: 'no-break' is at (533, 8)
Modified: branches/safari-534.51-branch/LayoutTests/fast/multicol/break-properties.html (91581 => 91582)
--- branches/safari-534.51-branch/LayoutTests/fast/multicol/break-properties.html 2011-07-22 18:32:15 UTC (rev 91581)
+++ branches/safari-534.51-branch/LayoutTests/fast/multicol/break-properties.html 2011-07-22 18:42:42 UTC (rev 91582)
@@ -32,4 +32,5 @@
testBoxPosition("break-before", 218, 8);
testBoxPosition("after-break", 428, 8);
+ testBoxPosition("no-break", 533, 8);
</script>
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (91581 => 91582)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-22 18:32:15 UTC (rev 91581)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-22 18:42:42 UTC (rev 91582)
@@ -1,3 +1,18 @@
+2011-07-22 Lucas Forschler <[email protected]>
+
+ Merged 90573.
+
+ 2011-07-07 Dan Bernstein <[email protected]>
+
+ <rdar://problem/9737435> Re-enable -webkit-column-break-inside: avoid
+ https://bugs.webkit.org/show_bug.cgi?id=64102
+
+ Reviewed by Simon Fraser.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::adjustForUnsplittableChild): Treat the child as unsplittable if
+ '-webkit-column-break-inside: avoid' was specified.
+
2011-07-21 Lucas Forschler <[email protected]>
Merged 90486.
Modified: branches/safari-534.51-branch/Source/WebCore/rendering/RenderBlock.cpp (91581 => 91582)
--- branches/safari-534.51-branch/Source/WebCore/rendering/RenderBlock.cpp 2011-07-22 18:32:15 UTC (rev 91581)
+++ branches/safari-534.51-branch/Source/WebCore/rendering/RenderBlock.cpp 2011-07-22 18:42:42 UTC (rev 91582)
@@ -6047,7 +6047,7 @@
int RenderBlock::adjustForUnsplittableChild(RenderBox* child, int logicalOffset, bool includeMargins)
{
- bool isUnsplittable = child->isReplaced() || child->scrollsOverflow();
+ bool isUnsplittable = child->isReplaced() || child->scrollsOverflow() || child->style()->columnBreakInside() == PBAVOID;
if (!isUnsplittable)
return logicalOffset;
int childLogicalHeight = logicalHeightForChild(child) + (includeMargins ? marginBeforeForChild(child) + marginAfterForChild(child) : 0);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
