Changeset 97888 in webkit


Ignore:
Timestamp:
Oct 19, 2011 3:42:12 PM (13 years ago)
Author:
mitz@apple.com
Message:

Incorrect pagination in flipped-blocks writing modes with border/padding before
​https://bugs.webkit.org/show_bug.cgi?id=70444

Reviewed by Darin Adler.

Source/WebCore:

Test: fast/multicol/flipped-blocks-border-after.html

  • rendering/LayoutState.cpp:

(WebCore::LayoutState::LayoutState): Account for flipped blocks when adjusting the page offset.

LayoutTests:

  • fast/multicol/flipped-blocks-border-after-expected.png: Added.
  • fast/multicol/flipped-blocks-border-after-expected.txt: Added.
  • fast/multicol/flipped-blocks-border-after.html: Added.
Location:
trunk
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r97886 r97888  
     12011-10-19  Dan Bernstein  <mitz@apple.com>
     2
     3        Incorrect pagination in flipped-blocks writing modes with border/padding before
     4        https://bugs.webkit.org/show_bug.cgi?id=70444
     5
     6        Reviewed by Darin Adler.
     7
     8        * fast/multicol/flipped-blocks-border-after-expected.png: Added.
     9        * fast/multicol/flipped-blocks-border-after-expected.txt: Added.
     10        * fast/multicol/flipped-blocks-border-after.html: Added.
     11
    1122011-10-19  Beth Dakin  <bdakin@apple.com>
    213

  • trunk/Source/WebCore/ChangeLog

    r97886 r97888  
     12011-10-19  Dan Bernstein  <mitz@apple.com>
     2
     3        Incorrect pagination in flipped-blocks writing modes with border/padding before
     4        https://bugs.webkit.org/show_bug.cgi?id=70444
     5
     6        Reviewed by Darin Adler.
     7
     8        Test: fast/multicol/flipped-blocks-border-after.html
     9
     10        * rendering/LayoutState.cpp:
     11        (WebCore::LayoutState::LayoutState): Account for flipped blocks when adjusting the page offset.
     12
    1132011-10-19  Beth Dakin  <bdakin@apple.com>
    214

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

    r97289 r97888  
    8686    if (pageLogicalHeight || m_columnInfo) {
    8787        m_pageLogicalHeight = pageLogicalHeight;
    88         m_pageOffset = LayoutSize(m_layoutOffset.width() + renderer->borderLeft() + renderer->paddingLeft(),
    89                                m_layoutOffset.height() + renderer->borderTop() + renderer->paddingTop());
     88        bool isFlipped = renderer->style()->isFlippedBlocksWritingMode();
     89        m_pageOffset = LayoutSize(m_layoutOffset.width() + (!isFlipped ? renderer->borderLeft() + renderer->paddingLeft() : renderer->borderRight() + renderer->paddingRight()),
     90                               m_layoutOffset.height() + (!isFlipped ? renderer->borderTop() + renderer->paddingTop() : renderer->borderBottom() + renderer->paddingBottom()));
    9091        m_pageLogicalHeightChanged = pageLogicalHeightChanged;
    9192    } else {
Note: See TracChangeset for help on using the changeset viewer.