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

Side by Side Diff: Source/modules/accessibility/AXSlider.cpp

Issue 1072273006: Oilpan: Prepare moving AXObject to heap (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 26 matching lines...) Expand all
37 37
38 namespace blink { 38 namespace blink {
39 39
40 using namespace HTMLNames; 40 using namespace HTMLNames;
41 41
42 AXSlider::AXSlider(LayoutObject* layoutObject, AXObjectCacheImpl* axObjectCache) 42 AXSlider::AXSlider(LayoutObject* layoutObject, AXObjectCacheImpl* axObjectCache)
43 : AXLayoutObject(layoutObject, axObjectCache) 43 : AXLayoutObject(layoutObject, axObjectCache)
44 { 44 {
45 } 45 }
46 46
47 PassRefPtr<AXSlider> AXSlider::create(LayoutObject* layoutObject, AXObjectCacheI mpl* axObjectCache) 47 PassRefPtrWillBeRawPtr<AXSlider> AXSlider::create(LayoutObject* layoutObject, AX ObjectCacheImpl* axObjectCache)
48 { 48 {
49 return adoptRef(new AXSlider(layoutObject, axObjectCache)); 49 return adoptRefWillBeNoop(new AXSlider(layoutObject, axObjectCache));
50 } 50 }
51 51
52 AccessibilityRole AXSlider::determineAccessibilityRole() 52 AccessibilityRole AXSlider::determineAccessibilityRole()
53 { 53 {
54 if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole) 54 if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole)
55 return m_ariaRole; 55 return m_ariaRole;
56 56
57 return SliderRole; 57 return SliderRole;
58 } 58 }
59 59
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 m_haveChildren = true; 92 m_haveChildren = true;
93 93
94 AXObjectCacheImpl* cache = axObjectCache(); 94 AXObjectCacheImpl* cache = axObjectCache();
95 95
96 AXSliderThumb* thumb = static_cast<AXSliderThumb*>(cache->getOrCreate(Slider ThumbRole)); 96 AXSliderThumb* thumb = static_cast<AXSliderThumb*>(cache->getOrCreate(Slider ThumbRole));
97 thumb->setParent(this); 97 thumb->setParent(this);
98 98
99 // Before actually adding the value indicator to the hierarchy, 99 // Before actually adding the value indicator to the hierarchy,
100 // allow the platform to make a final decision about it. 100 // allow the platform to make a final decision about it.
101 if (thumb->accessibilityIsIgnored()) 101 if (thumb->accessibilityIsIgnored()) {
102 #if ENABLE(OILPAN)
103 cache->remove(thumb);
104 #else
102 cache->remove(thumb->axObjectID()); 105 cache->remove(thumb->axObjectID());
103 else 106 #endif
107 } else {
104 m_children.append(thumb); 108 m_children.append(thumb);
109 }
105 } 110 }
106 111
107 const AtomicString& AXSlider::getAttribute(const QualifiedName& attribute) const 112 const AtomicString& AXSlider::getAttribute(const QualifiedName& attribute) const
108 { 113 {
109 return element()->getAttribute(attribute); 114 return element()->getAttribute(attribute);
110 } 115 }
111 116
112 AXObject* AXSlider::elementAccessibilityHitTest(const IntPoint& point) const 117 AXObject* AXSlider::elementAccessibilityHitTest(const IntPoint& point) const
113 { 118 {
114 if (m_children.size()) { 119 if (m_children.size()) {
(...skipping 21 matching lines...) Expand all
136 HTMLInputElement* AXSlider::element() const 141 HTMLInputElement* AXSlider::element() const
137 { 142 {
138 return toHTMLInputElement(m_layoutObject->node()); 143 return toHTMLInputElement(m_layoutObject->node());
139 } 144 }
140 145
141 AXSliderThumb::AXSliderThumb(AXObjectCacheImpl* axObjectCache) 146 AXSliderThumb::AXSliderThumb(AXObjectCacheImpl* axObjectCache)
142 : AXMockObject(axObjectCache) 147 : AXMockObject(axObjectCache)
143 { 148 {
144 } 149 }
145 150
146 PassRefPtr<AXSliderThumb> AXSliderThumb::create(AXObjectCacheImpl* axObjectCache ) 151 PassRefPtrWillBeRawPtr<AXSliderThumb> AXSliderThumb::create(AXObjectCacheImpl* a xObjectCache)
147 { 152 {
148 return adoptRef(new AXSliderThumb(axObjectCache)); 153 return adoptRefWillBeNoop(new AXSliderThumb(axObjectCache));
149 } 154 }
150 155
151 LayoutRect AXSliderThumb::elementRect() const 156 LayoutRect AXSliderThumb::elementRect() const
152 { 157 {
153 if (!m_parent) 158 if (!m_parent)
154 return LayoutRect(); 159 return LayoutRect();
155 160
156 LayoutObject* sliderLayoutObject = m_parent->layoutObject(); 161 LayoutObject* sliderLayoutObject = m_parent->layoutObject();
157 if (!sliderLayoutObject || !sliderLayoutObject->isSlider()) 162 if (!sliderLayoutObject || !sliderLayoutObject->isSlider())
158 return LayoutRect(); 163 return LayoutRect();
159 return toElement(sliderLayoutObject->node())->userAgentShadowRoot()->getElem entById(ShadowElementNames::sliderThumb())->boundingBox(); 164 return toElement(sliderLayoutObject->node())->userAgentShadowRoot()->getElem entById(ShadowElementNames::sliderThumb())->boundingBox();
160 } 165 }
161 166
162 bool AXSliderThumb::computeAccessibilityIsIgnored(IgnoredReasons* ignoredReasons ) const 167 bool AXSliderThumb::computeAccessibilityIsIgnored(IgnoredReasons* ignoredReasons ) const
163 { 168 {
164 return accessibilityIsIgnoredByDefault(ignoredReasons); 169 return accessibilityIsIgnoredByDefault(ignoredReasons);
165 } 170 }
166 171
167 } // namespace blink 172 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698