Changeset 188512 in webkit


Ignore:
Timestamp:
Aug 15, 2015, 10:59:05 AM (10 years ago)
Author:
Simon Fraser
Message:

Implement parsing for CSS will-change
​https://bugs.webkit.org/show_bug.cgi?id=148052

Reviewed by Dean Jackson.

Source/WebCore:

Syntax is

will-change: auto | <animateable-feature>#

where

<animateable-feature> = scroll-position | contents | <custom-ident>

To support this, add WillChangeData which stores a vector of "feature"
and CSS property squished into 16 bits. This is stored in rareNonInheritedData.
If null or an empty list, the property value is 'auto'. The list preserves
unknown properties.

Test: fast/css/will-change-parsing.html

  • CMakeLists.txt:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::getWillChangePropertyValue):
(WebCore::ComputedStyleExtractor::propertyValue):

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::isValidGridPositionCustomIdent): Renamed from isValidCustomIdent(),
since it's grid-specific.
(WebCore::CSSParser::parseIntegerOrCustomIdentFromGridPosition):
(WebCore::valueIsCSSKeyword): Returns true for the "CSS-wide" keywords like
"initial", "inherit" and "default".
(WebCore::CSSParser::parseFontFamily):
(WebCore::isValidWillChangeAnimatableFeature):
(WebCore::CSSParser::parseWillChange):
(WebCore::isValidCustomIdent): Deleted.

  • css/CSSParser.h:
  • css/CSSPrimitiveValue.h:

(WebCore::CSSPrimitiveValue::isPropertyID): New utility function.

  • css/CSSPropertyNames.in:
  • css/CSSValueKeywords.in:
  • css/StyleBuilderCustom.h:

(WebCore::StyleBuilderCustom::applyValueWillChange):

  • rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::setWillChange):

  • rendering/style/RenderStyle.h:
  • rendering/style/StyleAllInOne.cpp:
  • rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
(WebCore::StyleRareNonInheritedData::willChangeDataEquivalent):

  • rendering/style/StyleRareNonInheritedData.h:
  • rendering/style/WillChangeData.cpp: Added.

(WebCore::WillChangeData::operator==):
(WebCore::WillChangeData::containsScrollPosition):
(WebCore::WillChangeData::containsContents):
(WebCore::WillChangeData::containsProperty):
(WebCore::WillChangeData::addFeature):
(WebCore::WillChangeData::featureAt):

  • rendering/style/WillChangeData.h: Added.

(WebCore::WillChangeData::create):
(WebCore::WillChangeData::operator!=):
(WebCore::WillChangeData::isAuto):
(WebCore::WillChangeData::numFeatures):
(WebCore::WillChangeData::WillChangeData):
(WebCore::WillChangeData::AnimatableFeature::feature):
(WebCore::WillChangeData::AnimatableFeature::property):
(WebCore::WillChangeData::AnimatableFeature::featurePropertyPair):
(WebCore::WillChangeData::AnimatableFeature::AnimatableFeature):
(WebCore::WillChangeData::AnimatableFeature::operator==):

LayoutTests:

will-change parsing test.

  • fast/css/will-change-parsing-expected.txt: Added.
  • fast/css/will-change-parsing.html: Added.
Location:
trunk
Files:
4 added
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r188509 r188512  
     12015-08-14  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Implement parsing for CSS will-change
     4        https://bugs.webkit.org/show_bug.cgi?id=148052
     5
     6        Reviewed by Dean Jackson.
     7       
     8        will-change parsing test.
     9
     10        * fast/css/will-change-parsing-expected.txt: Added.
     11        * fast/css/will-change-parsing.html: Added.
     12
    1132015-08-14  Alexey Proskuryakov  <ap@apple.com>
    214

  • trunk/Source/WebCore/CMakeLists.txt

    r188508 r188512  
    25072507    rendering/style/StyleTransformData.cpp
    25082508    rendering/style/StyleVisualData.cpp
     2509    rendering/style/WillChangeData.cpp
    25092510
    25102511    rendering/svg/RenderSVGBlock.cpp

  • trunk/Source/WebCore/ChangeLog

    r188511 r188512  
     12015-08-14  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Implement parsing for CSS will-change
     4        https://bugs.webkit.org/show_bug.cgi?id=148052
     5
     6        Reviewed by Dean Jackson.
     7       
     8        Syntax is
     9            will-change: auto | <animateable-feature>#
     10        where
     11            <animateable-feature> = scroll-position | contents | <custom-ident>
     12           
     13        To support this, add WillChangeData which stores a vector of "feature"
     14        and CSS property squished into 16 bits. This is stored in rareNonInheritedData.
     15        If null or an empty list, the property value is 'auto'. The list preserves
     16        unknown properties.
     17
     18        Test: fast/css/will-change-parsing.html
     19
     20        * CMakeLists.txt:
     21        * WebCore.vcxproj/WebCore.vcxproj:
     22        * WebCore.vcxproj/WebCore.vcxproj.filters:
     23        * WebCore.xcodeproj/project.pbxproj:
     24        * css/CSSComputedStyleDeclaration.cpp:
     25        (WebCore::getWillChangePropertyValue):
     26        (WebCore::ComputedStyleExtractor::propertyValue):
     27        * css/CSSParser.cpp:
     28        (WebCore::CSSParser::parseValue):
     29        (WebCore::isValidGridPositionCustomIdent): Renamed from isValidCustomIdent(),
     30        since it's grid-specific.
     31        (WebCore::CSSParser::parseIntegerOrCustomIdentFromGridPosition):
     32        (WebCore::valueIsCSSKeyword): Returns true for the "CSS-wide" keywords like
     33        "initial", "inherit" and "default".
     34        (WebCore::CSSParser::parseFontFamily):
     35        (WebCore::isValidWillChangeAnimatableFeature):
     36        (WebCore::CSSParser::parseWillChange):
     37        (WebCore::isValidCustomIdent): Deleted.
     38        * css/CSSParser.h:
     39        * css/CSSPrimitiveValue.h:
     40        (WebCore::CSSPrimitiveValue::isPropertyID): New utility function.
     41        * css/CSSPropertyNames.in:
     42        * css/CSSValueKeywords.in:
     43        * css/StyleBuilderCustom.h:
     44        (WebCore::StyleBuilderCustom::applyValueWillChange):
     45        * rendering/style/RenderStyle.cpp:
     46        (WebCore::RenderStyle::setWillChange):
     47        * rendering/style/RenderStyle.h:
     48        * rendering/style/StyleAllInOne.cpp:
     49        * rendering/style/StyleRareNonInheritedData.cpp:
     50        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
     51        (WebCore::StyleRareNonInheritedData::operator==):
     52        (WebCore::StyleRareNonInheritedData::willChangeDataEquivalent):
     53        * rendering/style/StyleRareNonInheritedData.h:
     54        * rendering/style/WillChangeData.cpp: Added.
     55        (WebCore::WillChangeData::operator==):
     56        (WebCore::WillChangeData::containsScrollPosition):
     57        (WebCore::WillChangeData::containsContents):
     58        (WebCore::WillChangeData::containsProperty):
     59        (WebCore::WillChangeData::addFeature):
     60        (WebCore::WillChangeData::featureAt):
     61        * rendering/style/WillChangeData.h: Added.
     62        (WebCore::WillChangeData::create):
     63        (WebCore::WillChangeData::operator!=):
     64        (WebCore::WillChangeData::isAuto):
     65        (WebCore::WillChangeData::numFeatures):
     66        (WebCore::WillChangeData::WillChangeData):
     67        (WebCore::WillChangeData::AnimatableFeature::feature):
     68        (WebCore::WillChangeData::AnimatableFeature::property):
     69        (WebCore::WillChangeData::AnimatableFeature::featurePropertyPair):
     70        (WebCore::WillChangeData::AnimatableFeature::AnimatableFeature):
     71        (WebCore::WillChangeData::AnimatableFeature::operator==):
     72
    1732015-08-15  Wenson Hsieh  <wenson_hsieh@apple.com>
    274

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r188508 r188512  
    1302713027    </ClCompile>
    1302813028    <ClCompile Include="..\rendering\style\StyleVisualData.cpp">
     13029      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     13030      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     13031      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
     13032      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
     13033      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
     13034      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
     13035      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     13036      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     13037      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
     13038      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
     13039      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     13040      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     13041    </ClCompile>
     13042    <ClCompile Include="..\rendering\style\WillChangeData.cpp">
    1302913043      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    1303013044      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    … …  
    2192021934    <ClInclude Include="..\rendering\style\StyleVariableData.h" />
    2192121935    <ClInclude Include="..\rendering\style\StyleVisualData.h" />
     21936    <ClInclude Include="..\rendering\style\WillChangeData.h" />
    2192221937    <ClInclude Include="..\rendering\style\SVGRenderStyle.h" />
    2192321938    <ClInclude Include="..\rendering\style\SVGRenderStyleDefs.h" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r188329 r188512  
    28242824      <Filter>rendering\style</Filter>
    28252825    </ClCompile>
     2826    <ClCompile Include="..\rendering\style\WillChangeData.cpp">
     2827      <Filter>rendering\style</Filter>
     2828    </ClCompile>
    28262829    <ClCompile Include="..\rendering\style\SVGRenderStyle.cpp">
    28272830      <Filter>rendering\style</Filter>
    … …  
    98899892    </ClInclude>
    98909893    <ClInclude Include="..\rendering\style\StyleVisualData.h">
     9894      <Filter>rendering\style</Filter>
     9895    </ClInclude>
     9896    <ClInclude Include="..\rendering\style\WillChangeData.h">
    98919897      <Filter>rendering\style</Filter>
    98929898    </ClInclude>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r188508 r188512  
    470470                0F13164016ED0CDE0035CC04 /* PlatformCAFiltersCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F13163F16ED0CDE0035CC04 /* PlatformCAFiltersCocoa.mm */; };
    471471                0F15DA8A0F3AAEE70000CE47 /* AnimationControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F15DA890F3AAEE70000CE47 /* AnimationControllerPrivate.h */; };
     472                0F15ED5B1B7EC7C500EDDFEB /* WillChangeData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F15ED591B7EC7C500EDDFEB /* WillChangeData.cpp */; };
     473                0F15ED5C1B7EC7C500EDDFEB /* WillChangeData.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F15ED5A1B7EC7C500EDDFEB /* WillChangeData.h */; settings = {ATTRIBUTES = (Private, ); }; };
    472474                0F1774801378B772009DA76A /* ScrollAnimatorIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F17747E1378B771009DA76A /* ScrollAnimatorIOS.h */; };
    473475                0F1774811378B772009DA76A /* ScrollAnimatorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F17747F1378B772009DA76A /* ScrollAnimatorIOS.mm */; };
    … …  
    76067608                0F13163F16ED0CDE0035CC04 /* PlatformCAFiltersCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformCAFiltersCocoa.mm; sourceTree = "<group>"; };
    76077609                0F15DA890F3AAEE70000CE47 /* AnimationControllerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationControllerPrivate.h; sourceTree = "<group>"; };
     7610                0F15ED591B7EC7C500EDDFEB /* WillChangeData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WillChangeData.cpp; sourceTree = "<group>"; };
     7611                0F15ED5A1B7EC7C500EDDFEB /* WillChangeData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WillChangeData.h; sourceTree = "<group>"; };
    76087612                0F17747E1378B771009DA76A /* ScrollAnimatorIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollAnimatorIOS.h; sourceTree = "<group>"; };
    76097613                0F17747F1378B772009DA76A /* ScrollAnimatorIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollAnimatorIOS.mm; sourceTree = "<group>"; };
    … …  
    2168621690                                BC2274770E8366E200E7F975 /* SVGRenderStyleDefs.h */,
    2168721691                                448B1B780F3A2F9B0047A9E2 /* TextSizeAdjustment.h */,
     21692                                0F15ED591B7EC7C500EDDFEB /* WillChangeData.cpp */,
     21693                                0F15ED5A1B7EC7C500EDDFEB /* WillChangeData.h */,
    2168821694                        );
    2168921695                        path = style;
    … …  
    2564125647                                31078CCA1880AACE008099DC /* JSOESTextureHalfFloatLinear.h in Headers */,
    2564225648                                77A17AA712F28B2A004E02F6 /* JSOESVertexArrayObject.h in Headers */,
     25649                                0F15ED5C1B7EC7C500EDDFEB /* WillChangeData.h in Headers */,
    2564325650                                FDF6BAF9134A4C9800822920 /* JSOfflineAudioCompletionEvent.h in Headers */,
    2564425651                                FDA9326716703BA9008982DC /* JSOfflineAudioContext.h in Headers */,
    … …  
    2940629413                                B2FA3DAE0AB75A6F000E5AC4 /* JSSVGMetadataElement.cpp in Sources */,
    2940729414                                B27B28290CEF0C0700D39D54 /* JSSVGMissingGlyphElement.cpp in Sources */,
     29415                                0F15ED5B1B7EC7C500EDDFEB /* WillChangeData.cpp in Sources */,
    2940829416                                4496E3A2139813CB003EE32A /* JSSVGMPathElement.cpp in Sources */,
    2940929417                                8542A7980AE5C94300DF58DF /* JSSVGNumber.cpp in Sources */,

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

    r188315 r188512  
    6868#include "WebKitCSSTransformValue.h"
    6969#include "WebKitFontFamilyNames.h"
     70#include "WillChangeData.h"
    7071#include <wtf/NeverDestroyed.h>
    7172#include <wtf/text/StringBuilder.h>
    … …  
    11621163#endif
    11631164
     1165static Ref<CSSValue> getWillChangePropertyValue(const WillChangeData* willChangeData)
     1166{
     1167    if (!willChangeData || !willChangeData->numFeatures())
     1168        return cssValuePool().createIdentifierValue(CSSValueAuto);
     1169
     1170    auto list = CSSValueList::createCommaSeparated();
     1171    for (size_t i = 0; i < willChangeData->numFeatures(); ++i) {
     1172        WillChangeData::FeaturePropertyPair feature = willChangeData->featureAt(i);
     1173        switch (feature.first) {
     1174        case WillChangeData::ScrollPosition:
     1175            list.get().append(cssValuePool().createIdentifierValue(CSSValueScrollPosition));
     1176            break;
     1177        case WillChangeData::Contents:
     1178            list.get().append(cssValuePool().createIdentifierValue(CSSValueContents));
     1179            break;
     1180        case WillChangeData::Property:
     1181            list.get().append(cssValuePool().createIdentifierValue(feature.second));
     1182            break;
     1183        case WillChangeData::Invalid:
     1184            ASSERT_NOT_REACHED();
     1185            break;
     1186        }
     1187    }
     1188
     1189    return WTF::move(list);
     1190}
     1191
    11641192static Ref<CSSValueList> getDelayValue(const AnimationList* animList)
    11651193{
    … …  
    26512679            }
    26522680            return zoomAdjustedPixelValueForLength(style->width(), *style);
     2681        case CSSPropertyWillChange:
     2682            return getWillChangePropertyValue(style->willChange());
     2683            break;
    26532684        case CSSPropertyWordBreak:
    26542685            return cssValuePool().createValue(style->wordBreak());

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

    r188315 r188512  
    27982798    // End of CSS3 properties
    27992799
     2800    case CSSPropertyWillChange: // auto | [scroll-position | contents | <custom-ident>]#
     2801        if (id == CSSValueAuto)
     2802            validPrimitive = true;
     2803        else
     2804            return parseWillChange(important);
     2805        break;
     2806
    28002807    // Apple specific properties.  These will never be standardized and are purely to
    28012808    // support custom WebKit-based Apple applications.
    … …  
    52305237
    52315238#if ENABLE(CSS_GRID_LAYOUT)
    5232 static inline bool isValidCustomIdent(const CSSParserValue& value)
     5239static inline bool isValidGridPositionCustomIdent(const CSSParserValue& value)
    52335240{
    52345241    return value.unit == CSSPrimitiveValue::CSS_IDENT && value.id != CSSValueSpan && value.id != CSSValueAuto;
    … …  
    52425249        numericValue = createPrimitiveNumericValue(valueWithCalculation);
    52435250        CSSParserValue* nextValue = m_valueList->next();
    5244         if (nextValue && isValidCustomIdent(*nextValue)) {
     5251        if (nextValue && isValidGridPositionCustomIdent(*nextValue)) {
    52455252            gridLineName = createPrimitiveStringValue(*nextValue);
    52465253            m_valueList->next();
    … …  
    52495256    }
    52505257
    5251     if (isValidCustomIdent(valueWithCalculation)) {
     5258    if (isValidGridPositionCustomIdent(valueWithCalculation)) {
    52525259        gridLineName = createPrimitiveStringValue(valueWithCalculation);
    52535260        if (CSSParserValue* nextValue = m_valueList->next()) {
    … …  
    66866693};
    66876694
     6695static bool valueIsCSSKeyword(const CSSParserValue& value)
     6696{
     6697    // FIXME: when we add "unset", we should handle it here.
     6698    return value.id == CSSValueInitial || value.id == CSSValueInherit || value.id == CSSValueDefault;
     6699}
     6700
    66886701RefPtr<CSSValueList> CSSParser::parseFontFamily()
    66896702{
    … …  
    67026715            (nextValue->unit == CSSPrimitiveValue::CSS_STRING || nextValue->unit == CSSPrimitiveValue::CSS_IDENT));
    67036716
    6704         bool valueIsKeyword = value->id == CSSValueInitial || value->id == CSSValueInherit || value->id == CSSValueDefault;
     6717        bool valueIsKeyword = valueIsCSSKeyword(*value);
    67056718        if (valueIsKeyword && !inFamily) {
    67066719            if (nextValBreaksFont)
    … …  
    1046310476}
    1046410477
     10478static inline bool isValidWillChangeAnimatableFeature(const CSSParserValue& value)
     10479{
     10480    if (value.id == CSSValueNone || value.id == CSSValueAuto || value.id == CSSValueAll)
     10481        return false;
     10482
     10483    if (valueIsCSSKeyword(value))
     10484        return false;
     10485
     10486    if (cssPropertyID(value.string) == CSSPropertyWillChange)
     10487        return false;
     10488
     10489    return true;
     10490}
     10491
     10492bool CSSParser::parseWillChange(bool important)
     10493{
     10494    RefPtr<CSSValueList> willChangePropertyValues = CSSValueList::createCommaSeparated();
     10495
     10496    bool expectComma = false;
     10497    for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
     10498        if (expectComma) {
     10499            if (!isComma(value))
     10500                return false;
     10501           
     10502            expectComma = false;
     10503            continue;
     10504        }
     10505
     10506        if (value->unit != CSSPrimitiveValue::CSS_IDENT)
     10507            return false;
     10508
     10509        if (!isValidWillChangeAnimatableFeature(*value))
     10510            return false;
     10511
     10512        RefPtr<CSSValue> cssValue;
     10513        if (value->id == CSSValueScrollPosition || value->id == CSSValueContents)
     10514            cssValue = cssValuePool().createIdentifierValue(value->id);
     10515        else {
     10516            CSSPropertyID propertyID = cssPropertyID(value->string);
     10517            if (propertyID != CSSPropertyInvalid)
     10518                cssValue = cssValuePool().createIdentifierValue(propertyID);
     10519            else // This might be a property we don't support.
     10520                cssValue = createPrimitiveStringValue(*value);
     10521        }
     10522
     10523        willChangePropertyValues->append(cssValue.releaseNonNull());
     10524        expectComma = true;
     10525    }
     10526
     10527    addProperty(CSSPropertyWillChange, willChangePropertyValues.release(), important);
     10528    return true;
     10529}
     10530
    1046510531RefPtr<CSSCalcValue> CSSParser::parseCalculation(CSSParserValue& value, CalculationPermittedValueRange range)
    1046610532{

  • trunk/Source/WebCore/css/CSSParser.h

    r188315 r188512  
    346346    bool parseFontVariantLigatures(bool important);
    347347
     348    bool parseWillChange(bool important);
     349
    348350    // Faster than doing a new/delete each time since it keeps one vector.
    349351    std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> createSelectorVector();

  • trunk/Source/WebCore/css/CSSPrimitiveValue.h

    r188315 r188512  
    207207    bool isLengthRepeat() const { return m_primitiveUnitType == CSS_LENGTH_REPEAT; }
    208208#endif
     209    bool isPropertyID() const { return m_primitiveUnitType == CSS_PROPERTY_ID; }
    209210    bool isRGBColor() const { return m_primitiveUnitType == CSS_RGBCOLOR; }
    210211    bool isShape() const { return m_primitiveUnitType == CSS_SHAPE; }

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

    r188202 r188512  
    351351widows [Inherited, AutoFunctions]
    352352width [Initial=initialSize, Converter=LengthSizing]
     353will-change [Custom=Value]
    353354word-break [Inherited]
    354355-epub-word-break = word-break

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

    r188202 r188512  
    11281128weight
    11291129style
     1130
     1131// will-change
     1132scroll-position
     1133contents

  • trunk/Source/WebCore/css/StyleBuilderCustom.h

    r187626 r188512  
    4949#include "StyleGeneratedImage.h"
    5050#include "StyleResolver.h"
     51#include "WillChangeData.h"
    5152
    5253namespace WebCore {
    … …  
    134135    static void applyInheritWebkitScrollSnapPointsY(StyleResolver&);
    135136#endif
     137    static void applyValueWillChange(StyleResolver&, CSSValue&);
    136138
    137139private:
    … …  
    17181720#endif
    17191721
     1722inline void StyleBuilderCustom::applyValueWillChange(StyleResolver& styleResolver, CSSValue& value)
     1723{
     1724    if (is<CSSPrimitiveValue>(value)) {
     1725        ASSERT(downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueAuto);
     1726        styleResolver.style()->setWillChange(nullptr);
     1727        return;
     1728    }
     1729
     1730    Ref<WillChangeData> willChange = WillChangeData::create();
     1731    for (auto& item : downcast<CSSValueList>(value)) {
     1732        if (!is<CSSPrimitiveValue>(item.get()))
     1733            continue;
     1734
     1735        const auto& primitiveValue = downcast<CSSPrimitiveValue>(item.get());
     1736        switch (primitiveValue.getValueID()) {
     1737        case CSSValueScrollPosition:
     1738            willChange->addFeature(WillChangeData::Feature::ScrollPosition);
     1739            break;
     1740        case CSSValueContents:
     1741            willChange->addFeature(WillChangeData::Feature::Contents);
     1742            break;
     1743        default:
     1744            if (primitiveValue.isPropertyID())
     1745                willChange->addFeature(WillChangeData::Feature::Property, primitiveValue.getPropertyID());
     1746            break;
     1747        }
     1748    }
     1749
     1750    styleResolver.style()->setWillChange(WTF::move(willChange));
     1751}
     1752
    17201753} // namespace WebCore
    17211754

  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r187626 r188512  
    4141#include "StyleScrollSnapPoints.h"
    4242#include "StyleSelfAlignmentData.h"
     43#include "WillChangeData.h"
    4344#include <wtf/MathExtras.h>
    4445#include <wtf/StdLibExtras.h>
    … …  
    926927}
    927928
     929void RenderStyle::setWillChange(PassRefPtr<WillChangeData> willChangeData)
     930{
     931    if (rareNonInheritedData->m_willChange == willChangeData
     932        || (rareNonInheritedData->m_willChange && willChangeData && *rareNonInheritedData->m_willChange == *willChangeData))
     933        return;
     934
     935    rareNonInheritedData.access()->m_willChange = WTF::move(willChangeData);
     936}
     937
    928938void RenderStyle::clearCursorList()
    929939{

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r188202 r188512  
    114114class StyleResolver;
    115115class TransformationMatrix;
     116class WillChangeData;
    116117
    117118struct ScrollSnapPoints;
    … …  
    17791780    ClipPathOperation* clipPath() const { return rareNonInheritedData->m_clipPath.get(); }
    17801781
    1781     static ClipPathOperation* initialClipPath() { return 0; }
     1782    static ClipPathOperation* initialClipPath() { return nullptr; }
    17821783
    17831784    bool hasContent() const { return contentData(); }
    … …  
    17981799    QuotesData* quotes() const { return rareInheritedData->quotes.get(); }
    17991800    void setQuotes(PassRefPtr<QuotesData>);
     1801
     1802    WillChangeData* willChange() const { return rareNonInheritedData->m_willChange.get(); }
     1803    void setWillChange(PassRefPtr<WillChangeData>);
    18001804
    18011805    const AtomicString& hyphenString() const;
    … …  
    20042008    static const AtomicString& initialContentAltText() { return emptyAtom; }
    20052009
     2010    static WillChangeData* initialWillChange() { return nullptr; }
     2011
    20062012#if ENABLE(CSS_SCROLL_SNAP)
    20072013    static ScrollSnapType initialScrollSnapType() { return ScrollSnapType::None; }

  • trunk/Source/WebCore/rendering/style/StyleAllInOne.cpp

    r186528 r188512  
    5858#include "StyleTransformData.cpp"
    5959#include "StyleVisualData.cpp"
     60#include "WillChangeData.cpp"

  • trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp

    r183805 r188512  
    6060    , m_scrollSnapPoints(StyleScrollSnapPoints::create())
    6161#endif
     62    , m_willChange(RenderStyle::initialWillChange())
    6263    , m_mask(FillLayer(MaskFillLayer))
    63     , m_pageSize()
    6464#if ENABLE(CSS_SHAPES)
    6565    , m_shapeOutside(RenderStyle::initialShapeOutside())
    … …  
    137137    , m_altText(o.m_altText)
    138138    , m_boxShadow(o.m_boxShadow ? std::make_unique<ShadowData>(*o.m_boxShadow) : nullptr)
     139    , m_willChange(o.m_willChange)
    139140    , m_boxReflect(o.m_boxReflect)
    140141    , m_animations(o.m_animations ? std::make_unique<AnimationList>(*o.m_animations) : nullptr)
    … …  
    235236        && counterDataEquivalent(o)
    236237        && shadowDataEquivalent(o)
     238        && willChangeDataEquivalent(o)
    237239        && reflectionDataEquivalent(o)
    238240        && animationDataEquivalent(o)
    … …  
    246248        && m_shapeImageThreshold == o.m_shapeImageThreshold
    247249#endif
    248         && m_clipPath == o.m_clipPath
     250        && m_clipPath == o.m_clipPath // FIXME: This needs to compare values.
    249251        && m_textDecorationColor == o.m_textDecorationColor
    250252        && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColor
    … …  
    324326}
    325327
     328bool StyleRareNonInheritedData::willChangeDataEquivalent(const StyleRareNonInheritedData& o) const
     329{
     330    if (m_willChange != o.m_willChange) {
     331        if (!m_willChange || !o.m_willChange)
     332            return false;
     333        return *m_willChange == *o.m_willChange;
     334    }
     335    return true;
     336}
     337
    326338bool StyleRareNonInheritedData::reflectionDataEquivalent(const StyleRareNonInheritedData& o) const
    327339{

  • trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h

    r183805 r188512  
    2727
    2828#include "BasicShapes.h"
     29#include "CSSPropertyNames.h"
    2930#include "ClipPathOperation.h"
    3031#include "CounterDirectives.h"
    … …  
    3738#include "StyleContentAlignmentData.h"
    3839#include "StyleSelfAlignmentData.h"
     40#include "WillChangeData.h"
    3941#include <memory>
    4042#include <wtf/PassRefPtr.h>
    … …  
    9395    bool counterDataEquivalent(const StyleRareNonInheritedData&) const;
    9496    bool shadowDataEquivalent(const StyleRareNonInheritedData&) const;
     97    bool willChangeDataEquivalent(const StyleRareNonInheritedData&) const;
    9598    bool reflectionDataEquivalent(const StyleRareNonInheritedData&) const;
    9699    bool animationDataEquivalent(const StyleRareNonInheritedData&) const;
    … …  
    145148
    146149    std::unique_ptr<ShadowData> m_boxShadow; // For box-shadow decorations.
     150
     151    RefPtr<WillChangeData> m_willChange; // Null indicates 'auto'.
    147152   
    148153    RefPtr<StyleReflection> m_boxReflect;
Note: See TracChangeset for help on using the changeset viewer.