Title: [116385] trunk/Source
Revision
116385
Author
[email protected]
Date
2012-05-07 19:47:13 -0700 (Mon, 07 May 2012)

Log Message

[Chromium] Android wishes to use an empty implementation if AXObjectCache
https://bugs.webkit.org/show_bug.cgi?id=85842

Reviewed by Eric Seidel.

Source/WebCore:

Add proper HAVE(ACCESSIBILITY) ifdefs so that Chromium builds without
accessibility.

* accessibility/chromium/AXObjectCacheChromium.cpp:
* accessibility/chromium/AccessibilityObjectChromium.cpp:

Source/WTF:

Disable accessibility on OS(ANDROID) for PLATFORM(CHROMIUM).

* wtf/Platform.h:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (116384 => 116385)


--- trunk/Source/WTF/ChangeLog	2012-05-08 02:22:31 UTC (rev 116384)
+++ trunk/Source/WTF/ChangeLog	2012-05-08 02:47:13 UTC (rev 116385)
@@ -1,3 +1,14 @@
+2012-05-07  Adam Barth  <[email protected]>
+
+        [Chromium] Android wishes to use an empty implementation if AXObjectCache
+        https://bugs.webkit.org/show_bug.cgi?id=85842
+
+        Reviewed by Eric Seidel.
+
+        Disable accessibility on OS(ANDROID) for PLATFORM(CHROMIUM).
+
+        * wtf/Platform.h:
+
 2012-05-04  Jeff Rogers  <[email protected]>
 
         [BlackBerry] Implement numberOfProcessorCores() for QNX

Modified: trunk/Source/WTF/wtf/Platform.h (116384 => 116385)


--- trunk/Source/WTF/wtf/Platform.h	2012-05-08 02:22:31 UTC (rev 116384)
+++ trunk/Source/WTF/wtf/Platform.h	2012-05-08 02:47:13 UTC (rev 116385)
@@ -651,7 +651,7 @@
 #endif
 
 #if !defined(HAVE_ACCESSIBILITY)
-#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(CHROMIUM)
+#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && !OS(ANDROID))
 #define HAVE_ACCESSIBILITY 1
 #endif
 #endif /* !defined(HAVE_ACCESSIBILITY) */

Modified: trunk/Source/WebCore/ChangeLog (116384 => 116385)


--- trunk/Source/WebCore/ChangeLog	2012-05-08 02:22:31 UTC (rev 116384)
+++ trunk/Source/WebCore/ChangeLog	2012-05-08 02:47:13 UTC (rev 116385)
@@ -1,3 +1,16 @@
+2012-05-07  Adam Barth  <[email protected]>
+
+        [Chromium] Android wishes to use an empty implementation if AXObjectCache
+        https://bugs.webkit.org/show_bug.cgi?id=85842
+
+        Reviewed by Eric Seidel.
+
+        Add proper HAVE(ACCESSIBILITY) ifdefs so that Chromium builds without
+        accessibility.
+
+        * accessibility/chromium/AXObjectCacheChromium.cpp:
+        * accessibility/chromium/AccessibilityObjectChromium.cpp:
+
 2012-05-07  Greg Billock  <[email protected]>
 
         [Web Intents] Flagged-off implementation of an intent tag for registration.

Modified: trunk/Source/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp (116384 => 116385)


--- trunk/Source/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp	2012-05-08 02:22:31 UTC (rev 116384)
+++ trunk/Source/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp	2012-05-08 02:47:13 UTC (rev 116385)
@@ -25,6 +25,9 @@
  */
 
 #include "config.h"
+
+#if HAVE(ACCESSIBILITY)
+
 #include "AXObjectCache.h"
 
 #include "AccessibilityObject.h"
@@ -135,3 +138,5 @@
 }
 
 } // namespace WebCore
+
+#endif // HAVE(ACCESSIBILITY)

Modified: trunk/Source/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp (116384 => 116385)


--- trunk/Source/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp	2012-05-08 02:22:31 UTC (rev 116384)
+++ trunk/Source/WebCore/accessibility/chromium/AccessibilityObjectChromium.cpp	2012-05-08 02:47:13 UTC (rev 116385)
@@ -25,6 +25,9 @@
  */
 
 #include "config.h"
+
+#if HAVE(ACCESSIBILITY)
+
 #include "AccessibilityObject.h"
 
 namespace WebCore {
@@ -43,3 +46,5 @@
 }
 
 } // namespace WebCore
+
+#endif // HAVE(ACCESSIBILITY)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to