Skip to content

Commit

Permalink
Remove -webkit-marquee.
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=117769

Reviewed by Simon Fraser.

Source/WebCore:

This doesn't simplify the code so much yet but makes the CSS properties not
accessible by web content, which means that how marquee is implemented is now an
implementation detail that WebKit can change.

Had to keep some of parsing code because addHTMLLengthToStyle uses the
CSS parser, which is a bit unfortunate. But we can avoid dealing with
identifiers so it can be simplified a bit, and similarly we can avoid
having a shorthand altogether.

Covered by existing tests that are being modified to reflect the
change.

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
* css/CSSProperties.json:
* css/StyleProperties.cpp:
(WebCore::StyleProperties::getPropertyValue const):
* css/parser/CSSPropertyParser.cpp:
(WebCore::CSSPropertyParser::parseSingleValue):
(WebCore::CSSPropertyParser::parseShorthand):

Source/WebInspectorUI:

* UserInterface/Models/CSSKeywordCompletions.js:

LayoutTests:

* fast/css/getComputedStyle/computed-style-expected.txt:
* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* fast/css/getComputedStyle/getComputedStyle-length-unit-expected.txt:
* fast/css/getComputedStyle/getComputedStyle-length-unit.html:
* fast/css/getComputedStyle/getComputedStyle-zoom-and-background-size-expected.txt:
* fast/css/getComputedStyle/getComputedStyle-zoom-and-background-size.html:
* fast/css/getComputedStyle/resources/property-names.js:
* fast/css/getPropertyValue-webkit-marquee-expected.txt: Removed.
* fast/css/getPropertyValue-webkit-marquee.html: Removed.
* fast/css/inherit-initial-shorthand-values-expected.txt:
* fast/css/inherit-initial-shorthand-values.html:
* fast/css/remove-shorthand-expected.txt:
* fast/css/remove-shorthand.html:
* legacy-animation-engine/fast/css/getComputedStyle/resources/property-names.js:
* platform/gtk/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/gtk/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* platform/gtk/svg/css/getComputedStyle-basic-expected.txt:
* platform/ios/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* platform/ios/svg/css/getComputedStyle-basic-expected.txt:
* platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* platform/mac/svg/css/getComputedStyle-basic-expected.txt:
* platform/wpe/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/wpe/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* platform/wpe/svg/css/getComputedStyle-basic-expected.txt:
* svg/css/getComputedStyle-basic-expected.txt:


Canonical link: https://commits.webkit.org/218456@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@253540 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
emilio committed Dec 15, 2019
1 parent 3520a33 commit 57353ad
Show file tree
Hide file tree
Showing 36 changed files with 96 additions and 325 deletions.
35 changes: 35 additions & 0 deletions LayoutTests/ChangeLog
@@ -1,3 +1,38 @@
2019-12-15 Emilio Cobos Álvarez <emilio@crisal.io>

Remove -webkit-marquee.
https://bugs.webkit.org/show_bug.cgi?id=117769

Reviewed by Simon Fraser.

* fast/css/getComputedStyle/computed-style-expected.txt:
* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* fast/css/getComputedStyle/getComputedStyle-length-unit-expected.txt:
* fast/css/getComputedStyle/getComputedStyle-length-unit.html:
* fast/css/getComputedStyle/getComputedStyle-zoom-and-background-size-expected.txt:
* fast/css/getComputedStyle/getComputedStyle-zoom-and-background-size.html:
* fast/css/getComputedStyle/resources/property-names.js:
* fast/css/getPropertyValue-webkit-marquee-expected.txt: Removed.
* fast/css/getPropertyValue-webkit-marquee.html: Removed.
* fast/css/inherit-initial-shorthand-values-expected.txt:
* fast/css/inherit-initial-shorthand-values.html:
* fast/css/remove-shorthand-expected.txt:
* fast/css/remove-shorthand.html:
* legacy-animation-engine/fast/css/getComputedStyle/resources/property-names.js:
* platform/gtk/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/gtk/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* platform/gtk/svg/css/getComputedStyle-basic-expected.txt:
* platform/ios/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* platform/ios/svg/css/getComputedStyle-basic-expected.txt:
* platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* platform/mac/svg/css/getComputedStyle-basic-expected.txt:
* platform/wpe/fast/css/getComputedStyle/computed-style-expected.txt:
* platform/wpe/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* platform/wpe/svg/css/getComputedStyle-basic-expected.txt:
* svg/css/getComputedStyle-basic-expected.txt:

2019-12-14 Per Arne Vollan <pvollan@apple.com>

[iOS] Deny mach lookup access to "*.viewservice" in the WebContent process
Expand Down
Expand Up @@ -233,10 +233,6 @@ zoom: 1;
-webkit-locale: auto;
-webkit-margin-after-collapse: collapse;
-webkit-margin-before-collapse: collapse;
-webkit-marquee-direction: auto;
-webkit-marquee-increment: 6px;
-webkit-marquee-repetition: infinite;
-webkit-marquee-style: scroll;
-webkit-mask-box-image: none;
-webkit-mask-box-image-outset: 0px;
-webkit-mask-box-image-repeat: stretch;
Expand Down
Expand Up @@ -232,10 +232,6 @@ zoom: 1
-webkit-locale: auto
-webkit-margin-after-collapse: collapse
-webkit-margin-before-collapse: collapse
-webkit-marquee-direction: auto
-webkit-marquee-increment: 6px
-webkit-marquee-repetition: infinite
-webkit-marquee-style: scroll
-webkit-mask-box-image: none
-webkit-mask-box-image-outset: 0px
-webkit-mask-box-image-repeat: stretch
Expand Down
Expand Up @@ -14,7 +14,6 @@ PASS testPropertyUnit('visible', 'outline-width') is 'px'
PASS testPropertyUnit('visible', '-webkit-column-rule-width') is 'px'
PASS testPropertyUnit('visible', '-webkit-column-width') is 'px'
PASS testPropertyUnit('visible', '-webkit-column-gap') is 'px'
PASS testPropertyUnit('visible', '-webkit-marquee-increment') is 'px'
PASS testPropertyUnit('visible', '-webkit-mask-position') is 'px'
PASS testPropertyUnit('visible', '-webkit-mask-size') is 'px'
PASS testPropertyUnit('visible', '-webkit-perspective') is 'px'
Expand Down Expand Up @@ -59,7 +58,6 @@ PASS testPropertyUnit('hidden', 'outline-width') is 'px'
PASS testPropertyUnit('hidden', '-webkit-column-rule-width') is 'px'
PASS testPropertyUnit('hidden', '-webkit-column-width') is 'px'
PASS testPropertyUnit('hidden', '-webkit-column-gap') is 'px'
PASS testPropertyUnit('hidden', '-webkit-marquee-increment') is 'px'
PASS testPropertyUnit('hidden', '-webkit-mask-position') is 'px'
PASS testPropertyUnit('hidden', '-webkit-mask-size') is 'px'
PASS testPropertyUnit('hidden', '-webkit-perspective') is 'px'
Expand Down
Expand Up @@ -31,7 +31,6 @@
"-webkit-column-width": "80px",
"-webkit-column-gap": "20px",

"-webkit-marquee-increment": "10px",
"-webkit-mask-position": "10px 10px",
"-webkit-mask-size": "10px 10px",
"-webkit-perspective": "400px",
Expand Down
Expand Up @@ -24,7 +24,6 @@ outline-width PASS 2px 2px
-webkit-column-rule-style PASS solid solid
-webkit-column-width PASS 80px 80px
-webkit-column-gap PASS 20px 20px
-webkit-marquee-increment PASS 10px 10px
-webkit-mask-position PASS 10px 10px 10px 10px
-webkit-mask-size PASS 10px 10px 10px 10px
-webkit-perspective PASS 400px 400px
Expand Down Expand Up @@ -77,7 +76,6 @@ outline-width PASS 2px 2px
-webkit-column-rule-style PASS solid solid
-webkit-column-width PASS 80px 80px
-webkit-column-gap PASS 20px 20px
-webkit-marquee-increment PASS 10px 10px
-webkit-mask-position PASS 10px 10px 10px 10px
-webkit-mask-size PASS 10px 10px 10px 10px
-webkit-perspective PASS 400px 400px
Expand Down
Expand Up @@ -125,7 +125,6 @@ <h2>Results while display:none</h2>
"-webkit-column-width": "80px",
"-webkit-column-gap": "20px",

"-webkit-marquee-increment": "10px",
"-webkit-mask-position": "10px 10px",
"-webkit-mask-size": "10px 10px",
"-webkit-perspective": "400px",
Expand Down Expand Up @@ -210,4 +209,4 @@ <h2>Results while display:none</h2>


</body>
</html>
</html>
Expand Up @@ -81,10 +81,6 @@ var propertiesToTest = {
"-webkit-locale": true,
"-webkit-margin-after-collapse": true,
"-webkit-margin-before-collapse": true,
"-webkit-marquee-direction": true,
"-webkit-marquee-increment": true,
"-webkit-marquee-repetition": true,
"-webkit-marquee-style": true,
"-webkit-mask-attachment": true,
"-webkit-mask-box-image": true,
"-webkit-mask-box-image-outset": true,
Expand Down
25 changes: 0 additions & 25 deletions LayoutTests/fast/css/getPropertyValue-webkit-marquee-expected.txt

This file was deleted.

61 changes: 0 additions & 61 deletions LayoutTests/fast/css/getPropertyValue-webkit-marquee.html

This file was deleted.

Expand Up @@ -27,7 +27,6 @@ PASS test('webkit-column-rule') is "inherit, initial"
PASS test('flex-flow') is "inherit, initial"
PASS test('flex') is "inherit, initial"
PASS test('webkit-marginCollapse') is "inherit, initial"
PASS test('webkit-marquee') is "inherit, initial"
PASS test('webkit-mask') is "inherit, initial"
PASS test('webkit-mask-position') is "inherit, initial"
PASS test('webkit-mask-repeat') is "inherit, initial"
Expand Down
1 change: 0 additions & 1 deletion LayoutTests/fast/css/inherit-initial-shorthand-values.html
Expand Up @@ -45,7 +45,6 @@
"flex-flow",
"flex",
"webkit-marginCollapse",
"webkit-marquee",
"webkit-mask",
"webkit-mask-position",
"webkit-mask-repeat",
Expand Down
3 changes: 0 additions & 3 deletions LayoutTests/fast/css/remove-shorthand-expected.txt
Expand Up @@ -56,9 +56,6 @@ and adds "".
Removing -webkit-margin-collapse
removes "-webkit-margin-before-collapse, -webkit-margin-after-collapse"
and adds "".
Removing -webkit-marquee
removes "-webkit-marquee-direction, -webkit-marquee-increment, -webkit-marquee-repetition, -webkit-marquee-style, -webkit-marquee-speed"
and adds "".
Removing -webkit-mask
removes "-webkit-mask"
and adds "".
Expand Down
2 changes: 0 additions & 2 deletions LayoutTests/fast/css/remove-shorthand.html
Expand Up @@ -17,7 +17,6 @@
list-style: square outside url(/marker.png); \
margin: 5%; \
-webkit-margin-collapse: collapse; \
-webkit-marquee: ahead small infinite slide slow; \
padding: 2em; \
-webkit-text-stroke: orange 1pt; \
-webkit-columns: 100px 3; \
Expand Down Expand Up @@ -64,7 +63,6 @@
"list-style",
"margin",
"-webkit-margin-collapse",
"-webkit-marquee",
"-webkit-mask",
"-webkit-mask-position",
"overflow",
Expand Down
Expand Up @@ -81,10 +81,6 @@ var propertiesToTest = {
"-webkit-locale": true,
"-webkit-margin-after-collapse": true,
"-webkit-margin-before-collapse": true,
"-webkit-marquee-direction": true,
"-webkit-marquee-increment": true,
"-webkit-marquee-repetition": true,
"-webkit-marquee-style": true,
"-webkit-mask-attachment": true,
"-webkit-mask-box-image": true,
"-webkit-mask-box-image-outset": true,
Expand Down
Expand Up @@ -234,10 +234,6 @@ zoom: 1;
-webkit-locale: auto;
-webkit-margin-after-collapse: collapse;
-webkit-margin-before-collapse: collapse;
-webkit-marquee-direction: auto;
-webkit-marquee-increment: 6px;
-webkit-marquee-repetition: infinite;
-webkit-marquee-style: scroll;
-webkit-mask-box-image: none;
-webkit-mask-box-image-outset: 0px;
-webkit-mask-box-image-repeat: stretch;
Expand Down
Expand Up @@ -233,10 +233,6 @@ zoom: 1
-webkit-locale: auto
-webkit-margin-after-collapse: collapse
-webkit-margin-before-collapse: collapse
-webkit-marquee-direction: auto
-webkit-marquee-increment: 6px
-webkit-marquee-repetition: infinite
-webkit-marquee-style: scroll
-webkit-mask-box-image: none
-webkit-mask-box-image-outset: 0px
-webkit-mask-box-image-repeat: stretch
Expand Down
Expand Up @@ -466,14 +466,6 @@ rect: style.getPropertyValue(-webkit-margin-after-collapse) : collapse
rect: style.getPropertyCSSValue(-webkit-margin-after-collapse) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-margin-before-collapse) : collapse
rect: style.getPropertyCSSValue(-webkit-margin-before-collapse) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-marquee-direction) : auto
rect: style.getPropertyCSSValue(-webkit-marquee-direction) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-marquee-increment) : 6px
rect: style.getPropertyCSSValue(-webkit-marquee-increment) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-marquee-repetition) : infinite
rect: style.getPropertyCSSValue(-webkit-marquee-repetition) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-marquee-style) : scroll
rect: style.getPropertyCSSValue(-webkit-marquee-style) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-mask-box-image) : none
rect: style.getPropertyCSSValue(-webkit-mask-box-image) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-mask-box-image-outset) : 0px
Expand Down Expand Up @@ -998,14 +990,6 @@ g: style.getPropertyValue(-webkit-margin-after-collapse) : collapse
g: style.getPropertyCSSValue(-webkit-margin-after-collapse) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-margin-before-collapse) : collapse
g: style.getPropertyCSSValue(-webkit-margin-before-collapse) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-marquee-direction) : auto
g: style.getPropertyCSSValue(-webkit-marquee-direction) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-marquee-increment) : 6px
g: style.getPropertyCSSValue(-webkit-marquee-increment) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-marquee-repetition) : infinite
g: style.getPropertyCSSValue(-webkit-marquee-repetition) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-marquee-style) : scroll
g: style.getPropertyCSSValue(-webkit-marquee-style) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-mask-box-image) : none
g: style.getPropertyCSSValue(-webkit-mask-box-image) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-mask-box-image-outset) : 0px
Expand Down
Expand Up @@ -234,10 +234,6 @@ zoom: 1;
-webkit-locale: auto;
-webkit-margin-after-collapse: collapse;
-webkit-margin-before-collapse: collapse;
-webkit-marquee-direction: auto;
-webkit-marquee-increment: 6px;
-webkit-marquee-repetition: infinite;
-webkit-marquee-style: scroll;
-webkit-mask-box-image: none;
-webkit-mask-box-image-outset: 0px;
-webkit-mask-box-image-repeat: stretch;
Expand Down
Expand Up @@ -233,10 +233,6 @@ zoom: 1
-webkit-locale: auto
-webkit-margin-after-collapse: collapse
-webkit-margin-before-collapse: collapse
-webkit-marquee-direction: auto
-webkit-marquee-increment: 6px
-webkit-marquee-repetition: infinite
-webkit-marquee-style: scroll
-webkit-mask-box-image: none
-webkit-mask-box-image-outset: 0px
-webkit-mask-box-image-repeat: stretch
Expand Down
Expand Up @@ -466,14 +466,6 @@ rect: style.getPropertyValue(-webkit-margin-after-collapse) : collapse
rect: style.getPropertyCSSValue(-webkit-margin-after-collapse) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-margin-before-collapse) : collapse
rect: style.getPropertyCSSValue(-webkit-margin-before-collapse) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-marquee-direction) : auto
rect: style.getPropertyCSSValue(-webkit-marquee-direction) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-marquee-increment) : 6px
rect: style.getPropertyCSSValue(-webkit-marquee-increment) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-marquee-repetition) : infinite
rect: style.getPropertyCSSValue(-webkit-marquee-repetition) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-marquee-style) : scroll
rect: style.getPropertyCSSValue(-webkit-marquee-style) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-mask-box-image) : none
rect: style.getPropertyCSSValue(-webkit-mask-box-image) : [object CSSPrimitiveValue]
rect: style.getPropertyValue(-webkit-mask-box-image-outset) : 0px
Expand Down Expand Up @@ -998,14 +990,6 @@ g: style.getPropertyValue(-webkit-margin-after-collapse) : collapse
g: style.getPropertyCSSValue(-webkit-margin-after-collapse) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-margin-before-collapse) : collapse
g: style.getPropertyCSSValue(-webkit-margin-before-collapse) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-marquee-direction) : auto
g: style.getPropertyCSSValue(-webkit-marquee-direction) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-marquee-increment) : 6px
g: style.getPropertyCSSValue(-webkit-marquee-increment) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-marquee-repetition) : infinite
g: style.getPropertyCSSValue(-webkit-marquee-repetition) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-marquee-style) : scroll
g: style.getPropertyCSSValue(-webkit-marquee-style) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-mask-box-image) : none
g: style.getPropertyCSSValue(-webkit-mask-box-image) : [object CSSPrimitiveValue]
g: style.getPropertyValue(-webkit-mask-box-image-outset) : 0px
Expand Down
Expand Up @@ -234,10 +234,6 @@ zoom: 1;
-webkit-locale: auto;
-webkit-margin-after-collapse: collapse;
-webkit-margin-before-collapse: collapse;
-webkit-marquee-direction: auto;
-webkit-marquee-increment: 6px;
-webkit-marquee-repetition: infinite;
-webkit-marquee-style: scroll;
-webkit-mask-box-image: none;
-webkit-mask-box-image-outset: 0px;
-webkit-mask-box-image-repeat: stretch;
Expand Down
Expand Up @@ -233,10 +233,6 @@ zoom: 1
-webkit-locale: auto
-webkit-margin-after-collapse: collapse
-webkit-margin-before-collapse: collapse
-webkit-marquee-direction: auto
-webkit-marquee-increment: 6px
-webkit-marquee-repetition: infinite
-webkit-marquee-style: scroll
-webkit-mask-box-image: none
-webkit-mask-box-image-outset: 0px
-webkit-mask-box-image-repeat: stretch
Expand Down

0 comments on commit 57353ad

Please sign in to comment.