OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/accessibility/accessibility_tree_formatter.h" | 5 #include "content/browser/accessibility/accessibility_tree_formatter.h" |
6 | 6 |
7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
11 #include "base/json/json_writer.h" | 11 #include "base/json/json_writer.h" |
| 12 #include "base/strings/string_number_conversions.h" |
12 #include "base/strings/stringprintf.h" | 13 #include "base/strings/stringprintf.h" |
13 #include "base/strings/sys_string_conversions.h" | 14 #include "base/strings/sys_string_conversions.h" |
14 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
15 #include "content/browser/accessibility/browser_accessibility_cocoa.h" | 16 #include "content/browser/accessibility/browser_accessibility_cocoa.h" |
16 #include "content/browser/accessibility/browser_accessibility_mac.h" | 17 #include "content/browser/accessibility/browser_accessibility_mac.h" |
17 #include "content/browser/accessibility/browser_accessibility_manager.h" | 18 #include "content/browser/accessibility/browser_accessibility_manager.h" |
18 | 19 |
19 using base::StringPrintf; | 20 using base::StringPrintf; |
20 using base::SysNSStringToUTF8; | 21 using base::SysNSStringToUTF8; |
21 using base::SysNSStringToUTF16; | 22 using base::SysNSStringToUTF16; |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 } | 184 } |
184 | 185 |
185 } // namespace | 186 } // namespace |
186 | 187 |
187 void AccessibilityTreeFormatter::Initialize() { | 188 void AccessibilityTreeFormatter::Initialize() { |
188 } | 189 } |
189 | 190 |
190 | 191 |
191 void AccessibilityTreeFormatter::AddProperties(const BrowserAccessibility& node, | 192 void AccessibilityTreeFormatter::AddProperties(const BrowserAccessibility& node, |
192 base::DictionaryValue* dict) { | 193 base::DictionaryValue* dict) { |
| 194 dict->SetInteger("id", node.GetId()); |
193 BrowserAccessibilityCocoa* cocoa_node = | 195 BrowserAccessibilityCocoa* cocoa_node = |
194 const_cast<BrowserAccessibility*>(&node)->ToBrowserAccessibilityCocoa(); | 196 const_cast<BrowserAccessibility*>(&node)->ToBrowserAccessibilityCocoa(); |
195 NSArray* supportedAttributes = [cocoa_node accessibilityAttributeNames]; | 197 NSArray* supportedAttributes = [cocoa_node accessibilityAttributeNames]; |
196 | 198 |
197 string role = SysNSStringToUTF8( | 199 string role = SysNSStringToUTF8( |
198 [cocoa_node accessibilityAttributeValue:NSAccessibilityRoleAttribute]); | 200 [cocoa_node accessibilityAttributeValue:NSAccessibilityRoleAttribute]); |
199 dict->SetString(SysNSStringToUTF8(NSAccessibilityRoleAttribute), role); | 201 dict->SetString(SysNSStringToUTF8(NSAccessibilityRoleAttribute), role); |
200 | 202 |
201 NSString* subrole = | 203 NSString* subrole = |
202 [cocoa_node accessibilityAttributeValue:NSAccessibilitySubroleAttribute]; | 204 [cocoa_node accessibilityAttributeValue:NSAccessibilitySubroleAttribute]; |
(...skipping 11 matching lines...) Expand all Loading... |
214 dict->Set( | 216 dict->Set( |
215 SysNSStringToUTF8(requestedAttribute), | 217 SysNSStringToUTF8(requestedAttribute), |
216 PopulateObject(value).release()); | 218 PopulateObject(value).release()); |
217 } | 219 } |
218 } | 220 } |
219 dict->Set(kPositionDictAttr, PopulatePosition(node).release()); | 221 dict->Set(kPositionDictAttr, PopulatePosition(node).release()); |
220 dict->Set(kSizeDictAttr, PopulateSize(cocoa_node).release()); | 222 dict->Set(kSizeDictAttr, PopulateSize(cocoa_node).release()); |
221 } | 223 } |
222 | 224 |
223 base::string16 AccessibilityTreeFormatter::ToString( | 225 base::string16 AccessibilityTreeFormatter::ToString( |
224 const base::DictionaryValue& dict, | 226 const base::DictionaryValue& dict) { |
225 const base::string16& indent) { | |
226 base::string16 line; | 227 base::string16 line; |
| 228 if (show_ids_) { |
| 229 int id_value; |
| 230 dict.GetInteger("id", &id_value); |
| 231 WriteAttribute(true, base::IntToString16(id_value), &line); |
| 232 } |
| 233 |
227 NSArray* defaultAttributes = | 234 NSArray* defaultAttributes = |
228 [NSArray arrayWithObjects:NSAccessibilityTitleAttribute, | 235 [NSArray arrayWithObjects:NSAccessibilityTitleAttribute, |
229 NSAccessibilityValueAttribute, | 236 NSAccessibilityValueAttribute, |
230 nil]; | 237 nil]; |
231 string s_value; | 238 string s_value; |
232 dict.GetString(SysNSStringToUTF8(NSAccessibilityRoleAttribute), &s_value); | 239 dict.GetString(SysNSStringToUTF8(NSAccessibilityRoleAttribute), &s_value); |
233 WriteAttribute(true, base::UTF8ToUTF16(s_value), &line); | 240 WriteAttribute(true, base::UTF8ToUTF16(s_value), &line); |
234 | 241 |
235 string subroleAttribute = SysNSStringToUTF8(NSAccessibilitySubroleAttribute); | 242 string subroleAttribute = SysNSStringToUTF8(NSAccessibilitySubroleAttribute); |
236 if (dict.GetString(subroleAttribute, &s_value)) { | 243 if (dict.GetString(subroleAttribute, &s_value)) { |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 *d_value), | 278 *d_value), |
272 &line); | 279 &line); |
273 } | 280 } |
274 if (dict.GetDictionary(kSizeDictAttr, &d_value)) { | 281 if (dict.GetDictionary(kSizeDictAttr, &d_value)) { |
275 WriteAttribute(false, | 282 WriteAttribute(false, |
276 FormatCoordinates(kSizeDictAttr, | 283 FormatCoordinates(kSizeDictAttr, |
277 kWidthDictAttr, kHeightDictAttr, *d_value), | 284 kWidthDictAttr, kHeightDictAttr, *d_value), |
278 &line); | 285 &line); |
279 } | 286 } |
280 | 287 |
281 return indent + line + base::ASCIIToUTF16("\n"); | 288 return line; |
282 } | 289 } |
283 | 290 |
284 // static | 291 // static |
285 const base::FilePath::StringType | 292 const base::FilePath::StringType |
286 AccessibilityTreeFormatter::GetActualFileSuffix() { | 293 AccessibilityTreeFormatter::GetActualFileSuffix() { |
287 return FILE_PATH_LITERAL("-actual-mac.txt"); | 294 return FILE_PATH_LITERAL("-actual-mac.txt"); |
288 } | 295 } |
289 | 296 |
290 // static | 297 // static |
291 const base::FilePath::StringType | 298 const base::FilePath::StringType |
(...skipping 10 matching lines...) Expand all Loading... |
302 const string AccessibilityTreeFormatter::GetAllowString() { | 309 const string AccessibilityTreeFormatter::GetAllowString() { |
303 return "@MAC-ALLOW:"; | 310 return "@MAC-ALLOW:"; |
304 } | 311 } |
305 | 312 |
306 // static | 313 // static |
307 const string AccessibilityTreeFormatter::GetDenyString() { | 314 const string AccessibilityTreeFormatter::GetDenyString() { |
308 return "@MAC-DENY:"; | 315 return "@MAC-DENY:"; |
309 } | 316 } |
310 | 317 |
311 } // namespace content | 318 } // namespace content |
OLD | NEW |