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

Side by Side Diff: content/browser/accessibility/browser_accessibility_win.h

Issue 1598583002: Fixed algorithms that compute bounding rectangles and word start offsets to take into account IA2 h… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added a TODO to investigate test failure on Linux. Created 4 years, 11 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 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_ 5 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
6 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_ 6 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlcom.h> 9 #include <atlcom.h>
10 #include <oleacc.h> 10 #include <oleacc.h>
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 // CComObjectRootEx methods. 706 // CComObjectRootEx methods.
707 // 707 //
708 708
709 // Called by BEGIN_COM_MAP() / END_COM_MAP(). 709 // Called by BEGIN_COM_MAP() / END_COM_MAP().
710 static CONTENT_EXPORT HRESULT WINAPI 710 static CONTENT_EXPORT HRESULT WINAPI
711 InternalQueryInterface(void* this_ptr, 711 InternalQueryInterface(void* this_ptr,
712 const _ATL_INTMAP_ENTRY* entries, 712 const _ATL_INTMAP_ENTRY* entries,
713 REFIID iid, 713 REFIID iid,
714 void** object); 714 void** object);
715 715
716 CONTENT_EXPORT base::string16 GetText() const override;
717
716 // Accessors. 718 // Accessors.
717 int32_t ia_role() const { return win_attributes_->ia_role; } 719 int32_t ia_role() const { return win_attributes_->ia_role; }
718 int32_t ia_state() const { return win_attributes_->ia_state; } 720 int32_t ia_state() const { return win_attributes_->ia_state; }
719 const base::string16& role_name() const { return win_attributes_->role_name; } 721 const base::string16& role_name() const { return win_attributes_->role_name; }
720 int32_t ia2_role() const { return win_attributes_->ia2_role; } 722 int32_t ia2_role() const { return win_attributes_->ia2_role; }
721 int32_t ia2_state() const { return win_attributes_->ia2_state; } 723 int32_t ia2_state() const { return win_attributes_->ia2_state; }
722 const std::vector<base::string16>& ia2_attributes() const { 724 const std::vector<base::string16>& ia2_attributes() const {
723 return win_attributes_->ia2_attributes; 725 return win_attributes_->ia2_attributes;
724 } 726 }
725 base::string16 name() const { return win_attributes_->name; } 727 base::string16 name() const { return win_attributes_->name; }
726 base::string16 description() const { return win_attributes_->description; } 728 base::string16 description() const { return win_attributes_->description; }
727 base::string16 value() const { return win_attributes_->value; } 729 base::string16 value() const { return win_attributes_->value; }
728 base::string16 hypertext() const { return win_attributes_->hypertext; }
729 std::map<int32_t, int32_t>& hyperlink_offset_to_index() const { 730 std::map<int32_t, int32_t>& hyperlink_offset_to_index() const {
730 return win_attributes_->hyperlink_offset_to_index; 731 return win_attributes_->hyperlink_offset_to_index;
731 } 732 }
732 std::vector<int32_t>& hyperlinks() const { 733 std::vector<int32_t>& hyperlinks() const {
733 return win_attributes_->hyperlinks; 734 return win_attributes_->hyperlinks;
734 } 735 }
735 736
736 private: 737 private:
737 // Add one to the reference count and return the same object. Always 738 // Add one to the reference count and return the same object. Always
738 // use this method when returning a BrowserAccessibilityWin object as 739 // use this method when returning a BrowserAccessibilityWin object as
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 // Give BrowserAccessibility::Create access to our constructor. 924 // Give BrowserAccessibility::Create access to our constructor.
924 friend class BrowserAccessibility; 925 friend class BrowserAccessibility;
925 friend class BrowserAccessibilityRelation; 926 friend class BrowserAccessibilityRelation;
926 927
927 DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityWin); 928 DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityWin);
928 }; 929 };
929 930
930 } // namespace content 931 } // namespace content
931 932
932 #endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_ 933 #endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698