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

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

Issue 2883203002: Revert of Rename AXObject to AXObjectImpl in modules/ and web/ (Closed)
Patch Set: Created 3 years, 7 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 thumb->SetParent(this); 93 thumb->SetParent(this);
94 94
95 // Before actually adding the value indicator to the hierarchy, 95 // Before actually adding the value indicator to the hierarchy,
96 // allow the platform to make a final decision about it. 96 // allow the platform to make a final decision about it.
97 if (thumb->AccessibilityIsIgnored()) 97 if (thumb->AccessibilityIsIgnored())
98 cache.Remove(thumb->AxObjectID()); 98 cache.Remove(thumb->AxObjectID());
99 else 99 else
100 children_.push_back(thumb); 100 children_.push_back(thumb);
101 } 101 }
102 102
103 AXObjectImpl* AXSlider::ElementAccessibilityHitTest( 103 AXObject* AXSlider::ElementAccessibilityHitTest(const IntPoint& point) const {
104 const IntPoint& point) const {
105 if (children_.size()) { 104 if (children_.size()) {
106 DCHECK(children_.size() == 1); 105 DCHECK(children_.size() == 1);
107 if (children_[0]->GetBoundsInFrameCoordinates().Contains(point)) 106 if (children_[0]->GetBoundsInFrameCoordinates().Contains(point))
108 return children_[0].Get(); 107 return children_[0].Get();
109 } 108 }
110 109
111 return AxObjectCache().GetOrCreate(layout_object_); 110 return AxObjectCache().GetOrCreate(layout_object_);
112 } 111 }
113 112
114 void AXSlider::SetValue(const String& value) { 113 void AXSlider::SetValue(const String& value) {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 DCHECK(thumb_element); 147 DCHECK(thumb_element);
149 return thumb_element->GetLayoutObject(); 148 return thumb_element->GetLayoutObject();
150 } 149 }
151 150
152 bool AXSliderThumb::ComputeAccessibilityIsIgnored( 151 bool AXSliderThumb::ComputeAccessibilityIsIgnored(
153 IgnoredReasons* ignored_reasons) const { 152 IgnoredReasons* ignored_reasons) const {
154 return AccessibilityIsIgnoredByDefault(ignored_reasons); 153 return AccessibilityIsIgnoredByDefault(ignored_reasons);
155 } 154 }
156 155
157 } // namespace blink 156 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698