Changeset 68897 in webkit


Ignore:
Timestamp:
Oct 1, 2010 10:43:59 AM (14 years ago)
Author:
hyatt@apple.com
Message:

​https://bugs.webkit.org/show_bug.cgi?id=46995, make direction propagate up to the viewport from the root element.

Reviewed by Dan Bernstein.

WebCore:

Added fast/css/rtl-to-viewport.html

  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::styleForDocument):

  • rendering/RenderBox.cpp:

(WebCore::RenderBox::styleDidChange):

LayoutTests:

  • fast/css/rtl-to-viewport.html: Added.
  • platform/mac/fast/css/rtl-to-viewport-expected.checksum: Added.
  • platform/mac/fast/css/rtl-to-viewport-expected.png: Added.
  • platform/mac/fast/css/rtl-to-viewport-expected.txt: Added.
Location:
trunk
Files:
4 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r68896 r68897  
     12010-10-01  David Hyatt  <hyatt@apple.com>
     2
     3        Reviewed by Dan Bernstein.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=46995, make direction propagate up to the viewport from the root element.
     6
     7        * fast/css/rtl-to-viewport.html: Added.
     8        * platform/mac/fast/css/rtl-to-viewport-expected.checksum: Added.
     9        * platform/mac/fast/css/rtl-to-viewport-expected.png: Added.
     10        * platform/mac/fast/css/rtl-to-viewport-expected.txt: Added.
     11
    1122010-10-01  Alexey Proskuryakov  <ap@apple.com>
    213

  • trunk/WebCore/ChangeLog

    r68896 r68897  
     12010-10-01  David Hyatt  <hyatt@apple.com>
     2
     3        Reviewed by Dan Bernstein.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=46995, make direction propagate up to the viewport from the root element.
     6
     7        Added fast/css/rtl-to-viewport.html
     8
     9        * css/CSSStyleSelector.cpp:
     10        (WebCore::CSSStyleSelector::styleForDocument):
     11        * rendering/RenderBox.cpp:
     12        (WebCore::RenderBox::styleDidChange):
     13
    1142010-10-01  Alexey Proskuryakov  <ap@apple.com>
    215

  • trunk/WebCore/css/CSSStyleSelector.cpp

    r68817 r68897  
    11081108   
    11091109    Element* docElement = document->documentElement();
    1110     if (docElement && docElement->renderer())
     1110    if (docElement && docElement->renderer()) {
     1111        // Use the direction and block-flow of the document element to set the
     1112        // viewport's direction and block-flow.
    11111113        documentStyle->setBlockFlow(docElement->renderer()->style()->blockFlow());
     1114        documentStyle->setDirection(docElement->renderer()->style()->direction());
     1115    }
    11121116
    11131117    FontDescription fontDescription;

  • trunk/WebCore/rendering/RenderBox.cpp

    r68817 r68897  
    301301    if (isBody())
    302302        document()->setTextColor(style()->visitedDependentColor(CSSPropertyColor));
    303     else if (oldStyle && isRoot() && oldStyle->blockFlow() != style()->blockFlow()) {
    304         // Propagate the new block flow up to the RenderView.
     303    else if (isRoot() && (!oldStyle || oldStyle->blockFlow() != style()->blockFlow() || oldStyle->direction() != style()->direction())) {
     304        // Propagate the new block flow and direction up to the RenderView.
     305        // FIXME: WinIE seems to propagate from the <body> as well.  We may want to consider doing that at some point.
    305306        RenderView* viewRenderer = view();
    306         viewRenderer->style()->setBlockFlow(style()->blockFlow());
    307         viewRenderer->setNeedsLayoutAndPrefWidthsRecalc();
     307        RenderStyle* viewStyle = viewRenderer->style();
     308        if (viewStyle->blockFlow() != style()->blockFlow() || viewStyle->direction() != style()->direction()) {
     309            viewStyle->setBlockFlow(style()->blockFlow());
     310            viewStyle->setDirection(style()->direction());
     311            viewRenderer->setNeedsLayoutAndPrefWidthsRecalc();
     312        }
    308313    }
    309314}
Note: See TracChangeset for help on using the changeset viewer.