| 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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
| 6 | 6 |
| 7 #import "content/browser/accessibility/browser_accessibility_mac.h" | 7 #import "content/browser/accessibility/browser_accessibility_mac.h" |
| 8 | 8 |
| 9 #import "content/browser/accessibility/browser_accessibility_cocoa.h" | 9 #import "content/browser/accessibility/browser_accessibility_cocoa.h" |
| 10 #import "content/browser/accessibility/browser_accessibility_delegate_mac.h" | 10 #import "content/browser/accessibility/browser_accessibility_delegate_mac.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 // We take ownership of the cocoa obj here. | 30 // We take ownership of the cocoa obj here. |
| 31 BrowserAccessibilityManagerMac* manager = | 31 BrowserAccessibilityManagerMac* manager = |
| 32 static_cast<BrowserAccessibilityManagerMac*>(manager_); | 32 static_cast<BrowserAccessibilityManagerMac*>(manager_); |
| 33 browser_accessibility_cocoa_ = [[BrowserAccessibilityCocoa alloc] | 33 browser_accessibility_cocoa_ = [[BrowserAccessibilityCocoa alloc] |
| 34 initWithObject:this | 34 initWithObject:this |
| 35 delegate: | 35 delegate: |
| 36 (id<BrowserAccessibilityDelegateCocoa>)manager->parent_view()]; | 36 (id<BrowserAccessibilityDelegateCocoa>)manager->parent_view()]; |
| 37 } | 37 } |
| 38 | 38 |
| 39 void BrowserAccessibilityMac::NativeReleaseReference() { | 39 void BrowserAccessibilityMac::NativeReleaseReference() { |
| 40 if (browser_accessibility_cocoa_) { | 40 // Detach this object from |browser_accessibility_cocoa_| so it |
| 41 BrowserAccessibilityCocoa* temp = browser_accessibility_cocoa_; | 41 // no longer has a pointer to this object. |
| 42 browser_accessibility_cocoa_ = nil; | 42 [browser_accessibility_cocoa_ detach]; |
| 43 // Relinquish ownership of the cocoa obj. | 43 // Now, release it - but at this point, other processes may have a |
| 44 [temp release]; | 44 // reference to the cocoa object. |
| 45 // At this point, other processes may have a reference to | 45 [browser_accessibility_cocoa_ release]; |
| 46 // the cocoa object. When the retain count hits zero, it will | 46 // Finally, it's safe to delete this since we've detached. |
| 47 // destroy us in dealloc. | 47 delete this; |
| 48 // For that reason, do *not* make any more calls here after | |
| 49 // as we might have been deleted. | |
| 50 } | |
| 51 } | 48 } |
| 52 | 49 |
| 53 bool BrowserAccessibilityMac::IsNative() const { | 50 bool BrowserAccessibilityMac::IsNative() const { |
| 54 return true; | 51 return true; |
| 55 } | 52 } |
| 56 | 53 |
| 57 void BrowserAccessibilityMac::DetachTree( | 54 void BrowserAccessibilityMac::DetachTree( |
| 58 std::vector<BrowserAccessibility*>* nodes) { | 55 std::vector<BrowserAccessibility*>* nodes) { |
| 59 [browser_accessibility_cocoa_ childrenChanged]; | 56 [browser_accessibility_cocoa_ childrenChanged]; |
| 60 BrowserAccessibility::DetachTree(nodes); | 57 BrowserAccessibility::DetachTree(nodes); |
| 61 } | 58 } |
| 62 | 59 |
| 63 void BrowserAccessibilityMac::SwapChildren( | 60 void BrowserAccessibilityMac::SwapChildren( |
| 64 std::vector<BrowserAccessibility*>& children) { | 61 std::vector<BrowserAccessibility*>& children) { |
| 65 [browser_accessibility_cocoa_ childrenChanged]; | 62 [browser_accessibility_cocoa_ childrenChanged]; |
| 66 BrowserAccessibility::SwapChildren(children); | 63 BrowserAccessibility::SwapChildren(children); |
| 67 } | 64 } |
| 68 | 65 |
| 69 BrowserAccessibilityCocoa* BrowserAccessibility::ToBrowserAccessibilityCocoa() { | 66 BrowserAccessibilityCocoa* BrowserAccessibility::ToBrowserAccessibilityCocoa() { |
| 70 return static_cast<BrowserAccessibilityMac*>(this)-> | 67 return static_cast<BrowserAccessibilityMac*>(this)-> |
| 71 native_view(); | 68 native_view(); |
| 72 } | 69 } |
| 73 | 70 |
| 74 } // namespace content | 71 } // namespace content |
| OLD | NEW |