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

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

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. Created 3 years, 11 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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 return queryString(WebLocalizedString::AXMediaDefault); 214 return queryString(WebLocalizedString::AXMediaDefault);
215 } 215 }
216 216
217 NOTREACHED(); 217 NOTREACHED();
218 return queryString(WebLocalizedString::AXMediaDefault); 218 return queryString(WebLocalizedString::AXMediaDefault);
219 } 219 }
220 220
221 bool AccessibilityMediaControl::computeAccessibilityIsIgnored( 221 bool AccessibilityMediaControl::computeAccessibilityIsIgnored(
222 IgnoredReasons* ignoredReasons) const { 222 IgnoredReasons* ignoredReasons) const {
223 if (!m_layoutObject || !m_layoutObject->style() || 223 if (!m_layoutObject || !m_layoutObject->style() ||
224 m_layoutObject->style()->visibility() != EVisibility::Visible || 224 m_layoutObject->style()->visibility() != EVisibility::kVisible ||
225 controlType() == MediaTimelineContainer) 225 controlType() == MediaTimelineContainer)
226 return true; 226 return true;
227 227
228 return accessibilityIsIgnoredByDefault(ignoredReasons); 228 return accessibilityIsIgnoredByDefault(ignoredReasons);
229 } 229 }
230 230
231 AccessibilityRole AccessibilityMediaControl::roleValue() const { 231 AccessibilityRole AccessibilityMediaControl::roleValue() const {
232 switch (controlType()) { 232 switch (controlType()) {
233 case MediaEnterFullscreenButton: 233 case MediaEnterFullscreenButton:
234 case MediaExitFullscreenButton: 234 case MediaExitFullscreenButton:
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 360
361 AXObject* AccessibilityMediaTimeDisplay::create( 361 AXObject* AccessibilityMediaTimeDisplay::create(
362 LayoutObject* layoutObject, 362 LayoutObject* layoutObject,
363 AXObjectCacheImpl& axObjectCache) { 363 AXObjectCacheImpl& axObjectCache) {
364 return new AccessibilityMediaTimeDisplay(layoutObject, axObjectCache); 364 return new AccessibilityMediaTimeDisplay(layoutObject, axObjectCache);
365 } 365 }
366 366
367 bool AccessibilityMediaTimeDisplay::computeAccessibilityIsIgnored( 367 bool AccessibilityMediaTimeDisplay::computeAccessibilityIsIgnored(
368 IgnoredReasons* ignoredReasons) const { 368 IgnoredReasons* ignoredReasons) const {
369 if (!m_layoutObject || !m_layoutObject->style() || 369 if (!m_layoutObject || !m_layoutObject->style() ||
370 m_layoutObject->style()->visibility() != EVisibility::Visible) 370 m_layoutObject->style()->visibility() != EVisibility::kVisible)
371 return true; 371 return true;
372 372
373 if (!m_layoutObject->style()->width().value()) 373 if (!m_layoutObject->style()->width().value())
374 return true; 374 return true;
375 375
376 return accessibilityIsIgnoredByDefault(ignoredReasons); 376 return accessibilityIsIgnoredByDefault(ignoredReasons);
377 } 377 }
378 378
379 String AccessibilityMediaTimeDisplay::textAlternative( 379 String AccessibilityMediaTimeDisplay::textAlternative(
380 bool recursive, 380 bool recursive,
(...skipping 11 matching lines...) Expand all
392 if (!m_layoutObject || !m_layoutObject->node()) 392 if (!m_layoutObject || !m_layoutObject->node())
393 return String(); 393 return String();
394 394
395 MediaControlTimeDisplayElement* element = 395 MediaControlTimeDisplayElement* element =
396 static_cast<MediaControlTimeDisplayElement*>(m_layoutObject->node()); 396 static_cast<MediaControlTimeDisplayElement*>(m_layoutObject->node());
397 float time = element->currentValue(); 397 float time = element->currentValue();
398 return localizedMediaTimeDescription(fabsf(time)); 398 return localizedMediaTimeDescription(fabsf(time));
399 } 399 }
400 400
401 } // namespace blink 401 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698