Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2017 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2017 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/browser_accessibility_com_win.h" | 5 #include "content/browser/accessibility/browser_accessibility_com_win.h" |
| 6 | 6 |
| 7 #include <UIAutomationClient.h> | 7 #include <UIAutomationClient.h> |
| 8 #include <UIAutomationCoreApi.h> | 8 #include <UIAutomationCoreApi.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 4076 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4087 | 4087 |
| 4088 BrowserAccessibilityManager* BrowserAccessibilityComWin::Manager() const { | 4088 BrowserAccessibilityManager* BrowserAccessibilityComWin::Manager() const { |
| 4089 auto* owner = GetOwner(); | 4089 auto* owner = GetOwner(); |
| 4090 DCHECK(owner); | 4090 DCHECK(owner); |
| 4091 | 4091 |
| 4092 auto* manager = owner->manager(); | 4092 auto* manager = owner->manager(); |
| 4093 DCHECK(manager); | 4093 DCHECK(manager); |
| 4094 return manager; | 4094 return manager; |
| 4095 } | 4095 } |
| 4096 | 4096 |
| 4097 // | |
| 4098 // AXPlatformNode overrides | |
| 4099 // | |
| 4100 void BrowserAccessibilityComWin::Destroy() { | |
| 4101 // Detach BrowserAccessibilityWin from us. | |
| 4102 owner_ = nullptr; | |
| 4103 delegate_ = nullptr; | |
| 4104 | |
| 4105 AXPlatformNode::Destroy(); | |
|
dmazzoni
2017/05/10 15:17:52
You definitely want AXPlatformNodeWin::Destroy() h
| |
| 4106 } | |
| 4107 | |
| 4097 std::vector<base::string16> BrowserAccessibilityComWin::ComputeTextAttributes() | 4108 std::vector<base::string16> BrowserAccessibilityComWin::ComputeTextAttributes() |
| 4098 const { | 4109 const { |
| 4099 std::vector<base::string16> attributes; | 4110 std::vector<base::string16> attributes; |
| 4100 | 4111 |
| 4101 // We include list markers for now, but there might be other objects that are | 4112 // We include list markers for now, but there might be other objects that are |
| 4102 // auto generated. | 4113 // auto generated. |
| 4103 // TODO(nektar): Compute what objects are auto-generated in Blink. | 4114 // TODO(nektar): Compute what objects are auto-generated in Blink. |
| 4104 if (GetOwner()->GetRole() == ui::AX_ROLE_LIST_MARKER) | 4115 if (GetOwner()->GetRole() == ui::AX_ROLE_LIST_MARKER) |
| 4105 attributes.push_back(L"auto-generated:true"); | 4116 attributes.push_back(L"auto-generated:true"); |
| 4106 else | 4117 else |
| (...skipping 1618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5725 | 5736 |
| 5726 BrowserAccessibilityComWin* ToBrowserAccessibilityComWin( | 5737 BrowserAccessibilityComWin* ToBrowserAccessibilityComWin( |
| 5727 BrowserAccessibility* obj) { | 5738 BrowserAccessibility* obj) { |
| 5728 if (!obj || !obj->IsNative()) | 5739 if (!obj || !obj->IsNative()) |
| 5729 return nullptr; | 5740 return nullptr; |
| 5730 auto* result = static_cast<BrowserAccessibilityWin*>(obj)->GetCOM(); | 5741 auto* result = static_cast<BrowserAccessibilityWin*>(obj)->GetCOM(); |
| 5731 return result; | 5742 return result; |
| 5732 } | 5743 } |
| 5733 | 5744 |
| 5734 } // namespace content | 5745 } // namespace content |
| OLD | NEW |