BUILD FIX (r154778): AXSearchFieldCancelButtonText() is not defined on iOS

See: AX: Cancel button in search field not accessible.
<https://webkit.org/b/120322>

Fixes the following build error:

    In file included from Source/WebCore/accessibility/AccessibilityAllInOne.cpp:44:
    Source/WebCore/accessibility/AccessibilitySearchFieldButtons.cpp:46:12: error: use of undeclared identifier 'AXSearchFieldCancelButtonText'
        return AXSearchFieldCancelButtonText();
               ^
    1 error generated.

* accessibility/AccessibilitySearchFieldButtons.cpp:
(WebCore::AccessibilitySearchFieldCancelButton::accessibilityDescription):
Return String() instead of calling AXSearchFieldCancelButtonText() on iOS.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154812 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index de00348c8485d0f8f799a486e92053c552c58bcc..bc980816cf3f6b72d042057006f19a8bfb31e412 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2013-08-29  David Kilzer  <ddkilzer@apple.com>
+
+        BUILD FIX (r154778): AXSearchFieldCancelButtonText() is not defined on iOS
+
+        See: AX: Cancel button in search field not accessible.
+        <https://webkit.org/b/120322>
+
+        Fixes the following build error:
+
+            In file included from Source/WebCore/accessibility/AccessibilityAllInOne.cpp:44:
+            Source/WebCore/accessibility/AccessibilitySearchFieldButtons.cpp:46:12: error: use of undeclared identifier 'AXSearchFieldCancelButtonText'
+                return AXSearchFieldCancelButtonText();
+                       ^
+            1 error generated.
+
+        * accessibility/AccessibilitySearchFieldButtons.cpp:
+        (WebCore::AccessibilitySearchFieldCancelButton::accessibilityDescription):
+        Return String() instead of calling AXSearchFieldCancelButtonText() on iOS.
+
 2013-08-29  Antti Koivisto  <antti@apple.com>
 
         Remove NodeRenderingContext

diff --git a/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.cpp b/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.cpp
index dfb17bd7538f8d10e61af2e13129fce5e45c038e..c7c949c2d7e93e9e04bd0757e4e95655bca6977c 100644 (file)
--- a/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.cpp
+++ b/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.cpp
@@ -43,7 +43,11 @@ AccessibilitySearchFieldCancelButton::AccessibilitySearchFieldCancelButton(Rende
 
 String AccessibilitySearchFieldCancelButton::accessibilityDescription() const
 {
+#if PLATFORM(IOS)
+    return String();
+#else
     return AXSearchFieldCancelButtonText();
+#endif
 }
 
 void AccessibilitySearchFieldCancelButton::accessibilityText(Vector<AccessibilityText>& textOrder)