Changeset 95491 in webkit

Timestamp:

Sep 19, 2011 4:04:11 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Expose AXObjectCache methods so that WebAccessibilityCache
can be deleted.
​https://bugs.webkit.org/show_bug.cgi?id=68225

Patch by Dominic Mazzoni <​dmazzoni@google.com> on 2011-09-19
Reviewed by Dimitri Glazkov.

This patch exposes the functionality needed from AXObjectCache
with new methods in WebAccessibilityObject and WebDocument.
Next, Chromium will be updated to use only these methods and
not WebAccessibilityCache. Then, WebAccessibilityCache can be
deleted from WebKit.

• public/WebAccessibilityObject.h:
• public/WebDocument.h:
• src/WebAccessibilityObject.cpp:

(WebKit::WebAccessibilityObject::enableAccessibility):
(WebKit::WebAccessibilityObject::accessibilityEnabled):
(WebKit::WebAccessibilityObject::axID):

• src/WebDocument.cpp:

(WebKit::WebDocument::accessibilityObject):
(WebKit::WebDocument::accessibilityObjectFromID):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebAccessibilityObject.h (modified) (1 diff)
• public/WebDocument.h (modified) (1 diff)
• src/WebAccessibilityObject.cpp (modified) (2 diffs)
• src/WebDocument.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-09-19  Dominic Mazzoni  <dmazzoni@google.com>
+
+        Expose AXObjectCache methods so that WebAccessibilityCache
+        can be deleted.
+        https://bugs.webkit.org/show_bug.cgi?id=68225
+
+        Reviewed by Dimitri Glazkov.
+
+        This patch exposes the functionality needed from AXObjectCache
+        with new methods in WebAccessibilityObject and WebDocument.
+        Next, Chromium will be updated to use only these methods and
+        not WebAccessibilityCache. Then, WebAccessibilityCache can be
+        deleted from WebKit.
+
+        * public/WebAccessibilityObject.h:
+        * public/WebDocument.h:
+        * src/WebAccessibilityObject.cpp:
+        (WebKit::WebAccessibilityObject::enableAccessibility):
+        (WebKit::WebAccessibilityObject::accessibilityEnabled):
+        (WebKit::WebAccessibilityObject::axID):
+        * src/WebDocument.cpp:
+        (WebKit::WebDocument::accessibilityObject):
+        (WebKit::WebDocument::accessibilityObjectFromID):
+
 2011-09-19  Bill Budge  <bbudge@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebAccessibilityObject.h

@@ -70 +70 @@
 
     bool isNull() const { return m_private.isNull(); }
+
+    // Static methods for enabling accessibility.
+    WEBKIT_EXPORT static void enableAccessibility();
+    WEBKIT_EXPORT static bool accessibilityEnabled();
+
+    WEBKIT_EXPORT int axID() const;
 
     WEBKIT_EXPORT WebString accessibilityDescription() const;

trunk/Source/WebKit/chromium/public/WebDocument.h

@@ -99 +99 @@
     WEBKIT_EXPORT WebNode focusedNode() const;
     WEBKIT_EXPORT WebDocumentType doctype() const;
-    WEBKIT_EXPORT WebAccessibilityObject accessibilityObject() const;
     WEBKIT_EXPORT void cancelFullScreen();
 
+    // Accessibility support. These methods should only be called on the
+    // top-level document, because one accessibility cache spans all of
+    // the documents on the page.
+
+    // Gets the accessibility object for this document.
+    WEBKIT_EXPORT WebAccessibilityObject accessibilityObject() const;
+
+    // Gets the accessibility object for an object on this page by ID.
+    WEBKIT_EXPORT WebAccessibilityObject accessibilityObjectFromID(int axID) const;
     // Inserts the given CSS source code as a user stylesheet in the document.
     // Meant for programatic/one-off injection, as opposed to

trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp

@@ -32 +32 @@
 #include "WebAccessibilityObject.h"
 
+#include "AXObjectCache.h"
 #include "AccessibilityObject.h"
 #include "AccessibilityTable.h"
@@ -70 +71 @@
 }
 
+// static
+void WebAccessibilityObject::enableAccessibility()
+{
+    AXObjectCache::enableAccessibility();
+}
+
+// static
+bool WebAccessibilityObject::accessibilityEnabled()
+{
+    return AXObjectCache::accessibilityEnabled();
+}
+
+int WebAccessibilityObject::axID() const
+{
+    if (m_private.isNull())
+        return -1;
+
+    m_private->updateBackingStore();
+    return m_private->axObjectID();
+}
+
 WebString WebAccessibilityObject::accessibilityDescription() const
 {

trunk/Source/WebKit/chromium/src/WebDocument.cpp

@@ -173 +173 @@
 }
 
-WebAccessibilityObject WebDocument::accessibilityObject() const
-{
-    const Document* document = constUnwrap<Document>();
-    return WebAccessibilityObject(
-        document->axObjectCache()->getOrCreate(document->renderer()));
-}
-
 void WebDocument::insertUserStyleSheet(const WebString& sourceCode, UserStyleLevel level)
 {
@@ -197 +190 @@
 }
 
+WebAccessibilityObject WebDocument::accessibilityObject() const
+{
+    const Document* document = constUnwrap<Document>();
+    return WebAccessibilityObject(
+        document->axObjectCache()->getOrCreate(document->renderer()));
+}
+
+WebAccessibilityObject WebDocument::accessibilityObjectFromID(int axID) const
+{
+    const Document* document = constUnwrap<Document>();
+    return WebAccessibilityObject(
+        document->axObjectCache()->objectFromAXID(axID));
+}
+
 WebDocument::WebDocument(const PassRefPtr<Document>& elem)
     : WebNode(elem)