Changeset 148135 in webkit

Timestamp:

Apr 10, 2013 1:38:25 PM (11 years ago)

Author:

Chris Fleizach

Message:

AX: Make sure all AX methods called from outside call prepareAccessibility
​https://bugs.webkit.org/show_bug.cgi?id=113818

Reviewed by Darin Adler.

Make sure any calls that can be made from outside WebCore are protected with the
prepareAccessibility method.

• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:

(-[WebAccessibilityObjectWrapper accessibilityMathRootIndexObject]):
(-[WebAccessibilityObjectWrapper accessibilityMathRadicandObject]):
(-[WebAccessibilityObjectWrapper accessibilityMathNumeratorObject]):
(-[WebAccessibilityObjectWrapper accessibilityMathDenominatorObject]):
(-[WebAccessibilityObjectWrapper accessibilityMathBaseObject]):
(-[WebAccessibilityObjectWrapper accessibilityMathSubscriptObject]):
(-[WebAccessibilityObjectWrapper accessibilityMathSuperscriptObject]):
(-[WebAccessibilityObjectWrapper accessibilityMathUnderObject]):
(-[WebAccessibilityObjectWrapper accessibilityMathOverObject]):
(-[WebAccessibilityObjectWrapper accessibilityMathFencedOpenString]):
(-[WebAccessibilityObjectWrapper accessibilityMathFencedCloseString]):
(-[WebAccessibilityObjectWrapper accessibilityIsMathTopObject]):
(-[WebAccessibilityObjectWrapper accessibilityMathType]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (modified) (13 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-10  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Make sure all AX methods called from outside call prepareAccessibility
+        https://bugs.webkit.org/show_bug.cgi?id=113818
+
+        Reviewed by Darin Adler.
+
+        Make sure any calls that can be made from outside WebCore are protected with the
+        prepareAccessibility method.
+
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityMathRootIndexObject]):
+        (-[WebAccessibilityObjectWrapper accessibilityMathRadicandObject]):
+        (-[WebAccessibilityObjectWrapper accessibilityMathNumeratorObject]):
+        (-[WebAccessibilityObjectWrapper accessibilityMathDenominatorObject]):
+        (-[WebAccessibilityObjectWrapper accessibilityMathBaseObject]):
+        (-[WebAccessibilityObjectWrapper accessibilityMathSubscriptObject]):
+        (-[WebAccessibilityObjectWrapper accessibilityMathSuperscriptObject]):
+        (-[WebAccessibilityObjectWrapper accessibilityMathUnderObject]):
+        (-[WebAccessibilityObjectWrapper accessibilityMathOverObject]):
+        (-[WebAccessibilityObjectWrapper accessibilityMathFencedOpenString]):
+        (-[WebAccessibilityObjectWrapper accessibilityMathFencedCloseString]):
+        (-[WebAccessibilityObjectWrapper accessibilityIsMathTopObject]):
+        (-[WebAccessibilityObjectWrapper accessibilityMathType]):
+
 2013-04-10  Csaba Osztrogonác  <ossy@webkit.org>
 

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

@@ -2003 +2003 @@
 - (WebAccessibilityObjectWrapper *)accessibilityMathRootIndexObject
 {
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
     return m_object->mathRootIndexObject() ? m_object->mathRootIndexObject()->wrapper() : 0;
 }
@@ -2008 +2011 @@
 - (WebAccessibilityObjectWrapper *)accessibilityMathRadicandObject
 {
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
     return m_object->mathRadicandObject() ? m_object->mathRadicandObject()->wrapper() : 0;
 }
@@ -2013 +2019 @@
 - (WebAccessibilityObjectWrapper *)accessibilityMathNumeratorObject
 {
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
     return m_object->mathNumeratorObject() ? m_object->mathNumeratorObject()->wrapper() : 0;
 }
@@ -2018 +2027 @@
 - (WebAccessibilityObjectWrapper *)accessibilityMathDenominatorObject
 {
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
     return m_object->mathDenominatorObject() ? m_object->mathDenominatorObject()->wrapper() : 0;
 }
@@ -2023 +2035 @@
 - (WebAccessibilityObjectWrapper *)accessibilityMathBaseObject
 {
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
     return m_object->mathBaseObject() ? m_object->mathBaseObject()->wrapper() : 0;
 }
@@ -2028 +2043 @@
 - (WebAccessibilityObjectWrapper *)accessibilityMathSubscriptObject
 {
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
     return m_object->mathSubscriptObject() ? m_object->mathSubscriptObject()->wrapper() : 0;
 }
@@ -2033 +2051 @@
 - (WebAccessibilityObjectWrapper *)accessibilityMathSuperscriptObject
 {
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
     return m_object->mathSuperscriptObject() ? m_object->mathSuperscriptObject()->wrapper() : 0;
 }
@@ -2038 +2059 @@
 - (WebAccessibilityObjectWrapper *)accessibilityMathUnderObject
 {
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
     return m_object->mathUnderObject() ? m_object->mathUnderObject()->wrapper() : 0;
 }
@@ -2043 +2067 @@
 - (WebAccessibilityObjectWrapper *)accessibilityMathOverObject
 {
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
     return m_object->mathOverObject() ? m_object->mathOverObject()->wrapper() : 0;
 }
@@ -2048 +2075 @@
 - (NSString *)accessibilityMathFencedOpenString
 {
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
     return m_object->mathFencedOpenString();
 }
@@ -2053 +2083 @@
 - (NSString *)accessibilityMathFencedCloseString
 {
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
     return m_object->mathFencedCloseString();
 }
@@ -2058 +2091 @@
 - (BOOL)accessibilityIsMathTopObject
 {
+    if (![self _prepareAccessibilityCall])
+        return NO;
+
     return m_object->roleValue() == DocumentMathRole;
 }
@@ -2071 +2107 @@
 - (NSString *)accessibilityMathType
 {
+    if (![self _prepareAccessibilityCall])
+        return nil;
+
     if (m_object->roleValue() == MathElementRole) {
         if (m_object->isMathFraction())