Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: content/browser/accessibility/browser_accessibility_cocoa.mm

Issue 1768753003: Implemented the reporting of text style and language information on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added unit and dmp tree tests. Addressed all reviewer's comments. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <execinfo.h> 5 #include <execinfo.h>
6 #include <stddef.h> 6 #include <stddef.h>
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #import "content/browser/accessibility/browser_accessibility_cocoa.h" 9 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
10 10
11 #include <map> 11 #include <map>
12 12
13 #include "base/mac/foundation_util.h" 13 #include "base/mac/foundation_util.h"
14 #include "base/mac/scoped_cftyperef.h" 14 #include "base/mac/scoped_cftyperef.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "base/strings/sys_string_conversions.h" 16 #include "base/strings/sys_string_conversions.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "content/app/strings/grit/content_strings.h" 18 #include "content/app/strings/grit/content_strings.h"
19 #include "content/browser/accessibility/browser_accessibility_mac.h" 19 #include "content/browser/accessibility/browser_accessibility_mac.h"
20 #include "content/browser/accessibility/browser_accessibility_manager.h" 20 #include "content/browser/accessibility/browser_accessibility_manager.h"
21 #include "content/browser/accessibility/browser_accessibility_manager_mac.h" 21 #include "content/browser/accessibility/browser_accessibility_manager_mac.h"
22 #include "content/browser/accessibility/one_shot_accessibility_tree_search.h" 22 #include "content/browser/accessibility/one_shot_accessibility_tree_search.h"
23 #include "content/public/common/content_client.h" 23 #include "content/public/common/content_client.h"
24 #include "third_party/skia/include/core/SkColor.h"
24 #import "ui/accessibility/platform/ax_platform_node_mac.h" 25 #import "ui/accessibility/platform/ax_platform_node_mac.h"
25 26
26 using content::AXTreeIDRegistry; 27 using content::AXTreeIDRegistry;
27 using content::AccessibilityMatchPredicate; 28 using content::AccessibilityMatchPredicate;
28 using content::BrowserAccessibility; 29 using content::BrowserAccessibility;
29 using content::BrowserAccessibilityDelegate; 30 using content::BrowserAccessibilityDelegate;
30 using content::BrowserAccessibilityManager; 31 using content::BrowserAccessibilityManager;
31 using content::BrowserAccessibilityManagerMac; 32 using content::BrowserAccessibilityManagerMac;
32 using content::ContentClient; 33 using content::ContentClient;
33 using content::OneShotAccessibilityTreeSearch; 34 using content::OneShotAccessibilityTreeSearch;
(...skipping 1466 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 } else if ([role isEqualToString:NSAccessibilityProgressIndicatorRole] || 1501 } else if ([role isEqualToString:NSAccessibilityProgressIndicatorRole] ||
1501 [role isEqualToString:NSAccessibilitySliderRole] || 1502 [role isEqualToString:NSAccessibilitySliderRole] ||
1502 [role isEqualToString:NSAccessibilityIncrementorRole] || 1503 [role isEqualToString:NSAccessibilityIncrementorRole] ||
1503 [role isEqualToString:NSAccessibilityScrollBarRole]) { 1504 [role isEqualToString:NSAccessibilityScrollBarRole]) {
1504 float floatValue; 1505 float floatValue;
1505 if (browserAccessibility_->GetFloatAttribute( 1506 if (browserAccessibility_->GetFloatAttribute(
1506 ui::AX_ATTR_VALUE_FOR_RANGE, &floatValue)) { 1507 ui::AX_ATTR_VALUE_FOR_RANGE, &floatValue)) {
1507 return [NSNumber numberWithFloat:floatValue]; 1508 return [NSNumber numberWithFloat:floatValue];
1508 } 1509 }
1509 } else if ([role isEqualToString:NSAccessibilityColorWellRole]) { 1510 } else if ([role isEqualToString:NSAccessibilityColorWellRole]) {
1510 int color = browserAccessibility_->GetIntAttribute( 1511 unsigned int color = static_cast<unsigned int>(
1511 ui::AX_ATTR_COLOR_VALUE); 1512 browserAccessibility_->GetIntAttribute(ui::AX_ATTR_COLOR_VALUE));
1512 int red = (color >> 16) & 0xFF; 1513 unsigned int red = SkColorGetR(color);
1513 int green = (color >> 8) & 0xFF; 1514 unsigned int green = SkColorGetG(color);
1514 int blue = color & 0xFF; 1515 unsigned int blue = SkColorGetB(color);
1515 // This string matches the one returned by a native Mac color well. 1516 // This string matches the one returned by a native Mac color well.
1516 return [NSString stringWithFormat:@"rgb %7.5f %7.5f %7.5f 1", 1517 return [NSString stringWithFormat:@"rgb %7.5f %7.5f %7.5f 1",
1517 red / 255., green / 255., blue / 255.]; 1518 red / 255., green / 255., blue / 255.];
1518 } 1519 }
1519 1520
1520 return base::SysUTF16ToNSString(browserAccessibility_->GetValue()); 1521 return base::SysUTF16ToNSString(browserAccessibility_->GetValue());
1521 } 1522 }
1522 1523
1523 - (NSString*)valueDescription { 1524 - (NSString*)valueDescription {
1524 if (browserAccessibility_) 1525 if (browserAccessibility_)
(...skipping 801 matching lines...) Expand 10 before | Expand all | Expand 10 after
2326 if (!browserAccessibility_) 2327 if (!browserAccessibility_)
2327 return [super hash]; 2328 return [super hash];
2328 return browserAccessibility_->GetId(); 2329 return browserAccessibility_->GetId();
2329 } 2330 }
2330 2331
2331 - (BOOL)accessibilityShouldUseUniqueId { 2332 - (BOOL)accessibilityShouldUseUniqueId {
2332 return YES; 2333 return YES;
2333 } 2334 }
2334 2335
2335 @end 2336 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698