From 6a983b4e4d28c1e3841f39febeb6a9dd681b53b3 Mon Sep 17 00:00:00 2001 From: "klink@chromium.org" Date: Fri, 20 Mar 2009 20:12:25 +0000 Subject: Removes all use of COM and dependencies on Windows-specific classes (including the use of AccessibleBase and AccessibleDocument) in the glue accessibility implementation.Introduces the GlueAccessibilityObject, which serves as a platform-independent wrapper directly around WebKit's AccessibilityObject (also platoform-independent).Updates naming/comments to reflect the independence of IAccessible both in glue and (where appropriate) in the browser-side accessibility. Review URL: http://codereview.chromium.org/46013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12207 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/browser_accessibility_manager.cc | 27 +++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'chrome/browser/browser_accessibility_manager.cc') diff --git a/chrome/browser/browser_accessibility_manager.cc b/chrome/browser/browser_accessibility_manager.cc index fa72ae5..e97e0e4 100644 --- a/chrome/browser/browser_accessibility_manager.cc +++ b/chrome/browser/browser_accessibility_manager.cc @@ -10,9 +10,11 @@ #include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" +using webkit_glue::WebAccessibility; + // The time in ms after which we give up and return an error when processing an // accessibility message and no response has been received from the renderer. -static const int kAccessibilityMessageTimeOut = 500; +static const int kAccessibilityMessageTimeOut = 10000; // static BrowserAccessibilityManager* BrowserAccessibilityManager::GetInstance() { @@ -36,7 +38,7 @@ BrowserAccessibilityManager::~BrowserAccessibilityManager() { } STDMETHODIMP BrowserAccessibilityManager::CreateAccessibilityInstance( - REFIID iid, int iaccessible_id, int instance_id, void** interface_ptr) { + REFIID iid, int acc_obj_id, int instance_id, void** interface_ptr) { if (IID_IUnknown == iid || IID_IDispatch == iid || IID_IAccessible == iid) { CComObject* instance = NULL; @@ -49,7 +51,7 @@ STDMETHODIMP BrowserAccessibilityManager::CreateAccessibilityInstance( CComPtr accessibility_instance(instance); // Set unique ids. - instance->set_iaccessible_id(iaccessible_id); + instance->set_iaccessible_id(acc_obj_id); instance->set_instance_id(instance_id); // Retrieve the RenderWidgetHost connected to this request. @@ -78,14 +80,14 @@ STDMETHODIMP BrowserAccessibilityManager::CreateAccessibilityInstance( } bool BrowserAccessibilityManager::RequestAccessibilityInfo( - int iaccessible_id, int instance_id, int iaccessible_func_id, - VARIANT var_id, LONG input1, LONG input2) { - // Create and populate input message structure. - AccessibilityInParams in_params; - - in_params.iaccessible_id = iaccessible_id; - in_params.iaccessible_function_id = iaccessible_func_id; - in_params.input_variant_lval = var_id.lVal; + int acc_obj_id, int instance_id, int acc_func_id, int child_id, long input1, + long input2) { + // Create and populate IPC message structure, for retrieval of accessibility + // information from the renderer. + WebAccessibility::InParams in_params; + in_params.object_id = acc_obj_id; + in_params.function_id = acc_func_id; + in_params.child_id = child_id; in_params.input_long1 = input1; in_params.input_long2 = input2; @@ -113,11 +115,10 @@ bool BrowserAccessibilityManager::RequestAccessibilityInfo( success = members->render_widget_host_->process()->channel()-> SendWithTimeout(msg, kAccessibilityMessageTimeOut); } - return success; } -const AccessibilityOutParams& BrowserAccessibilityManager::response() { +const WebAccessibility::OutParams& BrowserAccessibilityManager::response() { return out_params_; } -- cgit v1.1