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

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

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 case MediaControlsPanel: 62 case MediaControlsPanel:
63 return AXMediaControlsContainer::create(layoutObject, axObjectCache); 63 return AXMediaControlsContainer::create(layoutObject, axObjectCache);
64 64
65 default: 65 default:
66 return new AccessibilityMediaControl(layoutObject, axObjectCache); 66 return new AccessibilityMediaControl(layoutObject, axObjectCache);
67 } 67 }
68 } 68 }
69 69
70 MediaControlElementType AccessibilityMediaControl::controlType() const 70 MediaControlElementType AccessibilityMediaControl::controlType() const
71 { 71 {
72 if (!layoutObject() || !layoutObject()->node()) 72 if (!getLayoutObject() || !getLayoutObject()->node())
73 return MediaTimelineContainer; // Timeline container is not accessible. 73 return MediaTimelineContainer; // Timeline container is not accessible.
74 74
75 return mediaControlElementType(layoutObject()->node()); 75 return mediaControlElementType(getLayoutObject()->node());
76 } 76 }
77 77
78 String AccessibilityMediaControl::textAlternative(bool recursive, bool inAriaLab elledByTraversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjectVec tor* relatedObjects, NameSources* nameSources) const 78 String AccessibilityMediaControl::textAlternative(bool recursive, bool inAriaLab elledByTraversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjectVec tor* relatedObjects, NameSources* nameSources) const
79 { 79 {
80 switch (controlType()) { 80 switch (controlType()) {
81 case MediaEnterFullscreenButton: 81 case MediaEnterFullscreenButton:
82 return queryString(WebLocalizedString::AXMediaEnterFullscreenButton); 82 return queryString(WebLocalizedString::AXMediaEnterFullscreenButton);
83 case MediaExitFullscreenButton: 83 case MediaExitFullscreenButton:
84 return queryString(WebLocalizedString::AXMediaExitFullscreenButton); 84 return queryString(WebLocalizedString::AXMediaExitFullscreenButton);
85 case MediaMuteButton: 85 case MediaMuteButton:
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 { 270 {
271 if (!m_layoutObject || !m_layoutObject->node()) 271 if (!m_layoutObject || !m_layoutObject->node())
272 return String(); 272 return String();
273 273
274 MediaControlTimeDisplayElement* element = static_cast<MediaControlTimeDispla yElement*>(m_layoutObject->node()); 274 MediaControlTimeDisplayElement* element = static_cast<MediaControlTimeDispla yElement*>(m_layoutObject->node());
275 float time = element->currentValue(); 275 float time = element->currentValue();
276 return localizedMediaTimeDescription(fabsf(time)); 276 return localizedMediaTimeDescription(fabsf(time));
277 } 277 }
278 278
279 } // namespace blink 279 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698