Skip to content

Commit

Permalink
Accept cursor in ::marker
Browse files Browse the repository at this point in the history 
https://bugs.webkit.org/show_bug.cgi?id=277662
rdar://problem/133256523

Reviewed by Tim Nguyen.

Add CSSPropertyCursor to the list of ValidMarkerStyleProperties because the CSS Working Group agreed that "cursor property applies to ::marker pseudo"
w3c/csswg-drafts#6203 (comment)

* LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/marker-hit-testing-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation-expected.txt:
* Source/WebCore/style/PropertyAllowlist.cpp:
(WebCore::Style::isValidMarkerStyleProperty):

Canonical link: https://commits.webkit.org/282642@main
  • Loading branch information
@Andrew-Fryer @nt1m
Andrew-Fryer authored and nt1m committed Aug 23, 2024
1 parent a727d30 commit 1d2e717
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 20 deletions.
31 changes: 14 additions & 17 deletions LayoutTests/imported/w3c/web-platform-tests/css/css-pseudo/marker-hit-testing-expected.txt
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@


FAIL outside image ::marker's content assert_equals: event.target expected Element node <li class="image"></li> but got Element node <ol class="outside" data-x="-65">
PASS outside image ::marker's content
FAIL outside image ::marker assert_equals: event.target expected Element node <li class="image"></li> but got Element node <ol class="outside" data-x="-65">
<li class="image"></l...
FAIL outside image ::marker assert_equals: event.target expected Element node <li class="image"></li> but got Element node <html><head><meta charset="utf-8">
<title>CSS Pseudo-Elem...
FAIL outside string ::marker's content assert_equals: event.target expected Element node <li class="string"></li> but got Element node <ol class="outside" data-x="-65">
<li class="image"></l...
FAIL outside string ::marker assert_equals: event.target expected Element node <li class="string"></li> but got Element node <li class="image"></li>
FAIL outside marker ::marker's content assert_equals: event.target expected Element node <li class="marker"></li> but got Element node <ol class="outside" data-x="-65">
PASS outside string ::marker's content
FAIL outside string ::marker assert_equals: event.target expected Element node <li class="string"></li> but got Element node <ol class="outside" data-x="-65">
<li class="image"></l...
PASS outside marker ::marker's content
FAIL outside marker ::marker assert_equals: event.target expected Element node <li class="marker"></li> but got Element node <ol class="outside" data-x="-65">
<li class="image"></l...
FAIL outside nested image ::marker's content assert_equals: event.target expected Element node <li class="nested image"></li> but got Element node <ol class="outside" data-x="-65">
PASS outside nested image ::marker's content
FAIL outside nested image ::marker assert_equals: event.target expected Element node <li class="nested image"></li> but got Element node <ol class="outside" data-x="-65">
<li class="image"></l...
FAIL outside nested image ::marker assert_equals: event.target expected Element node <li class="nested image"></li> but got Element node <li class="marker"></li>
FAIL outside nested string ::marker's content assert_equals: event.target expected Element node <li class="nested string"></li> but got Element node <ol class="outside" data-x="-65">
PASS outside nested string ::marker's content
FAIL outside nested string ::marker assert_equals: event.target expected Element node <li class="nested string"></li> but got Element node <ol class="outside" data-x="-65">
<li class="image"></l...
FAIL outside nested string ::marker assert_equals: event.target expected Element node <li class="nested string"></li> but got Element node <li class="nested image"></li>
PASS inside image ::marker's content
FAIL inside image ::marker assert_equals: event.target expected Element node <li class="image"></li> but got Element node <html><head><meta charset="utf-8">
<title>CSS Pseudo-Elem...
PASS inside image ::marker
PASS inside string ::marker's content
FAIL inside string ::marker assert_equals: event.target expected Element node <li class="string"></li> but got Element node <li class="image"></li>
PASS inside string ::marker
PASS inside marker ::marker's content
FAIL inside marker ::marker assert_equals: event.target expected Element node <li class="marker"></li> but got Element node <li class="string"></li>
PASS inside marker ::marker
PASS inside nested image ::marker's content
FAIL inside nested image ::marker assert_equals: event.target expected Element node <li class="nested image"></li> but got Element node <li class="marker"></li>
PASS inside nested image ::marker
PASS inside nested string ::marker's content
FAIL inside nested string ::marker assert_equals: event.target expected Element node <li class="nested string"></li> but got Element node <li class="nested image"></li>
PASS inside nested string ::marker

2 changes: 1 addition & 1 deletion ...ed/w3c/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ PASS Property text-emphasis-color value 'rgb(0, 255, 0)' in ::marker
PASS Property text-emphasis-position value 'under left' in ::marker
PASS Property text-emphasis-style value 'dot' in ::marker
PASS Property text-shadow value 'rgb(0, 255, 0) 1px 2px 3px' in ::marker
FAIL Property cursor value 'move' in ::marker assert_equals: expected "move" but got "auto"
PASS Property cursor value 'move' in ::marker
PASS Property display value 'none' in ::marker
PASS Property position value 'absolute' in ::marker
PASS Property float value 'right' in ::marker
Expand Down
4 changes: 2 additions & 2 deletions ...atform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation-expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ PASS Animation of text-emphasis-color in ::marker
PASS Animation of text-emphasis-position in ::marker
PASS Animation of text-emphasis-style in ::marker
PASS Animation of text-shadow in ::marker
FAIL Animation of cursor in ::marker assert_equals: expected "move" but got "auto"
PASS Animation of cursor in ::marker
PASS Animation of display in ::marker
PASS Animation of position in ::marker
PASS Animation of float in ::marker
Expand Down Expand Up @@ -87,7 +87,7 @@ PASS Transition of text-emphasis-color in ::marker
PASS Transition of text-emphasis-position in ::marker
PASS Transition of text-emphasis-style in ::marker
PASS Transition of text-shadow in ::marker
FAIL Transition of cursor in ::marker assert_equals: expected "move" but got "auto"
PASS Transition of cursor in ::marker
PASS Transition of display in ::marker
PASS Transition of position in ::marker
PASS Transition of float in ::marker
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/style/PropertyAllowlist.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ bool isValidMarkerStyleProperty(CSSPropertyID id)
case CSSPropertyColor:
case CSSPropertyContent:
case CSSPropertyCustom:
case CSSPropertyCursor:
case CSSPropertyDirection:
case CSSPropertyFont:
case CSSPropertyFontFamily:
Expand Down

0 comments on commit 1d2e717

Please sign in to comment.