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

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

Issue 2858493002: Rename AXObject to AXObjectImpl in modules/ and web/ (Closed)
Patch Set: Fixed rebase 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "modules/accessibility/InspectorTypeBuilderHelper.h" 5 #include "modules/accessibility/InspectorTypeBuilderHelper.h"
6 6
7 #include "core/dom/DOMNodeIds.h" 7 #include "core/dom/DOMNodeIds.h"
8 #include "modules/accessibility/AXObject.h"
9 #include "modules/accessibility/AXObjectCacheImpl.h" 8 #include "modules/accessibility/AXObjectCacheImpl.h"
9 #include "modules/accessibility/AXObjectImpl.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 using namespace HTMLNames; 13 using namespace HTMLNames;
14 using namespace protocol::Accessibility; 14 using namespace protocol::Accessibility;
15 15
16 std::unique_ptr<AXProperty> CreateProperty(const String& name, 16 std::unique_ptr<AXProperty> CreateProperty(const String& name,
17 std::unique_ptr<AXValue> value) { 17 std::unique_ptr<AXValue> value) {
18 return AXProperty::create().setName(name).setValue(std::move(value)).build(); 18 return AXProperty::create().setName(name).setValue(std::move(value)).build();
19 } 19 }
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 .build(); 90 .build();
91 } 91 }
92 92
93 std::unique_ptr<AXValue> CreateBooleanValue(bool value, const String& type) { 93 std::unique_ptr<AXValue> CreateBooleanValue(bool value, const String& type) {
94 return AXValue::create() 94 return AXValue::create()
95 .setType(type) 95 .setType(type)
96 .setValue(protocol::ValueConversions<bool>::toValue(value)) 96 .setValue(protocol::ValueConversions<bool>::toValue(value))
97 .build(); 97 .build();
98 } 98 }
99 99
100 std::unique_ptr<AXRelatedNode> RelatedNodeForAXObject(const AXObject& ax_object, 100 std::unique_ptr<AXRelatedNode> RelatedNodeForAXObject(
101 String* name = nullptr) { 101 const AXObjectImpl& ax_object,
102 String* name = nullptr) {
102 Node* node = ax_object.GetNode(); 103 Node* node = ax_object.GetNode();
103 if (!node) 104 if (!node)
104 return nullptr; 105 return nullptr;
105 int backend_node_id = DOMNodeIds::IdForNode(node); 106 int backend_node_id = DOMNodeIds::IdForNode(node);
106 if (!backend_node_id) 107 if (!backend_node_id)
107 return nullptr; 108 return nullptr;
108 std::unique_ptr<AXRelatedNode> related_node = 109 std::unique_ptr<AXRelatedNode> related_node =
109 AXRelatedNode::create().setBackendDOMNodeId(backend_node_id).build(); 110 AXRelatedNode::create().setBackendDOMNodeId(backend_node_id).build();
110 if (!node->IsElementNode()) 111 if (!node->IsElementNode())
111 return related_node; 112 return related_node;
112 113
113 Element* element = ToElement(node); 114 Element* element = ToElement(node);
114 String idref = element->GetIdAttribute(); 115 String idref = element->GetIdAttribute();
115 if (!idref.IsEmpty()) 116 if (!idref.IsEmpty())
116 related_node->setIdref(idref); 117 related_node->setIdref(idref);
117 118
118 if (name) 119 if (name)
119 related_node->setText(*name); 120 related_node->setText(*name);
120 return related_node; 121 return related_node;
121 } 122 }
122 123
123 std::unique_ptr<AXValue> CreateRelatedNodeListValue(const AXObject& ax_object, 124 std::unique_ptr<AXValue> CreateRelatedNodeListValue(
124 String* name, 125 const AXObjectImpl& ax_object,
125 const String& value_type) { 126 String* name,
127 const String& value_type) {
126 std::unique_ptr<protocol::Array<AXRelatedNode>> related_nodes = 128 std::unique_ptr<protocol::Array<AXRelatedNode>> related_nodes =
127 protocol::Array<AXRelatedNode>::create(); 129 protocol::Array<AXRelatedNode>::create();
128 related_nodes->addItem(RelatedNodeForAXObject(ax_object, name)); 130 related_nodes->addItem(RelatedNodeForAXObject(ax_object, name));
129 return AXValue::create() 131 return AXValue::create()
130 .setType(value_type) 132 .setType(value_type)
131 .setRelatedNodes(std::move(related_nodes)) 133 .setRelatedNodes(std::move(related_nodes))
132 .build(); 134 .build();
133 } 135 }
134 136
135 std::unique_ptr<AXValue> CreateRelatedNodeListValue( 137 std::unique_ptr<AXValue> CreateRelatedNodeListValue(
136 AXRelatedObjectVector& related_objects, 138 AXRelatedObjectVector& related_objects,
137 const String& value_type) { 139 const String& value_type) {
138 std::unique_ptr<protocol::Array<AXRelatedNode>> frontend_related_nodes = 140 std::unique_ptr<protocol::Array<AXRelatedNode>> frontend_related_nodes =
139 protocol::Array<AXRelatedNode>::create(); 141 protocol::Array<AXRelatedNode>::create();
140 for (unsigned i = 0; i < related_objects.size(); i++) { 142 for (unsigned i = 0; i < related_objects.size(); i++) {
141 std::unique_ptr<AXRelatedNode> frontend_related_node = 143 std::unique_ptr<AXRelatedNode> frontend_related_node =
142 RelatedNodeForAXObject(*(related_objects[i]->object), 144 RelatedNodeForAXObject(*(related_objects[i]->object),
143 &(related_objects[i]->text)); 145 &(related_objects[i]->text));
144 if (frontend_related_node) 146 if (frontend_related_node)
145 frontend_related_nodes->addItem(std::move(frontend_related_node)); 147 frontend_related_nodes->addItem(std::move(frontend_related_node));
146 } 148 }
147 return AXValue::create() 149 return AXValue::create()
148 .setType(value_type) 150 .setType(value_type)
149 .setRelatedNodes(std::move(frontend_related_nodes)) 151 .setRelatedNodes(std::move(frontend_related_nodes))
150 .build(); 152 .build();
151 } 153 }
152 154
153 std::unique_ptr<AXValue> CreateRelatedNodeListValue( 155 std::unique_ptr<AXValue> CreateRelatedNodeListValue(
154 AXObject::AXObjectVector& ax_objects, 156 AXObjectImpl::AXObjectVector& ax_objects,
155 const String& value_type) { 157 const String& value_type) {
156 std::unique_ptr<protocol::Array<AXRelatedNode>> related_nodes = 158 std::unique_ptr<protocol::Array<AXRelatedNode>> related_nodes =
157 protocol::Array<AXRelatedNode>::create(); 159 protocol::Array<AXRelatedNode>::create();
158 for (unsigned i = 0; i < ax_objects.size(); i++) { 160 for (unsigned i = 0; i < ax_objects.size(); i++) {
159 std::unique_ptr<AXRelatedNode> related_node = 161 std::unique_ptr<AXRelatedNode> related_node =
160 RelatedNodeForAXObject(*(ax_objects[i].Get())); 162 RelatedNodeForAXObject(*(ax_objects[i].Get()));
161 if (related_node) 163 if (related_node)
162 related_nodes->addItem(std::move(related_node)); 164 related_nodes->addItem(std::move(related_node));
163 } 165 }
164 return AXValue::create() 166 return AXValue::create()
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 if (name_source.superseded) 238 if (name_source.superseded)
237 value_source->setSuperseded(true); 239 value_source->setSuperseded(true);
238 if (name_source.invalid) 240 if (name_source.invalid)
239 value_source->setInvalid(true); 241 value_source->setInvalid(true);
240 if (name_source.native_source != kAXTextFromNativeHTMLUninitialized) 242 if (name_source.native_source != kAXTextFromNativeHTMLUninitialized)
241 value_source->setNativeSource(NativeSourceType(name_source.native_source)); 243 value_source->setNativeSource(NativeSourceType(name_source.native_source));
242 return value_source; 244 return value_source;
243 } 245 }
244 246
245 } // namespace blink 247 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698