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

Side by Side Diff: third_party/WebKit/Source/modules/accessibility/AXMediaControls.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 28 matching lines...) Expand all
39 39
40 static inline String QueryString(WebLocalizedString::Name name) { 40 static inline String QueryString(WebLocalizedString::Name name) {
41 return Locale::DefaultLocale().QueryString(name); 41 return Locale::DefaultLocale().QueryString(name);
42 } 42 }
43 43
44 AccessibilityMediaControl::AccessibilityMediaControl( 44 AccessibilityMediaControl::AccessibilityMediaControl(
45 LayoutObject* layout_object, 45 LayoutObject* layout_object,
46 AXObjectCacheImpl& ax_object_cache) 46 AXObjectCacheImpl& ax_object_cache)
47 : AXLayoutObject(layout_object, ax_object_cache) {} 47 : AXLayoutObject(layout_object, ax_object_cache) {}
48 48
49 AXObjectImpl* AccessibilityMediaControl::Create( 49 AXObject* AccessibilityMediaControl::Create(
50 LayoutObject* layout_object, 50 LayoutObject* layout_object,
51 AXObjectCacheImpl& ax_object_cache) { 51 AXObjectCacheImpl& ax_object_cache) {
52 DCHECK(layout_object->GetNode()); 52 DCHECK(layout_object->GetNode());
53 53
54 switch (GetMediaControlElementType(layout_object->GetNode())) { 54 switch (GetMediaControlElementType(layout_object->GetNode())) {
55 case kMediaSlider: 55 case kMediaSlider:
56 return AccessibilityMediaTimeline::Create(layout_object, ax_object_cache); 56 return AccessibilityMediaTimeline::Create(layout_object, ax_object_cache);
57 57
58 case kMediaCurrentTimeDisplay: 58 case kMediaCurrentTimeDisplay:
59 case kMediaTimeRemainingDisplay: 59 case kMediaTimeRemainingDisplay:
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 } 269 }
270 270
271 // 271 //
272 // AXMediaControlsContainer 272 // AXMediaControlsContainer
273 273
274 AXMediaControlsContainer::AXMediaControlsContainer( 274 AXMediaControlsContainer::AXMediaControlsContainer(
275 LayoutObject* layout_object, 275 LayoutObject* layout_object,
276 AXObjectCacheImpl& ax_object_cache) 276 AXObjectCacheImpl& ax_object_cache)
277 : AccessibilityMediaControl(layout_object, ax_object_cache) {} 277 : AccessibilityMediaControl(layout_object, ax_object_cache) {}
278 278
279 AXObjectImpl* AXMediaControlsContainer::Create( 279 AXObject* AXMediaControlsContainer::Create(LayoutObject* layout_object,
280 LayoutObject* layout_object, 280 AXObjectCacheImpl& ax_object_cache) {
281 AXObjectCacheImpl& ax_object_cache) {
282 return new AXMediaControlsContainer(layout_object, ax_object_cache); 281 return new AXMediaControlsContainer(layout_object, ax_object_cache);
283 } 282 }
284 283
285 String AXMediaControlsContainer::TextAlternative( 284 String AXMediaControlsContainer::TextAlternative(
286 bool recursive, 285 bool recursive,
287 bool in_aria_labelled_by_traversal, 286 bool in_aria_labelled_by_traversal,
288 AXObjectSet& visited, 287 AXObjectSet& visited,
289 AXNameFrom& name_from, 288 AXNameFrom& name_from,
290 AXRelatedObjectVector* related_objects, 289 AXRelatedObjectVector* related_objects,
291 NameSources* name_sources) const { 290 NameSources* name_sources) const {
(...skipping 23 matching lines...) Expand all
315 // FIXME: To be fixed. See 314 // FIXME: To be fixed. See
316 // http://trac.webkit.org/browser/trunk/Source/WebCore/platform/LocalizedStrin gs.cpp#L928 315 // http://trac.webkit.org/browser/trunk/Source/WebCore/platform/LocalizedStrin gs.cpp#L928
317 return String(); 316 return String();
318 } 317 }
319 318
320 AccessibilityMediaTimeline::AccessibilityMediaTimeline( 319 AccessibilityMediaTimeline::AccessibilityMediaTimeline(
321 LayoutObject* layout_object, 320 LayoutObject* layout_object,
322 AXObjectCacheImpl& ax_object_cache) 321 AXObjectCacheImpl& ax_object_cache)
323 : AXSlider(layout_object, ax_object_cache) {} 322 : AXSlider(layout_object, ax_object_cache) {}
324 323
325 AXObjectImpl* AccessibilityMediaTimeline::Create( 324 AXObject* AccessibilityMediaTimeline::Create(
326 LayoutObject* layout_object, 325 LayoutObject* layout_object,
327 AXObjectCacheImpl& ax_object_cache) { 326 AXObjectCacheImpl& ax_object_cache) {
328 return new AccessibilityMediaTimeline(layout_object, ax_object_cache); 327 return new AccessibilityMediaTimeline(layout_object, ax_object_cache);
329 } 328 }
330 329
331 String AccessibilityMediaTimeline::ValueDescription() const { 330 String AccessibilityMediaTimeline::ValueDescription() const {
332 Node* node = layout_object_->GetNode(); 331 Node* node = layout_object_->GetNode();
333 if (!isHTMLInputElement(node)) 332 if (!isHTMLInputElement(node))
334 return String(); 333 return String();
335 334
(...skipping 11 matching lines...) Expand all
347 } 346 }
348 347
349 // 348 //
350 // AccessibilityMediaTimeDisplay 349 // AccessibilityMediaTimeDisplay
351 350
352 AccessibilityMediaTimeDisplay::AccessibilityMediaTimeDisplay( 351 AccessibilityMediaTimeDisplay::AccessibilityMediaTimeDisplay(
353 LayoutObject* layout_object, 352 LayoutObject* layout_object,
354 AXObjectCacheImpl& ax_object_cache) 353 AXObjectCacheImpl& ax_object_cache)
355 : AccessibilityMediaControl(layout_object, ax_object_cache) {} 354 : AccessibilityMediaControl(layout_object, ax_object_cache) {}
356 355
357 AXObjectImpl* AccessibilityMediaTimeDisplay::Create( 356 AXObject* AccessibilityMediaTimeDisplay::Create(
358 LayoutObject* layout_object, 357 LayoutObject* layout_object,
359 AXObjectCacheImpl& ax_object_cache) { 358 AXObjectCacheImpl& ax_object_cache) {
360 return new AccessibilityMediaTimeDisplay(layout_object, ax_object_cache); 359 return new AccessibilityMediaTimeDisplay(layout_object, ax_object_cache);
361 } 360 }
362 361
363 bool AccessibilityMediaTimeDisplay::ComputeAccessibilityIsIgnored( 362 bool AccessibilityMediaTimeDisplay::ComputeAccessibilityIsIgnored(
364 IgnoredReasons* ignored_reasons) const { 363 IgnoredReasons* ignored_reasons) const {
365 if (!layout_object_ || !layout_object_->Style() || 364 if (!layout_object_ || !layout_object_->Style() ||
366 layout_object_->Style()->Visibility() != EVisibility::kVisible) 365 layout_object_->Style()->Visibility() != EVisibility::kVisible)
367 return true; 366 return true;
(...skipping 20 matching lines...) Expand all
388 if (!layout_object_ || !layout_object_->GetNode()) 387 if (!layout_object_ || !layout_object_->GetNode())
389 return String(); 388 return String();
390 389
391 MediaControlTimeDisplayElement* element = 390 MediaControlTimeDisplayElement* element =
392 static_cast<MediaControlTimeDisplayElement*>(layout_object_->GetNode()); 391 static_cast<MediaControlTimeDisplayElement*>(layout_object_->GetNode());
393 float time = element->CurrentValue(); 392 float time = element->CurrentValue();
394 return LocalizedMediaTimeDescription(fabsf(time)); 393 return LocalizedMediaTimeDescription(fabsf(time));
395 } 394 }
396 395
397 } // namespace blink 396 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698