Title: [90573] trunk
- Revision
- 90573
- Author
- m...@apple.com
- Date
- 2011-07-07 10:27:46 -0700 (Thu, 07 Jul 2011)
Log Message
<rdar://problem/9737435> Re-enable -webkit-column-break-inside: avoid
https://bugs.webkit.org/show_bug.cgi?id=64102
Reviewed by Simon Fraser.
Source/WebCore:
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::adjustForUnsplittableChild): Treat the child as unsplittable if
'-webkit-column-break-inside: avoid' was specified.
LayoutTests:
* fast/multicol/break-properties-expected.txt:
* fast/multicol/break-properties.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (90572 => 90573)
--- trunk/LayoutTests/ChangeLog 2011-07-07 17:27:33 UTC (rev 90572)
+++ trunk/LayoutTests/ChangeLog 2011-07-07 17:27:46 UTC (rev 90573)
@@ -1,3 +1,13 @@
+2011-07-07 Dan Bernstein <m...@apple.com>
+
+ <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-07 Andras Becsi <abe...@webkit.org>
[Qt]REGRESSION(r90471): It made 4 fast/notifications tests fail on Qt
Modified: trunk/LayoutTests/fast/multicol/break-properties-expected.txt (90572 => 90573)
--- trunk/LayoutTests/fast/multicol/break-properties-expected.txt 2011-07-07 17:27:33 UTC (rev 90572)
+++ trunk/LayoutTests/fast/multicol/break-properties-expected.txt 2011-07-07 17:27:46 UTC (rev 90573)
@@ -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: trunk/LayoutTests/fast/multicol/break-properties.html (90572 => 90573)
--- trunk/LayoutTests/fast/multicol/break-properties.html 2011-07-07 17:27:33 UTC (rev 90572)
+++ trunk/LayoutTests/fast/multicol/break-properties.html 2011-07-07 17:27:46 UTC (rev 90573)
@@ -32,4 +32,5 @@
testBoxPosition("break-before", 218, 8);
testBoxPosition("after-break", 428, 8);
+ testBoxPosition("no-break", 533, 8);
</script>
Modified: trunk/Source/WebCore/ChangeLog (90572 => 90573)
--- trunk/Source/WebCore/ChangeLog 2011-07-07 17:27:33 UTC (rev 90572)
+++ trunk/Source/WebCore/ChangeLog 2011-07-07 17:27:46 UTC (rev 90573)
@@ -1,3 +1,14 @@
+2011-07-07 Dan Bernstein <m...@apple.com>
+
+ <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-07 Andrey Kosyakov <ca...@chromium.org>
Web Inspector: visual regressions in network panel
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (90572 => 90573)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-07-07 17:27:33 UTC (rev 90572)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-07-07 17:27:46 UTC (rev 90573)
@@ -6038,7 +6038,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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
