Changeset 90573 in webkit
- Timestamp:
- Jul 7, 2011 10:27:46 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r90570 r90573 1 2011-07-07 Dan Bernstein <mitz@apple.com> 2 3 <rdar://problem/9737435> Re-enable -webkit-column-break-inside: avoid 4 https://bugs.webkit.org/show_bug.cgi?id=64102 5 6 Reviewed by Simon Fraser. 7 8 * fast/multicol/break-properties-expected.txt: 9 * fast/multicol/break-properties.html: 10 1 11 2011-07-07 Andras Becsi <abecsi@webkit.org> 2 12 -
trunk/LayoutTests/fast/multicol/break-properties-expected.txt
r76726 r90573 1 1 PASS: 'break-before' is at (218, 8) 2 2 PASS: 'after-break' is at (428, 8) 3 PASS: 'no-break' is at (533, 8) 3 4 -
trunk/LayoutTests/fast/multicol/break-properties.html
r76726 r90573 33 33 testBoxPosition("break-before", 218, 8); 34 34 testBoxPosition("after-break", 428, 8); 35 testBoxPosition("no-break", 533, 8); 35 36 </script> -
trunk/Source/WebCore/ChangeLog
r90569 r90573 1 2011-07-07 Dan Bernstein <mitz@apple.com> 2 3 <rdar://problem/9737435> Re-enable -webkit-column-break-inside: avoid 4 https://bugs.webkit.org/show_bug.cgi?id=64102 5 6 Reviewed by Simon Fraser. 7 8 * rendering/RenderBlock.cpp: 9 (WebCore::RenderBlock::adjustForUnsplittableChild): Treat the child as unsplittable if 10 '-webkit-column-break-inside: avoid' was specified. 11 1 12 2011-07-07 Andrey Kosyakov <caseq@chromium.org> 2 13 -
trunk/Source/WebCore/rendering/RenderBlock.cpp
r90530 r90573 6039 6039 int RenderBlock::adjustForUnsplittableChild(RenderBox* child, int logicalOffset, bool includeMargins) 6040 6040 { 6041 bool isUnsplittable = child->isReplaced() || child->scrollsOverflow() ;6041 bool isUnsplittable = child->isReplaced() || child->scrollsOverflow() || child->style()->columnBreakInside() == PBAVOID; 6042 6042 if (!isUnsplittable) 6043 6043 return logicalOffset;
Note: See TracChangeset
for help on using the changeset viewer.