Changeset 207630 in webkit


Ignore:
Timestamp:
Oct 20, 2016 12:09:30 PM (8 years ago)
Author:
dino@apple.com
Message:

Support CSS Shapes Level 1 without a prefix
​https://bugs.webkit.org/show_bug.cgi?id=163709
<rdar://problem/28859369>

Reviewed by Myles Maxfield.

Source/WebCore:

Support the unprefixed form of CSS Shapes, now that
it is in CR.

We have a few failing tests:

Tests: imported/w3c/csswg-test/css-shapes-1

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

  • css/CSSPropertyNames.in:
  • css/CSSValueKeywords.in:
  • css/parser/CSSParser.cpp:

(WebCore::isSimpleLengthPropertyID):
(WebCore::CSSParser::parseValue):

  • css/parser/CSSPropertyParser.cpp:

(WebCore::CSSPropertyParser::parseSingleValue):

  • page/animation/CSSPropertyAnimation.cpp:

(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):

Source/WebInspectorUI:

Replace -webkit-shape-outside with shape-outside.

  • UserInterface/Models/CSSKeywordCompletions.js:

LayoutTests:

Unskip all but a couple of tests.

Location:
trunk
Files:
91 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r207621 r207630  
     12016-10-19  Dean Jackson  <dino@apple.com>
     2
     3        Support CSS Shapes Level 1 without a prefix
     4        https://bugs.webkit.org/show_bug.cgi?id=163709
     5        <rdar://problem/28859369>
     6
     7        Reviewed by Myles Maxfield.
     8
     9        Unskip all but a couple of tests.
     10
     11        * TestExpectations:
     12
    1132016-10-20  Jer Noble  <jer.noble@apple.com>
    214

  • trunk/LayoutTests/TestExpectations

    r207573 r207630  
    2727media/controls/ipad [ Skip ]
    2828fast/text-autosizing [ Skip ]
    29 
    30 imported/w3c/csswg-test/css-shapes-1 [ Skip ]
    3129
    3230fast/forms/attributed-strings.html [ Skip ]
    … …  
    989987fast/text/letterpress-different.html [ ImageOnlyFailure ]
    990988
     989# CSS Shapes tests
     990webkit.org/b/163706 imported/w3c/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-010.html [ Skip ]
     991webkit.org/b/163706 imported/w3c/csswg-test/css-shapes-1/shape-outside/shape-image/shape-image-024.html [ Skip ]
     992imported/blink/http/tests/security/shape-image-cors-disallow-origin.html [ ImageOnlyFailure ]
     993imported/blink/http/tests/security/shape-image-cors-port.html [ ImageOnlyFailure ]

  • trunk/Source/WebCore/ChangeLog

    r207629 r207630  
     12016-10-19  Dean Jackson  <dino@apple.com>
     2
     3        Support CSS Shapes Level 1 without a prefix
     4        https://bugs.webkit.org/show_bug.cgi?id=163709
     5        <rdar://problem/28859369>
     6
     7        Reviewed by Myles Maxfield.
     8
     9        Support the unprefixed form of CSS Shapes, now that
     10        it is in CR.
     11
     12        We have a few failing tests:
     13
     14        - Some image-based shaping failures, now skipped.
     15          https://bugs.webkit.org/show_bug.cgi?id=163706
     16
     17        - Some false negatives, where my understanding
     18          of the CSS OM seems to suggest that the W3C tests
     19          are incorrect.
     20          https://bugs.webkit.org/show_bug.cgi?id=163708
     21
     22        Tests: imported/w3c/csswg-test/css-shapes-1
     23
     24        * css/CSSComputedStyleDeclaration.cpp:
     25        (WebCore::ComputedStyleExtractor::propertyValue):
     26        * css/CSSPropertyNames.in:
     27        * css/CSSValueKeywords.in:
     28        * css/parser/CSSParser.cpp:
     29        (WebCore::isSimpleLengthPropertyID):
     30        (WebCore::CSSParser::parseValue):
     31        * css/parser/CSSPropertyParser.cpp:
     32        (WebCore::CSSPropertyParser::parseSingleValue):
     33        * page/animation/CSSPropertyAnimation.cpp:
     34        (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
     35
    1362016-10-20  Dave Hyatt  <hyatt@apple.com>
    237

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r207535 r207630  
    383383    CSSPropertyWebkitTouchCallout,
    384384#endif
    385     CSSPropertyWebkitShapeOutside,
     385    CSSPropertyShapeOutside,
    386386#if ENABLE(TOUCH_EVENTS)
    387387    CSSPropertyWebkitTapHighlightColor,
    … …  
    414414    CSSPropertyWebkitRegionFragment,
    415415#endif
    416     CSSPropertyWebkitShapeMargin,
    417     CSSPropertyWebkitShapeImageThreshold,
     416    CSSPropertyShapeMargin,
     417    CSSPropertyShapeImageThreshold,
    418418    CSSPropertyBufferedRendering,
    419419    CSSPropertyClipPath,
    … …  
    36883688            return cssValuePool.createValue(style->regionFragment());
    36893689#endif
    3690         case CSSPropertyWebkitShapeMargin:
     3690        case CSSPropertyShapeMargin:
    36913691            return cssValuePool.createValue(style->shapeMargin(), *style);
    3692         case CSSPropertyWebkitShapeImageThreshold:
     3692        case CSSPropertyShapeImageThreshold:
    36933693            return cssValuePool.createValue(style->shapeImageThreshold(), CSSPrimitiveValue::CSS_NUMBER);
    3694         case CSSPropertyWebkitShapeOutside:
     3694        case CSSPropertyShapeOutside:
    36953695            return shapePropertyValue(*style, style->shapeOutside());
    36963696        case CSSPropertyFilter:

  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r207499 r207630  
    655655-webkit-region-break-inside [Initial=initialBreakInside, NameForMethods=BreakInside, Converter=RegionBreakInside]
    656656#endif
    657 -webkit-shape-outside [Converter=ShapeValue]
    658 -webkit-shape-margin [Converter=Length]
    659 -webkit-shape-image-threshold [Converter=NumberOrAuto<float>]
     657shape-outside [Converter=ShapeValue]
     658-webkit-shape-outside = shape-outside
     659shape-margin [Converter=Length]
     660-webkit-shape-margin = shape-margin
     661shape-image-threshold [Converter=NumberOrAuto<float>]
     662-webkit-shape-image-threshold = shape-image-threshold
    660663#if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
    661664max-zoom [SkipBuilder]

  • trunk/Source/WebCore/css/CSSValueKeywords.in

    r207499 r207630  
    10781078-webkit-optimize-contrast
    10791079
    1080 // -webkit-shape-outside
     1080// shape-outside
    10811081nonzero
    10821082evenodd

  • trunk/Source/WebCore/css/parser/CSSParser.cpp

    r207622 r207630  
    501501    case CSSPropertyGridRowGap:
    502502#endif
    503     case CSSPropertyWebkitShapeMargin:
     503    case CSSPropertyShapeMargin:
    504504        acceptsNegativeNumbers = false;
    505505        return true;
    … …  
    29962996        parsedValue = parseClipPath();
    29972997        break;
    2998     case CSSPropertyWebkitShapeOutside:
     2998    case CSSPropertyShapeOutside:
    29992999        parsedValue = parseShapeProperty(propId);
    30003000        break;
    3001     case CSSPropertyWebkitShapeMargin:
     3001    case CSSPropertyShapeMargin:
    30023002        validPrimitive = !id && validateUnit(valueWithCalculation, FLength | FPercent | FNonNeg);
    30033003        break;
    3004     case CSSPropertyWebkitShapeImageThreshold:
     3004    case CSSPropertyShapeImageThreshold:
    30053005        validPrimitive = !id && validateUnit(valueWithCalculation, FNumber);
    30063006        break;

  • trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp

    r207629 r207630  
    31773177    case CSSPropertyGridRowGap:
    31783178        return consumeLength(m_range, m_context.mode, ValueRangeNonNegative);
    3179     case CSSPropertyWebkitShapeMargin:
     3179    case CSSPropertyShapeMargin:
    31803180        return consumeLengthOrPercent(m_range, m_context.mode, ValueRangeNonNegative);
    3181     case CSSPropertyWebkitShapeImageThreshold:
     3181    case CSSPropertyShapeImageThreshold:
    31823182        return consumeNumber(m_range, ValueRangeAll);
    31833183    case CSSPropertyWebkitBoxOrdinalGroup:
    … …  
    33363336    case CSSPropertyVerticalAlign:
    33373337        return consumeVerticalAlign(m_range, m_context.mode);
    3338     case CSSPropertyWebkitShapeOutside:
     3338    case CSSPropertyShapeOutside:
    33393339        return consumeShapeOutside(m_range, m_context);
    33403340    case CSSPropertyWebkitClipPath:

  • trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp

    r207499 r207630  
    14331433        new PropertyWrapperClipPath(CSSPropertyWebkitClipPath, &RenderStyle::clipPath, &RenderStyle::setClipPath),
    14341434
    1435         new PropertyWrapperShape(CSSPropertyWebkitShapeOutside, &RenderStyle::shapeOutside, &RenderStyle::setShapeOutside),
    1436         new LengthPropertyWrapper<Length>(CSSPropertyWebkitShapeMargin, &RenderStyle::shapeMargin, &RenderStyle::setShapeMargin),
    1437         new PropertyWrapper<float>(CSSPropertyWebkitShapeImageThreshold, &RenderStyle::shapeImageThreshold, &RenderStyle::setShapeImageThreshold),
     1435        new PropertyWrapperShape(CSSPropertyShapeOutside, &RenderStyle::shapeOutside, &RenderStyle::setShapeOutside),
     1436        new LengthPropertyWrapper<Length>(CSSPropertyShapeMargin, &RenderStyle::shapeMargin, &RenderStyle::setShapeMargin),
     1437        new PropertyWrapper<float>(CSSPropertyShapeImageThreshold, &RenderStyle::shapeImageThreshold, &RenderStyle::setShapeImageThreshold),
    14381438
    14391439        new PropertyWrapperVisitedAffectedColor(CSSPropertyColumnRuleColor, MaybeInvalidColor, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::visitedLinkColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor),

  • trunk/Source/WebInspectorUI/ChangeLog

    r207553 r207630  
     12016-10-19  Dean Jackson  <dino@apple.com>
     2
     3        Support CSS Shapes Level 1 without a prefix
     4        https://bugs.webkit.org/show_bug.cgi?id=163709
     5        <rdar://problem/28859369>
     6
     7        Reviewed by Myles Maxfield.
     8
     9        Replace -webkit-shape-outside with shape-outside.
     10
     11        * UserInterface/Models/CSSKeywordCompletions.js:
     12
    1132016-10-19  Aaron Chu  <aaron_chu@apple.com>
    214

  • trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js

    r205426 r207630  
    609609        "none", "url()", "circle()", "ellipse()", "inset()", "polygon()", "margin-box", "border-box", "padding-box", "content-box"
    610610    ],
    611     "-webkit-shape-outside": [
     611    "shape-outside": [
    612612        "none", "url()", "circle()", "ellipse()", "inset()", "polygon()", "margin-box", "border-box", "padding-box", "content-box"
    613613    ],
Note: See TracChangeset for help on using the changeset viewer.