Changeset 143042 in webkit


Ignore:
Timestamp:
Feb 15, 2013, 1:16:39 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

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

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

Source/WebCore:

Spec[1] said that "None of the properties defined in this module
apply to '::first-line' or '::first-letter' pseudo-elements." and
css2[2] define "The :first-line pseudo-element can only be attached
to a block container element."
[1]​http://dev.w3.org/csswg/css3-flexbox/#display-flex
[2]​http://www.w3.org/TR/CSS2/selector.html#first-line-pseudo

tests:
css3/flexbox/flexbox-ignore-firstLine.html
css3/flexbox/flexitem-firstLine-valid.html
css3/flexbox/inline-flexbox-ignore-firstLine.html

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::firstLineBlock):

LayoutTests:

Spec[1] said that "None of the properties defined in this module
apply to '::first-line' or '::first-letter' pseudo-elements." and
css2[2] define "The :first-line pseudo-element can only be attached
to a block container element."
[1]​http://dev.w3.org/csswg/css3-flexbox/#display-flex
[2]​http://www.w3.org/TR/CSS2/selector.html#first-line-pseudo

some case by Kenny Lu <​kanghaol@oupeng.com>

  • css3/flexbox/flex-item-firstLine-valid-expected.txt: Added.
  • css3/flexbox/flex-item-firstLine-valid.html: Added.
  • css3/flexbox/flexbox-ignore-firstLine-expected.txt: Added.
  • css3/flexbox/flexbox-ignore-firstLine.html: Added.
  • css3/flexbox/inline-flexbox-ignore-firstLine-expected.txt: Added.
  • css3/flexbox/inline-flexbox-ignore-firstLine.html: Added.
Location:
trunk
Files:
6 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r143036 r143042  
     12013-02-15  Xueqing Huang  <huangxueqing@baidu.com>
     2
     3        Flexbox should ignore firstLine pseudo element.
     4        https://bugs.webkit.org/show_bug.cgi?id=104485
     5
     6        Reviewed by Tony Chang.
     7
     8        Spec[1] said that "None of the properties defined in this module
     9        apply to '::first-line' or '::first-letter' pseudo-elements." and
     10        css2[2] define "The :first-line pseudo-element can only be attached
     11        to a block container element."
     12        [1]http://dev.w3.org/csswg/css3-flexbox/#display-flex
     13        [2]http://www.w3.org/TR/CSS2/selector.html#first-line-pseudo
     14
     15        some case by Kenny Lu <kanghaol@oupeng.com>
     16        * css3/flexbox/flex-item-firstLine-valid-expected.txt: Added.
     17        * css3/flexbox/flex-item-firstLine-valid.html: Added.
     18        * css3/flexbox/flexbox-ignore-firstLine-expected.txt: Added.
     19        * css3/flexbox/flexbox-ignore-firstLine.html: Added.
     20        * css3/flexbox/inline-flexbox-ignore-firstLine-expected.txt: Added.
     21        * css3/flexbox/inline-flexbox-ignore-firstLine.html: Added.
     22
    1232013-02-15  Philip Rogers  <pdr@google.com>
    224

  • trunk/Source/WebCore/ChangeLog

    r143037 r143042  
     12013-02-15  Xueqing Huang  <huangxueqing@baidu.com>
     2
     3        Flexbox should ignore firstLine pseudo element.
     4        https://bugs.webkit.org/show_bug.cgi?id=104485
     5
     6        Reviewed by Tony Chang.
     7
     8        Spec[1] said that "None of the properties defined in this module
     9        apply to '::first-line' or '::first-letter' pseudo-elements." and
     10        css2[2] define "The :first-line pseudo-element can only be attached
     11        to a block container element."
     12        [1]http://dev.w3.org/csswg/css3-flexbox/#display-flex
     13        [2]http://www.w3.org/TR/CSS2/selector.html#first-line-pseudo
     14
     15        tests:
     16        css3/flexbox/flexbox-ignore-firstLine.html
     17        css3/flexbox/flexitem-firstLine-valid.html
     18        css3/flexbox/inline-flexbox-ignore-firstLine.html
     19
     20        * rendering/RenderBlock.cpp:
     21        (WebCore::RenderBlock::firstLineBlock):
     22
    1232013-02-15  Alec Flett  <alecflett@chromium.org>
    224

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

    r142982 r143042  
    64346434        RenderObject* parentBlock = firstLineBlock->parent();
    64356435        if (firstLineBlock->isReplaced() || firstLineBlock->isFloating() ||
    6436             !parentBlock || parentBlock->firstChild() != firstLineBlock || !parentBlock->isBlockFlow())
     6436            !parentBlock || parentBlock->firstChild() != firstLineBlock || !parentBlock->isBlockFlow() || parentBlock->isFlexibleBox())
    64376437            break;
    64386438        ASSERT_WITH_SECURITY_IMPLICATION(parentBlock->isRenderBlock());
Note: See TracChangeset for help on using the changeset viewer.