Changeset 143993 in webkit


Ignore:
Timestamp:
Feb 25, 2013 6:06:12 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Flexbox should ignore firstLetter pseudo element.
​https://bugs.webkit.org/show_bug.cgi?id=105126

Patch by Xueqing Huang <​huangxueqing@baidu.com> on 2013-02-25
Reviewed by Tony Chang.

Source/WebCore:

The CSS WG decided that first-line and first-letter should not
apply to flex containers.
​http://dev.w3.org/csswg/css3-flexbox/issue-cr-2012#issue-13

tests:
css3/flexbox/flexbox-ignore-firstLetter.html
css3/flexbox/flexbox-ignore-container-firstLetter.html

  • rendering/RenderBlock.cpp:

(WebCore::findFirstLetterBlock):

LayoutTests:

The CSS WG decided that first-line and first-letter should not
apply to flex containers.
​http://dev.w3.org/csswg/css3-flexbox/issues-cr-2012#issue-13

  • css3/flexbox/flexbox-ignore-container-firstLetter-expected.txt: Added.
  • css3/flexbox/flexbox-ignore-container-firstLetter.html: Added.
  • css3/flexbox/flexbox-ignore-firstLetter-expected.txt: Added.
  • css3/flexbox/flexbox-ignore-firstLetter.html: Added.
  • css3/flexbox/inline-flex-crash-expected.txt:
  • css3/flexbox/inline-flex-crash2-expected.txt:
Location:
trunk
Files:
4 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r143989 r143993  
     12013-02-25  Xueqing Huang  <huangxueqing@baidu.com>
     2
     3        Flexbox should ignore firstLetter pseudo element.
     4        https://bugs.webkit.org/show_bug.cgi?id=105126
     5
     6        Reviewed by Tony Chang.
     7
     8        The CSS WG decided that first-line and first-letter should not
     9        apply to flex containers.
     10        http://dev.w3.org/csswg/css3-flexbox/issues-cr-2012#issue-13
     11
     12        * css3/flexbox/flexbox-ignore-container-firstLetter-expected.txt: Added.
     13        * css3/flexbox/flexbox-ignore-container-firstLetter.html: Added.
     14        * css3/flexbox/flexbox-ignore-firstLetter-expected.txt: Added.
     15        * css3/flexbox/flexbox-ignore-firstLetter.html: Added.
     16        * css3/flexbox/inline-flex-crash-expected.txt:
     17        * css3/flexbox/inline-flex-crash2-expected.txt:
     18
    1192013-02-25  James Simonsen  <simonjam@chromium.org>
    220

  • trunk/LayoutTests/css3/flexbox/inline-flex-crash-expected.txt

    r125262 r143993  
    11This test passes if it doesn't crash.
    22
    3 AA
    4 
    5 ؅
     3AA؅

  • trunk/LayoutTests/css3/flexbox/inline-flex-crash2-expected.txt

    r125262 r143993  
    11This test passes if it doesn't crash.
    22
    3 AAAA
    4 
    5 A
     3AAAAA

  • trunk/Source/WebCore/ChangeLog

    r143990 r143993  
     12013-02-25  Xueqing Huang  <huangxueqing@baidu.com>
     2
     3        Flexbox should ignore firstLetter pseudo element.
     4        https://bugs.webkit.org/show_bug.cgi?id=105126
     5
     6        Reviewed by Tony Chang.
     7
     8        The CSS WG decided that first-line and first-letter should not
     9        apply to flex containers.
     10        http://dev.w3.org/csswg/css3-flexbox/issue-cr-2012#issue-13
     11
     12        tests:
     13        css3/flexbox/flexbox-ignore-firstLetter.html
     14        css3/flexbox/flexbox-ignore-container-firstLetter.html       
     15
     16        * rendering/RenderBlock.cpp:
     17        (WebCore::findFirstLetterBlock):
     18
    1192013-02-25  Simon Fraser  <simon.fraser@apple.com>
    220

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

    r143950 r143993  
    64906490    while (true) {
    64916491        bool canHaveFirstLetterRenderer = firstLetterBlock->style()->hasPseudoStyle(FIRST_LETTER)
    6492             && firstLetterBlock->canHaveGeneratedChildren();
     6492            && firstLetterBlock->canHaveGeneratedChildren() && !firstLetterBlock->isFlexibleBox();
    64936493        if (canHaveFirstLetterRenderer)
    64946494            return firstLetterBlock;
    … …  
    64966496        RenderObject* parentBlock = firstLetterBlock->parent();
    64976497        if (firstLetterBlock->isReplaced() || !parentBlock || parentBlock->firstChild() != firstLetterBlock ||
    6498             !parentBlock->isBlockFlow())
     6498            !parentBlock->isBlockFlow() || parentBlock->isFlexibleBox())
    64996499            return 0;
    65006500        firstLetterBlock = parentBlock;
Note: See TracChangeset for help on using the changeset viewer.