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

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

Issue 2181953004: Changed ComputedStyle's EVisibility to be an enum class and fixed naming (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_move_computedstyle_around
Patch Set: Rebase Created 4 years, 4 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 return queryString(WebLocalizedString::AxMediaCastOffButtonHelp); 134 return queryString(WebLocalizedString::AxMediaCastOffButtonHelp);
135 case MediaCastOnButton: 135 case MediaCastOnButton:
136 return queryString(WebLocalizedString::AxMediaCastOnButtonHelp); 136 return queryString(WebLocalizedString::AxMediaCastOnButtonHelp);
137 default: 137 default:
138 return queryString(WebLocalizedString::AXMediaDefault); 138 return queryString(WebLocalizedString::AXMediaDefault);
139 } 139 }
140 } 140 }
141 141
142 bool AccessibilityMediaControl::computeAccessibilityIsIgnored(IgnoredReasons* ig noredReasons) const 142 bool AccessibilityMediaControl::computeAccessibilityIsIgnored(IgnoredReasons* ig noredReasons) const
143 { 143 {
144 if (!m_layoutObject || !m_layoutObject->style() || m_layoutObject->style()-> visibility() != VISIBLE || controlType() == MediaTimelineContainer) 144 if (!m_layoutObject || !m_layoutObject->style() || m_layoutObject->style()-> visibility() != EVisibility::Visible || controlType() == MediaTimelineContainer)
145 return true; 145 return true;
146 146
147 return accessibilityIsIgnoredByDefault(ignoredReasons); 147 return accessibilityIsIgnoredByDefault(ignoredReasons);
148 } 148 }
149 149
150 AccessibilityRole AccessibilityMediaControl::roleValue() const 150 AccessibilityRole AccessibilityMediaControl::roleValue() const
151 { 151 {
152 switch (controlType()) { 152 switch (controlType()) {
153 case MediaEnterFullscreenButton: 153 case MediaEnterFullscreenButton:
154 case MediaExitFullscreenButton: 154 case MediaExitFullscreenButton:
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 { 243 {
244 } 244 }
245 245
246 AXObject* AccessibilityMediaTimeDisplay::create(LayoutObject* layoutObject, AXOb jectCacheImpl& axObjectCache) 246 AXObject* AccessibilityMediaTimeDisplay::create(LayoutObject* layoutObject, AXOb jectCacheImpl& axObjectCache)
247 { 247 {
248 return new AccessibilityMediaTimeDisplay(layoutObject, axObjectCache); 248 return new AccessibilityMediaTimeDisplay(layoutObject, axObjectCache);
249 } 249 }
250 250
251 bool AccessibilityMediaTimeDisplay::computeAccessibilityIsIgnored(IgnoredReasons * ignoredReasons) const 251 bool AccessibilityMediaTimeDisplay::computeAccessibilityIsIgnored(IgnoredReasons * ignoredReasons) const
252 { 252 {
253 if (!m_layoutObject || !m_layoutObject->style() || m_layoutObject->style()-> visibility() != VISIBLE) 253 if (!m_layoutObject || !m_layoutObject->style() || m_layoutObject->style()-> visibility() != EVisibility::Visible)
254 return true; 254 return true;
255 255
256 if (!m_layoutObject->style()->width().value()) 256 if (!m_layoutObject->style()->width().value())
257 return true; 257 return true;
258 258
259 return accessibilityIsIgnoredByDefault(ignoredReasons); 259 return accessibilityIsIgnoredByDefault(ignoredReasons);
260 } 260 }
261 261
262 String AccessibilityMediaTimeDisplay::textAlternative(bool recursive, bool inAri aLabelledByTraversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjec tVector* relatedObjects, NameSources* nameSources) const 262 String AccessibilityMediaTimeDisplay::textAlternative(bool recursive, bool inAri aLabelledByTraversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjec tVector* relatedObjects, NameSources* nameSources) const
263 { 263 {
264 if (controlType() == MediaCurrentTimeDisplay) 264 if (controlType() == MediaCurrentTimeDisplay)
265 return queryString(WebLocalizedString::AXMediaCurrentTimeDisplay); 265 return queryString(WebLocalizedString::AXMediaCurrentTimeDisplay);
266 return queryString(WebLocalizedString::AXMediaTimeRemainingDisplay); 266 return queryString(WebLocalizedString::AXMediaTimeRemainingDisplay);
267 } 267 }
268 268
269 String AccessibilityMediaTimeDisplay::stringValue() const 269 String AccessibilityMediaTimeDisplay::stringValue() const
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