Changeset 90573 in webkit


Ignore:
Timestamp:
Jul 7, 2011 10:27:46 AM (13 years ago)
Author:
mitz@apple.com
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:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r90570 r90573  
     12011-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
    1112011-07-07  Andras Becsi  <abecsi@webkit.org>
    212

  • trunk/LayoutTests/fast/multicol/break-properties-expected.txt

    r76726 r90573  
    11PASS: 'break-before' is at (218, 8)
    22PASS: 'after-break' is at (428, 8)
     3PASS: 'no-break' is at (533, 8)
    34

  • trunk/LayoutTests/fast/multicol/break-properties.html

    r76726 r90573  
    3333    testBoxPosition("break-before", 218, 8);
    3434    testBoxPosition("after-break", 428, 8);
     35    testBoxPosition("no-break", 533, 8);
    3536</script>

  • trunk/Source/WebCore/ChangeLog

    r90569 r90573  
     12011-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
    1122011-07-07  Andrey Kosyakov  <caseq@chromium.org>
    213

  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r90530 r90573  
    60396039int RenderBlock::adjustForUnsplittableChild(RenderBox* child, int logicalOffset, bool includeMargins)
    60406040{
    6041     bool isUnsplittable = child->isReplaced() || child->scrollsOverflow();
     6041    bool isUnsplittable = child->isReplaced() || child->scrollsOverflow() || child->style()->columnBreakInside() == PBAVOID;
    60426042    if (!isUnsplittable)
    60436043        return logicalOffset;
Note: See TracChangeset for help on using the changeset viewer.