diff options
Diffstat (limited to 'webkit/glue/webaccessibilitymanager_impl.cc')
| -rw-r--r-- | webkit/glue/webaccessibilitymanager_impl.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/webkit/glue/webaccessibilitymanager_impl.cc b/webkit/glue/webaccessibilitymanager_impl.cc index 5f2f2e3..be4e9a0 100644 --- a/webkit/glue/webaccessibilitymanager_impl.cc +++ b/webkit/glue/webaccessibilitymanager_impl.cc @@ -12,11 +12,14 @@ #include "webkit/glue/webaccessibilitymanager_impl.h" +#include "webkit/api/public/WebAccessibilityObject.h" #include "webkit/glue/glue_accessibility_object.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webframe_impl.h" #include "webkit/glue/webview_impl.h" +using WebKit::WebAccessibilityObject; + namespace webkit_glue { // struct WebAccessibilityManagerImpl::GlueAccessibilityObjectRoot @@ -258,13 +261,16 @@ bool WebAccessibilityManagerImpl::ClearAccObjMap(int acc_obj_id, } int WebAccessibilityManagerImpl::FocusAccObj( - WebCore::AccessibilityObject* acc_obj) { - if (!acc_obj) { + const WebAccessibilityObject& object) { + if (object.isNull()) { // Return with failure. return -1; } - AccObjToIntMap::iterator it = acc_obj_to_int_map_.find(acc_obj); + RefPtr<WebCore::AccessibilityObject> acc_obj = + WebAccessibilityObjectToAccessibilityObject(object); + + AccObjToIntMap::iterator it = acc_obj_to_int_map_.find(acc_obj.get()); if (it != acc_obj_to_int_map_.end()) return it->second; @@ -272,8 +278,8 @@ int WebAccessibilityManagerImpl::FocusAccObj( // Insert new accessibility object in hashmaps and return its newly // assigned accessibility object id. int_to_glue_acc_obj_map_[acc_obj_id_] = - GlueAccessibilityObject::CreateInstance(acc_obj); - acc_obj_to_int_map_[acc_obj] = acc_obj_id_; + GlueAccessibilityObject::CreateInstance(acc_obj.get()); + acc_obj_to_int_map_[acc_obj.get()] = acc_obj_id_; return acc_obj_id_++; } |