diff options
author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/page/gtk | |
parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/page/gtk')
-rw-r--r-- | WebCore/page/gtk/AccessibilityObjectWrapperAtk.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/page/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/page/gtk/AccessibilityObjectWrapperAtk.cpp index c1a405e..84f3d34 100644 --- a/WebCore/page/gtk/AccessibilityObjectWrapperAtk.cpp +++ b/WebCore/page/gtk/AccessibilityObjectWrapperAtk.cpp @@ -110,7 +110,7 @@ static const gchar* webkit_accessible_get_name(AtkObject* object) { // TODO: Deal with later changes. if (!object->name) - atk_object_set_name(object, core(object)->title().utf8().data()); + atk_object_set_name(object, core(object)->stringValue().utf8().data()); return object->name; } @@ -650,7 +650,7 @@ void webkit_accessible_detach(WebKitAccessible* accessible) // detachment. // FIXME: Using fallbackCache->get(ListBoxOptionRole) is a hack. - accessible->m_object = fallbackCache->get(ListBoxOptionRole); + accessible->m_object = fallbackCache->getOrCreate(ListBoxOptionRole); } } |