Changeset 112587 in webkit
- Timestamp:
- Mar 29, 2012 3:21:01 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r112586 r112587 1 2012-03-29 Bear Travis <betravis@adobe.com> 2 3 Update CSS Exclusion wrap-flow values left & right to start & end 4 https://bugs.webkit.org/show_bug.cgi?id=82366 5 6 Updating test values for the wrap-flow and wrap shorthand property 7 8 Reviewed by Andreas Kling. 9 10 * fast/exclusions/script-tests/wrap-flow-parsing.js: 11 * fast/exclusions/script-tests/wrap-parsing.js: 12 * fast/exclusions/wrap-flow-parsing-expected.txt: 13 * fast/exclusions/wrap-parsing-expected.txt: 14 1 15 2012-03-29 Enrica Casucci <enrica@apple.com> 2 16 -
trunk/LayoutTests/fast/exclusions/script-tests/wrap-flow-parsing.js
r100570 r112587 35 35 shouldBeEqualToString('test("-webkit-wrap-flow: auto")', "auto"); 36 36 shouldBeEqualToString('test("-webkit-wrap-flow: both")', "both"); 37 shouldBeEqualToString('test("-webkit-wrap-flow: left")', "left");38 shouldBeEqualToString('test("-webkit-wrap-flow: right")', "right");37 shouldBeEqualToString('test("-webkit-wrap-flow: start")', "start"); 38 shouldBeEqualToString('test("-webkit-wrap-flow: end")', "end"); 39 39 shouldBeEqualToString('test("-webkit-wrap-flow: maximum")', "maximum"); 40 40 shouldBeEqualToString('test("-webkit-wrap-flow: clear")', "clear"); … … 49 49 shouldBeEqualToString('testComputedStyle("\'string\'")', "auto"); 50 50 51 shouldBeEqualToString('testNotInherited("auto", " left")', "left");52 shouldBeEqualToString('testNotInherited(" right", "auto")', "auto");51 shouldBeEqualToString('testNotInherited("auto", "start")', "start"); 52 shouldBeEqualToString('testNotInherited("end", "auto")', "auto"); 53 53 shouldBeEqualToString('testNotInherited("both", "clear")', "clear"); -
trunk/LayoutTests/fast/exclusions/script-tests/wrap-parsing.js
r101078 r112587 19 19 20 20 shouldBeEqualToString('test("-webkit-wrap: auto")', "auto"); 21 shouldBeEqualToString('test("-webkit-wrap: left 1px")', "left 1px");22 shouldBeEqualToString('test("-webkit-wrap: right 1px 2px")', "right1px 2px");21 shouldBeEqualToString('test("-webkit-wrap: start 1px")', "start 1px"); 22 shouldBeEqualToString('test("-webkit-wrap: end 1px 2px")', "end 1px 2px"); 23 23 shouldBeEqualToString('test("-webkit-wrap: 5px both 10pt;")', "both 5px 10pt"); 24 24 shouldBeEqualToString('test("-webkit-wrap: 2px 3px clear;")', "clear 2px 3px"); … … 31 31 shouldBeEqualToString('test("-webkit-wrap: auto both;")', ""); 32 32 shouldBeEqualToString('test("-webkit-wrap: auto 1px -10px;")', ""); 33 shouldBeEqualToString('test("-webkit-wrap: -5px left;")', "");34 shouldBeEqualToString('test("-webkit-wrap: 5px right\'string\';")', "");33 shouldBeEqualToString('test("-webkit-wrap: -5px start;")', ""); 34 shouldBeEqualToString('test("-webkit-wrap: 5px end \'string\';")', ""); 35 35 36 36 shouldBeEqualToString('testComputedStyle("auto")', "auto 0px 0px"); 37 shouldBeEqualToString('testComputedStyle(" left 1px")', "left 1px 0px");38 shouldBeEqualToString('testComputedStyle(" right 1px 2px")', "right1px 2px");37 shouldBeEqualToString('testComputedStyle("start 1px")', "start 1px 0px"); 38 shouldBeEqualToString('testComputedStyle("end 1px 2px")', "end 1px 2px"); 39 39 shouldBeEqualToString('testComputedStyle("5px maximum")', "maximum 5px 0px"); 40 40 shouldBeEqualToString('testComputedStyle("5px")', "auto 5px 0px"); -
trunk/LayoutTests/fast/exclusions/wrap-flow-parsing-expected.txt
r100570 r112587 6 6 PASS test("-webkit-wrap-flow: auto") is "auto" 7 7 PASS test("-webkit-wrap-flow: both") is "both" 8 PASS test("-webkit-wrap-flow: left") is "left"9 PASS test("-webkit-wrap-flow: right") is "right"8 PASS test("-webkit-wrap-flow: start") is "start" 9 PASS test("-webkit-wrap-flow: end") is "end" 10 10 PASS test("-webkit-wrap-flow: maximum") is "maximum" 11 11 PASS test("-webkit-wrap-flow: clear") is "clear" … … 17 17 PASS testComputedStyle("5") is "auto" 18 18 PASS testComputedStyle("'string'") is "auto" 19 PASS testNotInherited("auto", " left") is "left"20 PASS testNotInherited(" right", "auto") is "auto"19 PASS testNotInherited("auto", "start") is "start" 20 PASS testNotInherited("end", "auto") is "auto" 21 21 PASS testNotInherited("both", "clear") is "clear" 22 22 PASS successfullyParsed is true -
trunk/LayoutTests/fast/exclusions/wrap-parsing-expected.txt
r101078 r112587 5 5 6 6 PASS test("-webkit-wrap: auto") is "auto" 7 PASS test("-webkit-wrap: left 1px") is "left 1px"8 PASS test("-webkit-wrap: right 1px 2px") is "right1px 2px"7 PASS test("-webkit-wrap: start 1px") is "start 1px" 8 PASS test("-webkit-wrap: end 1px 2px") is "end 1px 2px" 9 9 PASS test("-webkit-wrap: 5px both 10pt;") is "both 5px 10pt" 10 10 PASS test("-webkit-wrap: 2px 3px clear;") is "clear 2px 3px" … … 16 16 PASS test("-webkit-wrap: auto both;") is "" 17 17 PASS test("-webkit-wrap: auto 1px -10px;") is "" 18 PASS test("-webkit-wrap: -5px left;") is ""19 PASS test("-webkit-wrap: 5px right'string';") is ""18 PASS test("-webkit-wrap: -5px start;") is "" 19 PASS test("-webkit-wrap: 5px end 'string';") is "" 20 20 PASS testComputedStyle("auto") is "auto 0px 0px" 21 PASS testComputedStyle(" left 1px") is "left 1px 0px"22 PASS testComputedStyle(" right 1px 2px") is "right1px 2px"21 PASS testComputedStyle("start 1px") is "start 1px 0px" 22 PASS testComputedStyle("end 1px 2px") is "end 1px 2px" 23 23 PASS testComputedStyle("5px maximum") is "maximum 5px 0px" 24 24 PASS testComputedStyle("5px") is "auto 5px 0px" -
trunk/Source/WebCore/ChangeLog
r112584 r112587 1 2012-03-29 Bear Travis <betravis@adobe.com> 2 3 Update CSS Exclusion wrap-flow values left & right to start & end 4 https://bugs.webkit.org/show_bug.cgi?id=82366 5 6 http://dev.w3.org/csswg/css3-exclusions/ 7 -webkit-wrap-flow now takes the values start and end rather than 8 left and right. Updating the code to reflect this. Functionality 9 is covered by existing tests. 10 11 Reviewed by Andreas Kling. 12 13 * css/CSSParser.cpp: 14 (WebCore::isValidKeywordPropertyAndValue): 15 * css/CSSPrimitiveValueMappings.h: 16 (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): 17 (WebCore::CSSPrimitiveValue::operator WrapFlow): 18 * rendering/style/RenderStyleConstants.h: 19 1 20 2012-03-29 Dirk Pranke <dpranke@chromium.org> 2 21 -
trunk/Source/WebCore/css/CSSParser.cpp
r112537 r112587 776 776 break; 777 777 case CSSPropertyWebkitWrapFlow: 778 if (valueID == CSSValueAuto || valueID == CSSValueBoth || valueID == CSSValue Left || valueID == CSSValueRight|| valueID == CSSValueMaximum || valueID == CSSValueClear)778 if (valueID == CSSValueAuto || valueID == CSSValueBoth || valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueMaximum || valueID == CSSValueClear) 779 779 return true; 780 780 break; -
trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h
r112301 r112587 3705 3705 m_value.ident = CSSValueBoth; 3706 3706 break; 3707 case WrapFlow Left:3708 m_value.ident = CSSValue Left;3709 break; 3710 case WrapFlow Right:3711 m_value.ident = CSSValue Right;3707 case WrapFlowStart: 3708 m_value.ident = CSSValueStart; 3709 break; 3710 case WrapFlowEnd: 3711 m_value.ident = CSSValueEnd; 3712 3712 break; 3713 3713 case WrapFlowMaximum: … … 3727 3727 case CSSValueBoth: 3728 3728 return WrapFlowBoth; 3729 case CSSValue Left:3730 return WrapFlow Left;3731 case CSSValue Right:3732 return WrapFlow Right;3729 case CSSValueStart: 3730 return WrapFlowStart; 3731 case CSSValueEnd: 3732 return WrapFlowEnd; 3733 3733 case CSSValueMaximum: 3734 3734 return WrapFlowMaximum; -
trunk/Source/WebCore/rendering/style/RenderStyleConstants.h
r111342 r112587 460 460 enum LineAlign { LineAlignNone, LineAlignEdges }; 461 461 462 enum WrapFlow { WrapFlowAuto, WrapFlowBoth, WrapFlow Left, WrapFlowRight, WrapFlowMaximum, WrapFlowClear };462 enum WrapFlow { WrapFlowAuto, WrapFlowBoth, WrapFlowStart, WrapFlowEnd, WrapFlowMaximum, WrapFlowClear }; 463 463 464 464 enum WrapThrough { WrapThroughWrap, WrapThroughNone };
Note: See TracChangeset
for help on using the changeset viewer.