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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/accessibility/AXSlider.h ('k') | Source/modules/accessibility/AXSpinButton.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 14 matching lines...) Expand all
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 #include "modules/accessibility/AXSlider.h" 30 #include "modules/accessibility/AXSlider.h"
31 31
32 #include "core/dom/shadow/ShadowRoot.h" 32 #include "core/dom/shadow/ShadowRoot.h"
33 #include "core/html/HTMLInputElement.h" 33 #include "core/html/HTMLInputElement.h"
34 #include "core/html/shadow/ShadowElementNames.h" 34 #include "core/html/shadow/ShadowElementNames.h"
35 #include "core/rendering/RenderObject.h" 35 #include "core/layout/LayoutObject.h"
36 #include "modules/accessibility/AXObjectCacheImpl.h" 36 #include "modules/accessibility/AXObjectCacheImpl.h"
37 37
38 namespace blink { 38 namespace blink {
39 39
40 using namespace HTMLNames; 40 using namespace HTMLNames;
41 41
42 AXSlider::AXSlider(RenderObject* renderer, AXObjectCacheImpl* axObjectCache) 42 AXSlider::AXSlider(LayoutObject* renderer, AXObjectCacheImpl* axObjectCache)
43 : AXRenderObject(renderer, axObjectCache) 43 : AXRenderObject(renderer, axObjectCache)
44 { 44 {
45 } 45 }
46 46
47 PassRefPtr<AXSlider> AXSlider::create(RenderObject* renderer, AXObjectCacheImpl* axObjectCache) 47 PassRefPtr<AXSlider> AXSlider::create(LayoutObject* renderer, AXObjectCacheImpl* axObjectCache)
48 { 48 {
49 return adoptRef(new AXSlider(renderer, axObjectCache)); 49 return adoptRef(new AXSlider(renderer, axObjectCache));
50 } 50 }
51 51
52 AccessibilityOrientation AXSlider::orientation() const 52 AccessibilityOrientation AXSlider::orientation() const
53 { 53 {
54 // Default to horizontal in the unknown case. 54 // Default to horizontal in the unknown case.
55 if (!m_renderer) 55 if (!m_renderer)
56 return AccessibilityOrientationHorizontal; 56 return AccessibilityOrientationHorizontal;
57 57
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 PassRefPtr<AXSliderThumb> AXSliderThumb::create(AXObjectCacheImpl* axObjectCache ) 138 PassRefPtr<AXSliderThumb> AXSliderThumb::create(AXObjectCacheImpl* axObjectCache )
139 { 139 {
140 return adoptRef(new AXSliderThumb(axObjectCache)); 140 return adoptRef(new AXSliderThumb(axObjectCache));
141 } 141 }
142 142
143 LayoutRect AXSliderThumb::elementRect() const 143 LayoutRect AXSliderThumb::elementRect() const
144 { 144 {
145 if (!m_parent) 145 if (!m_parent)
146 return LayoutRect(); 146 return LayoutRect();
147 147
148 RenderObject* sliderRenderer = m_parent->renderer(); 148 LayoutObject* sliderRenderer = m_parent->renderer();
149 if (!sliderRenderer || !sliderRenderer->isSlider()) 149 if (!sliderRenderer || !sliderRenderer->isSlider())
150 return LayoutRect(); 150 return LayoutRect();
151 return toElement(sliderRenderer->node())->userAgentShadowRoot()->getElementB yId(ShadowElementNames::sliderThumb())->boundingBox(); 151 return toElement(sliderRenderer->node())->userAgentShadowRoot()->getElementB yId(ShadowElementNames::sliderThumb())->boundingBox();
152 } 152 }
153 153
154 bool AXSliderThumb::computeAccessibilityIsIgnored() const 154 bool AXSliderThumb::computeAccessibilityIsIgnored() const
155 { 155 {
156 return accessibilityIsIgnoredByDefault(); 156 return accessibilityIsIgnoredByDefault();
157 } 157 }
158 158
159 } // namespace blink 159 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/accessibility/AXSlider.h ('k') | Source/modules/accessibility/AXSpinButton.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698