Changeset 143042 in webkit

Timestamp:

Feb 15, 2013 1:16:39 PM (11 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:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/flex-item-firstLine-valid-expected.txt (added)
• LayoutTests/css3/flexbox/flex-item-firstLine-valid.html (added)
• LayoutTests/css3/flexbox/flexbox-ignore-firstLine-expected.txt (added)
• LayoutTests/css3/flexbox/flexbox-ignore-firstLine.html (added)
• LayoutTests/css3/flexbox/inline-flexbox-ignore-firstLine-expected.txt (added)
• LayoutTests/css3/flexbox/inline-flexbox-ignore-firstLine.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-15  Xueqing Huang  <huangxueqing@baidu.com>
+
+        Flexbox should ignore firstLine pseudo element.
+        https://bugs.webkit.org/show_bug.cgi?id=104485
+
+        Reviewed by Tony Chang.
+
+        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.
+
 2013-02-15  Philip Rogers  <pdr@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-15  Xueqing Huang  <huangxueqing@baidu.com>
+
+        Flexbox should ignore firstLine pseudo element.
+        https://bugs.webkit.org/show_bug.cgi?id=104485
+
+        Reviewed by Tony Chang.
+
+        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):
+
 2013-02-15  Alec Flett  <alecflett@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -6434 +6434 @@
         RenderObject* parentBlock = firstLineBlock->parent();
         if (firstLineBlock->isReplaced() || firstLineBlock->isFloating() || 
-            !parentBlock || parentBlock->firstChild() != firstLineBlock || !parentBlock->isBlockFlow())
+            !parentBlock || parentBlock->firstChild() != firstLineBlock || !parentBlock->isBlockFlow() || parentBlock->isFlexibleBox())
             break;
         ASSERT_WITH_SECURITY_IMPLICATION(parentBlock->isRenderBlock());