Skip to content

Commit 2c94889

Browse files
author
[email protected]
committed
AX: Implement updated CSS3 Speech for 'speak' and 'speak-as' properties
https://bugs.webkit.org/show_bug.cgi?id=180361 Reviewed by Zalan Bujtas. Source/WebCore: Change speak -> speakAs, and allow a combination of properties. Tests: Updated accessibility/mac/css-speech-speak.html * accessibility/AccessibilityObject.h: (WebCore::AccessibilityObject::speakAsProperty const): (WebCore::AccessibilityObject::speakProperty const): Deleted. * accessibility/AccessibilityRenderObject.cpp: (WebCore::AccessibilityRenderObject::speakAsProperty const): (WebCore::AccessibilityRenderObject::speakProperty const): Deleted. * accessibility/AccessibilityRenderObject.h: * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm: (-[WebAccessibilityObjectWrapper accessibilitySpeechHint]): * accessibility/mac/WebAccessibilityObjectWrapperBase.h: * accessibility/mac/WebAccessibilityObjectWrapperBase.mm: (-[WebAccessibilityObjectWrapperBase baseAccessibilitySpeechHint]): * accessibility/mac/WebAccessibilityObjectWrapperMac.mm: (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]): * css/CSSComputedStyleDeclaration.cpp: (WebCore::speakAsToCSSValue): (WebCore::ComputedStyleExtractor::propertyValue): * css/CSSPrimitiveValueMappings.h: (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): (WebCore::CSSPrimitiveValue::operator ESpeakAs const): (WebCore::CSSPrimitiveValue::operator ESpeak const): Deleted. * css/CSSProperties.json: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::convertSpeakAs): * css/parser/CSSParserFastPaths.cpp: (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue): (WebCore::CSSParserFastPaths::isKeywordPropertyID): * css/parser/CSSPropertyParser.cpp: (WebCore::consumeSpeakAs): (WebCore::CSSPropertyParser::parseSingleValue): * rendering/style/RenderStyle.h: (WebCore::RenderStyle::speakAs const): (WebCore::RenderStyle::setSpeakAs): (WebCore::RenderStyle::initialSpeakAs): (WebCore::RenderStyle::speak const): Deleted. (WebCore::RenderStyle::setSpeak): Deleted. (WebCore::RenderStyle::initialSpeak): Deleted. * rendering/style/RenderStyleConstants.h: (WebCore::operator| ): (WebCore::operator|= ): * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::StyleRareInheritedData): (WebCore::StyleRareInheritedData::operator== const): * rendering/style/StyleRareInheritedData.h: Tools: * DumpRenderTree/AccessibilityUIElement.cpp: (speakAsCallback): (AccessibilityUIElement::speakAs): (AccessibilityUIElement::getJSClass): (speakCallback): Deleted. (AccessibilityUIElement::speak): Deleted. * DumpRenderTree/AccessibilityUIElement.h: * DumpRenderTree/ios/AccessibilityUIElementIOS.mm: (AccessibilityUIElement::speakAs): * DumpRenderTree/mac/AccessibilityUIElementMac.mm: (AccessibilityUIElement::speakAs): (AccessibilityUIElement::speak): Deleted. * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h: * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl: * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm: (WTR::AccessibilityUIElement::speakAs): (WTR::AccessibilityUIElement::speak): Deleted. * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm: (WTR::AccessibilityUIElement::speakAs): (WTR::AccessibilityUIElement::speak): Deleted. LayoutTests: * accessibility/mac/css-speech-speak-expected.txt: * accessibility/mac/css-speech-speak.html: * fast/css/getComputedStyle/computed-style-expected.txt: * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: * platform/ios/fast/css/getComputedStyle/computed-style-expected.txt: * platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: * platform/mac-sierra/fast/css/getComputedStyle/computed-style-expected.txt: * platform/mac-sierra/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: * platform/mac-sierra/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: * svg/css/getComputedStyle-basic-expected.txt: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@226432 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 5304243 commit 2c94889

File tree

42 files changed

+299
-138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+299
-138
lines changed

‎LayoutTests/ChangeLog

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
2018-01-04 Chris Fleizach <[email protected]>
2+
3+
AX: Implement updated CSS3 Speech for 'speak' and 'speak-as' properties
4+
https://bugs.webkit.org/show_bug.cgi?id=180361
5+
6+
Reviewed by Zalan Bujtas.
7+
8+
* accessibility/mac/css-speech-speak-expected.txt:
9+
* accessibility/mac/css-speech-speak.html:
10+
* fast/css/getComputedStyle/computed-style-expected.txt:
11+
* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
12+
* platform/ios/fast/css/getComputedStyle/computed-style-expected.txt:
13+
* platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
14+
* platform/mac-sierra/fast/css/getComputedStyle/computed-style-expected.txt:
15+
* platform/mac-sierra/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
16+
* platform/mac-sierra/svg/css/getComputedStyle-basic-expected.txt:
17+
* platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
18+
* platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
19+
* platform/mac/svg/css/getComputedStyle-basic-expected.txt:
20+
* svg/css/getComputedStyle-basic-expected.txt:
21+
122
2018-01-04 Brian Burg <[email protected]>
223

324
Web Inspector: Capture Element Screenshot looks fuzzy

‎LayoutTests/accessibility/mac/css-speech-speak-expected.txt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
Initial
2-
No speech
32
Normal
43
Spellout
54
Digits
65
Literal
76
No punctuation
7+
Digits and Literal
8+
Spell and Literal
89
test
9-
This tests that using the CSS3-speech property 'speak' works as from a WebCore level (not a platform level, that is up to the platforms)
10+
This tests that using the CSS3-speech property 'speak-as' works as from a WebCore level (not a platform level, that is up to the platforms)
1011

1112
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
1213

1314

14-
PASS accessibilityController.focusedElement.childAtIndex(0).speak is 'normal'
15-
PASS accessibilityController.focusedElement.childAtIndex(0).speak is 'none'
16-
PASS accessibilityController.focusedElement.childAtIndex(0).speak is 'normal'
17-
PASS accessibilityController.focusedElement.childAtIndex(0).speak is 'spell-out'
18-
PASS accessibilityController.focusedElement.childAtIndex(0).speak is 'digits'
19-
PASS accessibilityController.focusedElement.childAtIndex(0).speak is 'literal-punctuation'
20-
PASS accessibilityController.focusedElement.childAtIndex(0).speak is 'no-punctuation'
21-
PASS accessibilityController.focusedElement.childAtIndex(0).speak is 'digits'
15+
PASS accessibilityController.focusedElement.childAtIndex(0).speakAs is 'normal'
16+
PASS accessibilityController.focusedElement.childAtIndex(0).speakAs is 'normal'
17+
PASS accessibilityController.focusedElement.childAtIndex(0).speakAs is 'spell-out'
18+
PASS accessibilityController.focusedElement.childAtIndex(0).speakAs is 'normal, digits'
19+
PASS accessibilityController.focusedElement.childAtIndex(0).speakAs is 'normal, literal-punctuation'
20+
PASS accessibilityController.focusedElement.childAtIndex(0).speakAs is 'normal, no-punctuation'
21+
PASS accessibilityController.focusedElement.childAtIndex(0).speakAs is 'normal, digits, literal-punctuation'
22+
PASS accessibilityController.focusedElement.childAtIndex(0).speakAs is 'spell-out, literal-punctuation'
23+
PASS accessibilityController.focusedElement.childAtIndex(0).speakAs is 'normal, digits'
2224
PASS successfullyParsed is true
2325

2426
TEST COMPLETE

‎LayoutTests/accessibility/mac/css-speech-speak.html

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,28 @@
33
<head>
44
<script src="../../resources/js-test-pre.js"></script>
55
<style>
6-
div.speech-none { speak: none; }
7-
div.speech-normal { speak: normal; }
8-
div.speech-spellout { speak: spell-out; }
9-
div.speech-digits { speak: digits; }
10-
div.speech-literalpunc { speak: literal-punctuation; }
11-
div.speech-nopunc { speak: no-punctuation; }
6+
div.speech-normal { speak-as: normal; }
7+
div.speech-spellout { speak-as: spell-out; }
8+
div.speech-digits { speak-as: digits; }
9+
div.speech-literalpunc { speak-as: literal-punctuation; }
10+
div.speech-nopunc { speak-as: no-punctuation; }
11+
div.digits-and-literal { speak-as: digits literal-punctuation; }
12+
div.spell-and-literal { speak-as: spell-out literal-punctuation; }
1213
</style>
1314
</head>
1415
<body id="body">
1516

1617

1718
<div tabindex="0" id="initial" >Initial</div>
18-
<div tabindex="0" id="speech-none" class="speech-none">No speech</div>
1919
<div tabindex="0" id="speech-normal" class="speech-normal">Normal</div>
2020
<div tabindex="0" id="speech-spellout" class="speech-spellout">Spellout</div>
2121
<div tabindex="0" id="speech-digits" class="speech-digits">Digits</div>
2222
<div tabindex="0" id="speech-literalpunc" class="speech-literalpunc">Literal</div>
2323
<div tabindex="0" id="speech-nopunc" class="speech-nopunc">No punctuation</div>
24+
<div tabindex="0" id="speech-digits-and-literal" class="digits-and-literal">Digits and Literal</div>
25+
<div tabindex="0" id="speech-spell-and-literal" class="spell-and-literal">Spell and Literal</div>
2426

25-
<div style='speak: digits;'>
27+
<div style='speak-as: digits;'>
2628
<div>
2729
<div>
2830
<a id="testlink" tabindex="0" href="#">test</a>
@@ -35,33 +37,36 @@
3537

3638
<script>
3739

38-
description("This tests that using the CSS3-speech property 'speak' works as from a WebCore level (not a platform level, that is up to the platforms)");
40+
description("This tests that using the CSS3-speech property 'speak-as' works as from a WebCore level (not a platform level, that is up to the platforms)");
3941

4042
if (window.accessibilityController) {
4143

4244
document.getElementById("initial").focus();
43-
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speak", "'normal'");
44-
45-
document.getElementById("speech-none").focus();
46-
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speak", "'none'");
45+
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speakAs", "'normal'");
4746

4847
document.getElementById("speech-normal").focus();
49-
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speak", "'normal'");
48+
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speakAs", "'normal'");
5049

5150
document.getElementById("speech-spellout").focus();
52-
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speak", "'spell-out'");
51+
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speakAs", "'spell-out'");
5352

5453
document.getElementById("speech-digits").focus();
55-
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speak", "'digits'");
54+
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speakAs", "'normal, digits'");
5655

5756
document.getElementById("speech-literalpunc").focus();
58-
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speak", "'literal-punctuation'");
57+
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speakAs", "'normal, literal-punctuation'");
5958

6059
document.getElementById("speech-nopunc").focus();
61-
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speak", "'no-punctuation'");
60+
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speakAs", "'normal, no-punctuation'");
61+
62+
document.getElementById("speech-digits-and-literal").focus();
63+
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speakAs", "'normal, digits, literal-punctuation'");
64+
65+
document.getElementById("speech-spell-and-literal").focus();
66+
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speakAs", "'spell-out, literal-punctuation'");
6267

6368
document.getElementById("testlink").focus();
64-
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speak", "'digits'");
69+
shouldBe("accessibilityController.focusedElement.childAtIndex(0).speakAs", "'normal, digits'");
6570
}
6671

6772
</script>

‎LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ pointer-events: auto;
8989
position: static;
9090
resize: none;
9191
right: auto;
92-
speak: normal;
9392
table-layout: auto;
9493
tab-size: 8;
9594
text-align: start;

‎LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ pointer-events: auto
8888
position: static
8989
resize: none
9090
right: auto
91-
speak: normal
9291
table-layout: auto
9392
tab-size: 8
9493
text-align: start

‎LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-expected.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ pointer-events: auto;
9090
position: static;
9191
resize: none;
9292
right: auto;
93-
speak: normal;
9493
table-layout: auto;
9594
tab-size: 8;
9695
text-align: start;

‎LayoutTests/platform/ios/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ pointer-events: auto
8989
position: static
9090
resize: none
9191
right: auto
92-
speak: normal
9392
table-layout: auto
9493
tab-size: 8
9594
text-align: start

‎LayoutTests/platform/mac-sierra/fast/css/getComputedStyle/computed-style-expected.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ pointer-events: auto;
8989
position: static;
9090
resize: none;
9191
right: auto;
92-
speak: normal;
9392
table-layout: auto;
9493
tab-size: 8;
9594
text-align: start;

‎LayoutTests/platform/mac-sierra/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ pointer-events: auto
8888
position: static
8989
resize: none
9090
right: auto
91-
speak: normal
9291
table-layout: auto
9392
tab-size: 8
9493
text-align: start

‎LayoutTests/platform/mac-sierra/svg/css/getComputedStyle-basic-expected.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,6 @@ rect: style.getPropertyValue(resize) : none
176176
rect: style.getPropertyCSSValue(resize) : [object CSSPrimitiveValue]
177177
rect: style.getPropertyValue(right) : auto
178178
rect: style.getPropertyCSSValue(right) : [object CSSPrimitiveValue]
179-
rect: style.getPropertyValue(speak) : normal
180-
rect: style.getPropertyCSSValue(speak) : [object CSSPrimitiveValue]
181179
rect: style.getPropertyValue(table-layout) : auto
182180
rect: style.getPropertyCSSValue(table-layout) : [object CSSPrimitiveValue]
183181
rect: style.getPropertyValue(tab-size) : 8
@@ -728,8 +726,6 @@ g: style.getPropertyValue(resize) : none
728726
g: style.getPropertyCSSValue(resize) : [object CSSPrimitiveValue]
729727
g: style.getPropertyValue(right) : auto
730728
g: style.getPropertyCSSValue(right) : [object CSSPrimitiveValue]
731-
g: style.getPropertyValue(speak) : normal
732-
g: style.getPropertyCSSValue(speak) : [object CSSPrimitiveValue]
733729
g: style.getPropertyValue(table-layout) : auto
734730
g: style.getPropertyCSSValue(table-layout) : [object CSSPrimitiveValue]
735731
g: style.getPropertyValue(tab-size) : 8

‎LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ pointer-events: auto;
9090
position: static;
9191
resize: none;
9292
right: auto;
93-
speak: normal;
9493
table-layout: auto;
9594
tab-size: 8;
9695
text-align: start;

‎LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ pointer-events: auto
8989
position: static
9090
resize: none
9191
right: auto
92-
speak: normal
9392
table-layout: auto
9493
tab-size: 8
9594
text-align: start

‎LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,6 @@ rect: style.getPropertyValue(resize) : none
178178
rect: style.getPropertyCSSValue(resize) : [object CSSPrimitiveValue]
179179
rect: style.getPropertyValue(right) : auto
180180
rect: style.getPropertyCSSValue(right) : [object CSSPrimitiveValue]
181-
rect: style.getPropertyValue(speak) : normal
182-
rect: style.getPropertyCSSValue(speak) : [object CSSPrimitiveValue]
183181
rect: style.getPropertyValue(table-layout) : auto
184182
rect: style.getPropertyCSSValue(table-layout) : [object CSSPrimitiveValue]
185183
rect: style.getPropertyValue(tab-size) : 8
@@ -732,8 +730,6 @@ g: style.getPropertyValue(resize) : none
732730
g: style.getPropertyCSSValue(resize) : [object CSSPrimitiveValue]
733731
g: style.getPropertyValue(right) : auto
734732
g: style.getPropertyCSSValue(right) : [object CSSPrimitiveValue]
735-
g: style.getPropertyValue(speak) : normal
736-
g: style.getPropertyCSSValue(speak) : [object CSSPrimitiveValue]
737733
g: style.getPropertyValue(table-layout) : auto
738734
g: style.getPropertyCSSValue(table-layout) : [object CSSPrimitiveValue]
739735
g: style.getPropertyValue(tab-size) : 8

‎LayoutTests/svg/css/getComputedStyle-basic-expected.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,6 @@ rect: style.getPropertyValue(resize) : none
176176
rect: style.getPropertyCSSValue(resize) : [object CSSPrimitiveValue]
177177
rect: style.getPropertyValue(right) : auto
178178
rect: style.getPropertyCSSValue(right) : [object CSSPrimitiveValue]
179-
rect: style.getPropertyValue(speak) : normal
180-
rect: style.getPropertyCSSValue(speak) : [object CSSPrimitiveValue]
181179
rect: style.getPropertyValue(table-layout) : auto
182180
rect: style.getPropertyCSSValue(table-layout) : [object CSSPrimitiveValue]
183181
rect: style.getPropertyValue(tab-size) : 8
@@ -728,8 +726,6 @@ g: style.getPropertyValue(resize) : none
728726
g: style.getPropertyCSSValue(resize) : [object CSSPrimitiveValue]
729727
g: style.getPropertyValue(right) : auto
730728
g: style.getPropertyCSSValue(right) : [object CSSPrimitiveValue]
731-
g: style.getPropertyValue(speak) : normal
732-
g: style.getPropertyCSSValue(speak) : [object CSSPrimitiveValue]
733729
g: style.getPropertyValue(table-layout) : auto
734730
g: style.getPropertyCSSValue(table-layout) : [object CSSPrimitiveValue]
735731
g: style.getPropertyValue(tab-size) : 8

‎Source/WebCore/ChangeLog

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,59 @@
1+
2018-01-04 Chris Fleizach <[email protected]>
2+
3+
AX: Implement updated CSS3 Speech for 'speak' and 'speak-as' properties
4+
https://bugs.webkit.org/show_bug.cgi?id=180361
5+
6+
Reviewed by Zalan Bujtas.
7+
8+
Change speak -> speakAs, and allow a combination of properties.
9+
10+
Tests: Updated accessibility/mac/css-speech-speak.html
11+
12+
* accessibility/AccessibilityObject.h:
13+
(WebCore::AccessibilityObject::speakAsProperty const):
14+
(WebCore::AccessibilityObject::speakProperty const): Deleted.
15+
* accessibility/AccessibilityRenderObject.cpp:
16+
(WebCore::AccessibilityRenderObject::speakAsProperty const):
17+
(WebCore::AccessibilityRenderObject::speakProperty const): Deleted.
18+
* accessibility/AccessibilityRenderObject.h:
19+
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
20+
(-[WebAccessibilityObjectWrapper accessibilitySpeechHint]):
21+
* accessibility/mac/WebAccessibilityObjectWrapperBase.h:
22+
* accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
23+
(-[WebAccessibilityObjectWrapperBase baseAccessibilitySpeechHint]):
24+
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
25+
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
26+
* css/CSSComputedStyleDeclaration.cpp:
27+
(WebCore::speakAsToCSSValue):
28+
(WebCore::ComputedStyleExtractor::propertyValue):
29+
* css/CSSPrimitiveValueMappings.h:
30+
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
31+
(WebCore::CSSPrimitiveValue::operator ESpeakAs const):
32+
(WebCore::CSSPrimitiveValue::operator ESpeak const): Deleted.
33+
* css/CSSProperties.json:
34+
* css/StyleBuilderConverter.h:
35+
(WebCore::StyleBuilderConverter::convertSpeakAs):
36+
* css/parser/CSSParserFastPaths.cpp:
37+
(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
38+
(WebCore::CSSParserFastPaths::isKeywordPropertyID):
39+
* css/parser/CSSPropertyParser.cpp:
40+
(WebCore::consumeSpeakAs):
41+
(WebCore::CSSPropertyParser::parseSingleValue):
42+
* rendering/style/RenderStyle.h:
43+
(WebCore::RenderStyle::speakAs const):
44+
(WebCore::RenderStyle::setSpeakAs):
45+
(WebCore::RenderStyle::initialSpeakAs):
46+
(WebCore::RenderStyle::speak const): Deleted.
47+
(WebCore::RenderStyle::setSpeak): Deleted.
48+
(WebCore::RenderStyle::initialSpeak): Deleted.
49+
* rendering/style/RenderStyleConstants.h:
50+
(WebCore::operator| ):
51+
(WebCore::operator|= ):
52+
* rendering/style/StyleRareInheritedData.cpp:
53+
(WebCore::StyleRareInheritedData::StyleRareInheritedData):
54+
(WebCore::StyleRareInheritedData::operator== const):
55+
* rendering/style/StyleRareInheritedData.h:
56+
157
2018-01-04 Brian Burg <[email protected]>
258

359
Web Inspector: Capture Element Screenshot looks fuzzy

‎Source/WebCore/accessibility/AccessibilityObject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ class AccessibilityObject : public RefCounted<AccessibilityObject> {
10041004
bool supportsARIAAttributes() const;
10051005

10061006
// CSS3 Speech properties.
1007-
virtual ESpeak speakProperty() const { return SpeakNormal; }
1007+
virtual ESpeakAs speakAsProperty() const { return SpeakNormal; }
10081008

10091009
// Make this object visible by scrolling as many nested scrollable views as needed.
10101010
virtual void scrollToMakeVisible() const;

‎Source/WebCore/accessibility/AccessibilityRenderObject.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -944,12 +944,12 @@ AccessibilityObject* AccessibilityRenderObject::internalLinkElement() const
944944
return firstAccessibleObjectFromNode(linkedNode);
945945
}
946946

947-
ESpeak AccessibilityRenderObject::speakProperty() const
947+
ESpeakAs AccessibilityRenderObject::speakAsProperty() const
948948
{
949949
if (!m_renderer)
950-
return AccessibilityObject::speakProperty();
950+
return AccessibilityObject::speakAsProperty();
951951

952-
return m_renderer->style().speak();
952+
return m_renderer->style().speakAs();
953953
}
954954

955955
void AccessibilityRenderObject::addRadioButtonGroupChildren(AccessibilityObject* parent, AccessibilityChildrenVector& linkedUIElements) const

‎Source/WebCore/accessibility/AccessibilityRenderObject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ class AccessibilityRenderObject : public AccessibilityNodeObject {
274274
bool elementAttributeValue(const QualifiedName&) const;
275275
void setElementAttributeValue(const QualifiedName&, bool);
276276

277-
ESpeak speakProperty() const override;
277+
ESpeakAs speakAsProperty() const override;
278278

279279
const String liveRegionStatus() const override;
280280
const String liveRegionRelevant() const override;

‎Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2843,28 +2843,12 @@ - (NSString *)accessibilityIdentifier
28432843
return m_object->getAttribute(HTMLNames::idAttr);
28442844
}
28452845

2846-
- (NSString *)accessibilitySpeechHint
2846+
- (NSArray<NSString *> *)accessibilitySpeechHint
28472847
{
28482848
if (![self _prepareAccessibilityCall])
28492849
return nil;
28502850

2851-
switch (m_object->speakProperty()) {
2852-
default:
2853-
case SpeakNormal:
2854-
return @"normal";
2855-
case SpeakNone:
2856-
return @"none";
2857-
case SpeakSpellOut:
2858-
return @"spell-out";
2859-
case SpeakDigits:
2860-
return @"digits";
2861-
case SpeakLiteralPunctuation:
2862-
return @"literal-punctuation";
2863-
case SpeakNoPunctuation:
2864-
return @"no-punctuation";
2865-
}
2866-
2867-
return nil;
2851+
return [self baseAccessibilitySpeechHint];
28682852
}
28692853

28702854
- (BOOL)accessibilityARIAIsBusy

‎Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class VisiblePosition;
5555
- (NSString *)baseAccessibilityTitle;
5656
- (NSString *)baseAccessibilityDescription;
5757
- (NSString *)baseAccessibilityHelpText;
58+
- (NSArray<NSString *> *)baseAccessibilitySpeechHint;
5859

5960
- (NSString *)ariaLandmarkRoleDescription;
6061

0 commit comments

Comments
 (0)