OLD | NEW |
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <vector> | 5 #include <vector> |
6 | 6 |
7 #include "webkit/tools/test_shell/accessibility_controller.h" | 7 #include "webkit/tools/test_shell/accessibility_controller.h" |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "webkit/api/public/WebAccessibilityController.h" | 10 #include "webkit/api/public/WebAccessibilityCache.h" |
11 #include "webkit/api/public/WebAccessibilityObject.h" | 11 #include "webkit/api/public/WebAccessibilityObject.h" |
12 #include "webkit/api/public/WebFrame.h" | 12 #include "webkit/api/public/WebFrame.h" |
13 #include "webkit/api/public/WebView.h" | 13 #include "webkit/api/public/WebView.h" |
14 #include "webkit/tools/test_shell/test_shell.h" | 14 #include "webkit/tools/test_shell/test_shell.h" |
15 | 15 |
16 using WebKit::WebAccessibilityController; | 16 using WebKit::WebAccessibilityCache; |
17 using WebKit::WebAccessibilityObject; | 17 using WebKit::WebAccessibilityObject; |
18 using WebKit::WebFrame; | 18 using WebKit::WebFrame; |
19 | 19 |
20 AccessibilityController::AccessibilityController(TestShell* shell) | 20 AccessibilityController::AccessibilityController(TestShell* shell) |
21 : shell_(shell) { | 21 : shell_(shell) { |
22 | 22 |
23 BindMethod("logFocusEvents", | 23 BindMethod("logFocusEvents", |
24 &AccessibilityController::LogFocusEventsCallback); | 24 &AccessibilityController::LogFocusEventsCallback); |
25 BindMethod("logScrollingStartEvents", | 25 BindMethod("logScrollingStartEvents", |
26 &AccessibilityController::LogScrollingStartEventsCallback); | 26 &AccessibilityController::LogScrollingStartEventsCallback); |
27 | 27 |
28 BindProperty("focusedElement", | 28 BindProperty("focusedElement", |
29 &AccessibilityController::FocusedElementGetterCallback); | 29 &AccessibilityController::FocusedElementGetterCallback); |
30 BindProperty("rootElement", | 30 BindProperty("rootElement", |
31 &AccessibilityController::RootElementGetterCallback); | 31 &AccessibilityController::RootElementGetterCallback); |
32 | 32 |
33 BindFallbackMethod(&AccessibilityController::FallbackCallback); | 33 BindFallbackMethod(&AccessibilityController::FallbackCallback); |
34 } | 34 } |
35 | 35 |
36 void AccessibilityController::BindToJavascript( | 36 void AccessibilityController::BindToJavascript( |
37 WebFrame* frame, const std::wstring& classname) { | 37 WebFrame* frame, const std::wstring& classname) { |
38 WebAccessibilityController::enableAccessibility(); | 38 WebAccessibilityCache::enableAccessibility(); |
39 CppBoundClass::BindToJavascript(frame, classname); | 39 CppBoundClass::BindToJavascript(frame, classname); |
40 } | 40 } |
41 | 41 |
42 void AccessibilityController::Reset() { | 42 void AccessibilityController::Reset() { |
43 root_element_ = WebAccessibilityObject(); | 43 root_element_ = WebAccessibilityObject(); |
44 focused_element_ = WebAccessibilityObject(); | 44 focused_element_ = WebAccessibilityObject(); |
45 elements_.Clear(); | 45 elements_.Clear(); |
46 } | 46 } |
47 | 47 |
48 void AccessibilityController::SetFocusedElement( | 48 void AccessibilityController::SetFocusedElement( |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 CppVariant *result) { | 89 CppVariant *result) { |
90 std::wstring message( | 90 std::wstring message( |
91 L"JavaScript ERROR: unknown method called on AccessibilityController"); | 91 L"JavaScript ERROR: unknown method called on AccessibilityController"); |
92 if (!shell_->layout_test_mode()) { | 92 if (!shell_->layout_test_mode()) { |
93 logging::LogMessage("CONSOLE:", 0).stream() << message; | 93 logging::LogMessage("CONSOLE:", 0).stream() << message; |
94 } else { | 94 } else { |
95 printf("CONSOLE MESSAGE: %S\n", message.c_str()); | 95 printf("CONSOLE MESSAGE: %S\n", message.c_str()); |
96 } | 96 } |
97 result->SetNull(); | 97 result->SetNull(); |
98 } | 98 } |
OLD | NEW |