Changeset 215151 in webkit


Ignore:
Timestamp:
Apr 8, 2017, 4:03:16 PM (8 years ago)
Author:
Simon Fraser
Message:

Update CSSProperties.json with correct fill-and-stroke status, and other cleanup
​https://bugs.webkit.org/show_bug.cgi?id=170643

Reviewed by Chris Dumez.
Source/WebCore:

Structural changes:

  • move implementation-related "comment" blocks into "codegen-properties"
  • move status-related "comment" blocks into "status"

Add the concept of "obsolete-category" and "obsolete-url" for properties
like the text-fill-and-stroke properties that used to be specified in SVG but
now have their own module shared with CSS.

Update the status of paint-order, stroke-linecap, stroke-linejoin, stroke-miterlimit
and stroke-width to "supported", overriding the default for css-text-fill-and-stroke which
is "under consideration".

Add display values "flow" and "flow-root" but mark them as unimplemented.

Fix makeprop.pl to ignore comments inside codegen-properties.

  • css/CSSProperties.json:
  • css/makeprop.pl:

(addProperty):

Tools:

Update the CSSProperties.json style checker to allow:

  • comments in codegen_properties
  • obsolete-category and obsolete-url in specification blocks
  • renamed "done" to "supported"

Fix some references to codegen_properties to be codegen-properties.

  • Scripts/webkitpy/style/checkers/jsonchecker.py:

(JSONCSSPropertiesChecker.validate_status_type):
(JSONCSSPropertiesChecker.validate_property_specification):
(JSONCSSPropertiesChecker.check_codegen_properties):

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r215147 r215151  
     12017-04-08  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Update CSSProperties.json with correct fill-and-stroke status, and other cleanup
     4        https://bugs.webkit.org/show_bug.cgi?id=170643
     5
     6        Reviewed by Chris Dumez.
     7
     8        Structural changes:
     9            - move implementation-related "comment" blocks into "codegen-properties"
     10            - move status-related "comment" blocks into "status"
     11       
     12        Add the concept of "obsolete-category" and "obsolete-url" for properties
     13        like the text-fill-and-stroke properties that used to be specified in SVG but
     14        now have their own module shared with CSS.
     15       
     16        Update the status of paint-order, stroke-linecap, stroke-linejoin, stroke-miterlimit
     17        and stroke-width to "supported", overriding the default for css-text-fill-and-stroke which
     18        is "under consideration".
     19       
     20        Add display values "flow" and "flow-root" but mark them as unimplemented.
     21       
     22        Fix makeprop.pl to ignore comments inside codegen-properties.
     23
     24        * css/CSSProperties.json:
     25        * css/makeprop.pl:
     26        (addProperty):
     27
    1282017-04-08  Eric Carlson  <eric.carlson@apple.com>
    229

  • trunk/Source/WebCore/css/CSSProperties.json

    r215146 r215151  
    178178                "high-priority": true
    179179            },
     180            "status": {
     181                "comment": "All the values from CSS Color Level 3 are supported, as well as the 8- and 4-digit forms of hex color, and the color() function."
     182            },
    180183            "specification": {
    181184                "category": "css-color",
    182                 "url": "https://www.w3.org/TR/css-color-4/#the-color-property",
    183                 "comment": "All the values from CSS Color Level 3 are supported, as well as the 8- and 4-digit forms of hex color, and the color() function."
     185                "url": "https://www.w3.org/TR/css-color-4/#the-color-property"
    184186            }
    185187        },
    … …  
    203205                "inline",
    204206                "block",
     207                {
     208                    "value": "flow",
     209                    "status": "not implemented",
     210                    "url": "https://www.w3.org/TR/css-display-3/#valdef-display-flow"
     211                },
     212                {
     213                    "value": "flow-root",
     214                    "status": "not implemented",
     215                    "url": "https://www.w3.org/TR/css-display-3/#valdef-display-flow-root"
     216                },
    205217                "list-item",
    206218                {
    … …  
    211223                {
    212224                    "value": "run-in",
    213                     "status": "Removed",
     225                    "status": "removed",
    214226                    "url": "https://www.w3.org/TR/css-display-3/#valdef-display-run-in",
    215227                    "comment": "Removed in https://trac.webkit.org/r163560"
    … …  
    741753                }
    742754            ],
    743             "status": {
    744                 "comment":  "This is the highest priority property and 'is resolved before all other properties, to ensure that its value can be checked when determining a smart default font size', (<https://trac.webkit.org/browser/trunk/Source/WebCore/ChangeLog?rev=172861>)."
     755            "codegen-properties": {
     756                "comment": "This is the highest priority property and 'is resolved before all other properties, to ensure that its value can be checked when determining a smart default font size', (<https://trac.webkit.org/browser/trunk/Source/WebCore/ChangeLog?rev=172861>)."
    745757            },
    746758            "specification": {
    … …  
    27812793                "converter": "PaintOrder"
    27822794            },
    2783             "specification": {
    2784                 "category": "svg",
    2785                 "url": "https://www.w3.org/TR/SVG2/painting.html#PaintOrderProperty"
     2795            "status": "supported",
     2796            "specification": {
     2797                "category": "css-text-fill-and-stroke",
     2798                "obsolete-category": "svg",
     2799                "obsolete-url": "https://www.w3.org/TR/SVG2/painting.html#PaintOrderProperty"
    27862800            }
    27872801        },
    … …  
    29883002                "name-for-methods": "CapStyle"
    29893003            },
    2990             "specification": {
    2991                 "category": "svg",
    2992                 "url": "https://www.w3.org/TR/SVG11/painting.html#StrokeLinecapProperty"
     3004            "status": "supported",
     3005            "specification": {
     3006                "category": "css-text-fill-and-stroke",
     3007                "url": "https://drafts.fxtf.org/fill-stroke-3/#propdef-stroke-linecap",
     3008                "obsolete-category": "svg",
     3009                "obsolete-url": "https://www.w3.org/TR/SVG11/painting.html#StrokeLinecapProperty"
    29933010            }
    29943011        },
    … …  
    30033020                "name-for-methods": "JoinStyle"
    30043021            },
    3005             "specification": {
    3006                 "category": "svg",
    3007                 "url": "https://www.w3.org/TR/SVG11/painting.html#StrokeMiterlimitProperty"
     3022            "status": "supported",
     3023            "specification": {
     3024                "category": "css-text-fill-and-stroke",
     3025                "url": "https://drafts.fxtf.org/fill-stroke-3/#propdef-stroke-linejoin",
     3026                "obsolete-category": "svg",
     3027                "obsolete-url": "https://www.w3.org/TR/SVG11/painting.html#StrokeMiterlimitProperty"
    30083028            }
    30093029        },
    … …  
    30143034                "converter": "Number<float>"
    30153035            },
    3016             "specification": {
    3017                 "category": "svg",
    3018                 "url": "https://www.w3.org/TR/SVG11/painting.html#StrokeMiterlimitProperty"
     3036            "status": "supported",
     3037            "specification": {
     3038                "category": "css-text-fill-and-stroke",
     3039                "url": "https://drafts.fxtf.org/fill-stroke-3/#propdef-stroke-miterlimit",
     3040                "obsolete-category": "svg",
     3041                "obsolete-url": "https://www.w3.org/TR/SVG11/painting.html#StrokeMiterlimitProperty"
    30193042            }
    30203043        },
    … …  
    30373060                "converter": "Length"
    30383061            },
    3039             "specification": {
    3040                 "category": "svg",
    3041                 "url": "https://www.w3.org/TR/SVG11/painting.html#StrokeWidthProperty"
     3062            "status": "supported",
     3063            "specification": {
     3064                "category": "css-text-fill-and-stroke",
     3065                "url": "https://drafts.fxtf.org/fill-stroke-3/#propdef-stroke-width",
     3066                "obsolete-category": "svg",
     3067                "obsolete-url": "https://www.w3.org/TR/SVG11/painting.html#StrokeWidthProperty"
    30423068            }
    30433069        },
    … …  
    36073633                "name-for-methods": "OverflowWrap"
    36083634            },
    3609             "status": "obsolete",
     3635            "status": {
     3636                "status": "obsolete",
     3637                "comment": "Replaced by overflow-wrap"
     3638            },
    36103639            "specification": {
    36113640                "category": "css-text",
    3612                 "url": "https://www.w3.org/TR/css-text-3/#overflow-wrap",
    3613                 "comment": "Replaced by overflow-wrap"
     3641                "url": "https://www.w3.org/TR/css-text-3/#overflow-wrap"
    36143642            }
    36153643        },
    … …  
    37843812            },
    37853813            "status": {
    3786                 "status": "experimental"
    3787             },
    3788             "specification": {
     3814                "status": "experimental",
    37893815                "comment": "Partially subsumed by background-blend-mode."
    37903816            }
    … …  
    49745000                "edges"
    49755001            ],
    4976             "status": "obsolete",
     5002            "status": {
     5003                "status": "obsolete",
     5004                "comment": "Added in https://trac.webkit.org/changeset/108133"
     5005            },
    49775006            "specification": {
    49785007                "category": "css-line-grid",
    4979                 "url": "https://www.w3.org/TR/css-line-grid-1/",
    4980                 "comment": "Added in https://trac.webkit.org/changeset/108133"
     5008                "url": "https://www.w3.org/TR/css-line-grid-1/"
    49815009            }
    49825010        },
    … …  
    59625990            ],
    59635991            "codegen-properties": {
    5964                 "name-for-methods": "TransformStyle3D"
    5965             },
    5966             "status": {
     5992                "name-for-methods": "TransformStyle3D",
    59675993                "comment": "Keeping -webkit-transform-style around is how we'll detect legacy content. At that point, we'll have to add a custom builder and a new ETransformStyle3D type. FIXME: this never happened."
    59685994            }

  • trunk/Source/WebCore/css/makeprop.pl

    r213007 r215151  
    189189                } elsif ($codegenOptionName eq "skip-codegen") {
    190190                    next;
     191                } elsif ($codegenOptionName eq "comment") {
     192                    next;
    191193                } elsif ($codegenOptionName eq "high-priority") {
    192194                    $nameIsHighPriority{$name} = 1;

  • trunk/Tools/ChangeLog

    r215145 r215151  
     12017-04-08  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Update CSSProperties.json with correct fill-and-stroke status, and other cleanup
     4        https://bugs.webkit.org/show_bug.cgi?id=170643
     5
     6        Reviewed by Chris Dumez.
     7       
     8        Update the CSSProperties.json style checker to allow:
     9            - comments in codegen_properties
     10            - obsolete-category and obsolete-url in specification blocks
     11            - renamed "done" to "supported"
     12           
     13        Fix some references to codegen_properties to be codegen-properties.
     14
     15        * Scripts/webkitpy/style/checkers/jsonchecker.py:
     16        (JSONCSSPropertiesChecker.validate_status_type):
     17        (JSONCSSPropertiesChecker.validate_property_specification):
     18        (JSONCSSPropertiesChecker.check_codegen_properties):
     19
    1202017-04-08  Youenn Fablet  <youenn@apple.com>
    221

  • trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py

    r213082 r215151  
    178178
    179179        allowed_statuses = {
    180             'done',
     180            'supported',
    181181            'in development',
    182182            'under consideration',
    … …  
    230230            'category': self.validate_property_category,
    231231            'url': self.validate_url,
     232            'obsolete-category': self.validate_property_category,
     233            'obsolete-url': self.validate_url,
    232234            'documentation-url': self.validate_url,
    233235            'keywords': self.validate_array,
    … …  
    266268    def check_codegen_properties(self, property_name, codegen_properties):
    267269        if not isinstance(codegen_properties, (dict, list)):
    268             self._handle_style_error(0, 'json/syntax', 5, '"codegen_properties" for property "%s" is not a dictionary or array.' % property_name)
     270            self._handle_style_error(0, 'json/syntax', 5, '"codegen-properties" for property "%s" is not a dictionary or array.' % property_name)
    269271            return
    270272
    … …  
    272274            'aliases': self.validate_array,
    273275            'auto-functions': self.validate_boolean,
     276            'comment': self.validate_string,
    274277            'conditional-converter': self.validate_string,
    275278            'converter': self.validate_string,
    … …  
    294297        for key, value in codegen_properties.items():
    295298            if key not in keys_and_validators:
    296                 self._handle_style_error(0, 'json/syntax', 5, 'codegen_properties for property "%s" has unexpected key "%s".' % (property_name, key))
    297                 return
    298 
    299             keys_and_validators[key](property_name, 'codegen_properties', key, value)
     299                self._handle_style_error(0, 'json/syntax', 5, 'codegen-properties for property "%s" has unexpected key "%s".' % (property_name, key))
     300                return
     301
     302            keys_and_validators[key](property_name, 'codegen-properties', key, value)
Note: See TracChangeset for help on using the changeset viewer.