| 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/browser_accessibility_win.h" | 5 #include "content/browser/accessibility/browser_accessibility_win.h" |
| 6 | 6 |
| 7 #include "ui/base/win/atl_module.h" | 7 #include "ui/base/win/atl_module.h" |
| 8 | 8 |
| 9 namespace content { | 9 namespace content { |
| 10 | 10 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 BrowserAccessibilityWin::~BrowserAccessibilityWin() {} | 29 BrowserAccessibilityWin::~BrowserAccessibilityWin() {} |
| 30 | 30 |
| 31 void BrowserAccessibilityWin::UpdatePlatformAttributes() { | 31 void BrowserAccessibilityWin::UpdatePlatformAttributes() { |
| 32 GetCOM()->UpdateStep1ComputeWinAttributes(); | 32 GetCOM()->UpdateStep1ComputeWinAttributes(); |
| 33 GetCOM()->UpdateStep2ComputeHypertext(); | 33 GetCOM()->UpdateStep2ComputeHypertext(); |
| 34 GetCOM()->UpdateStep3FireEvents(false); | 34 GetCOM()->UpdateStep3FireEvents(false); |
| 35 } | 35 } |
| 36 | 36 |
| 37 void BrowserAccessibilityWin::Destroy() { | 37 void BrowserAccessibilityWin::Destroy() { |
| 38 if (browser_accessibility_com_) { | 38 if (browser_accessibility_com_) { |
| 39 browser_accessibility_com_->SetOwner(nullptr); | 39 // Clear the delegate and owner from our |
| 40 // TODO(dougt) AXPlatformNode::Reset | 40 // BrowserAccessibilityComWin object. |
| 41 browser_accessibility_com_->Init(nullptr); | 41 browser_accessibility_com_->detach(); |
| 42 |
| 42 browser_accessibility_com_->Release(); | 43 browser_accessibility_com_->Release(); |
| 43 browser_accessibility_com_ = nullptr; | 44 browser_accessibility_com_ = nullptr; |
| 44 } | 45 } |
| 45 BrowserAccessibility::Destroy(); | 46 BrowserAccessibility::Destroy(); |
| 46 } | 47 } |
| 47 | 48 |
| 48 void BrowserAccessibilityWin::OnSubtreeWillBeDeleted() { | 49 void BrowserAccessibilityWin::OnSubtreeWillBeDeleted() { |
| 49 GetCOM()->FireNativeEvent(EVENT_OBJECT_HIDE); | 50 GetCOM()->FireNativeEvent(EVENT_OBJECT_HIDE); |
| 50 } | 51 } |
| 51 | 52 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 73 return static_cast<BrowserAccessibilityWin*>(obj); | 74 return static_cast<BrowserAccessibilityWin*>(obj); |
| 74 } | 75 } |
| 75 | 76 |
| 76 const BrowserAccessibilityWin* | 77 const BrowserAccessibilityWin* |
| 77 ToBrowserAccessibilityWin(const BrowserAccessibility* obj) { | 78 ToBrowserAccessibilityWin(const BrowserAccessibility* obj) { |
| 78 DCHECK(!obj || obj->IsNative()); | 79 DCHECK(!obj || obj->IsNative()); |
| 79 return static_cast<const BrowserAccessibilityWin*>(obj); | 80 return static_cast<const BrowserAccessibilityWin*>(obj); |
| 80 } | 81 } |
| 81 | 82 |
| 82 } // namespace content | 83 } // namespace content |
| OLD | NEW |