| OLD | NEW |
| 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 30 matching lines...) Expand all Loading... |
| 41 static inline String queryString(WebLocalizedString::Name name) | 41 static inline String queryString(WebLocalizedString::Name name) |
| 42 { | 42 { |
| 43 return Locale::defaultLocale().queryString(name); | 43 return Locale::defaultLocale().queryString(name); |
| 44 } | 44 } |
| 45 | 45 |
| 46 AccessibilityMediaControl::AccessibilityMediaControl(LayoutObject* layoutObject,
AXObjectCacheImpl& axObjectCache) | 46 AccessibilityMediaControl::AccessibilityMediaControl(LayoutObject* layoutObject,
AXObjectCacheImpl& axObjectCache) |
| 47 : AXLayoutObject(layoutObject, axObjectCache) | 47 : AXLayoutObject(layoutObject, axObjectCache) |
| 48 { | 48 { |
| 49 } | 49 } |
| 50 | 50 |
| 51 PassRefPtr<AXObject> AccessibilityMediaControl::create(LayoutObject* layoutObjec
t, AXObjectCacheImpl& axObjectCache) | 51 PassRefPtrWillBeRawPtr<AXObject> AccessibilityMediaControl::create(LayoutObject*
layoutObject, AXObjectCacheImpl& axObjectCache) |
| 52 { | 52 { |
| 53 ASSERT(layoutObject->node()); | 53 ASSERT(layoutObject->node()); |
| 54 | 54 |
| 55 switch (mediaControlElementType(layoutObject->node())) { | 55 switch (mediaControlElementType(layoutObject->node())) { |
| 56 case MediaSlider: | 56 case MediaSlider: |
| 57 return AccessibilityMediaTimeline::create(layoutObject, axObjectCache); | 57 return AccessibilityMediaTimeline::create(layoutObject, axObjectCache); |
| 58 | 58 |
| 59 case MediaCurrentTimeDisplay: | 59 case MediaCurrentTimeDisplay: |
| 60 case MediaTimeRemainingDisplay: | 60 case MediaTimeRemainingDisplay: |
| 61 return AccessibilityMediaTimeDisplay::create(layoutObject, axObjectCache
); | 61 return AccessibilityMediaTimeDisplay::create(layoutObject, axObjectCache
); |
| 62 | 62 |
| 63 case MediaControlsPanel: | 63 case MediaControlsPanel: |
| 64 return AXMediaControlsContainer::create(layoutObject, axObjectCache); | 64 return AXMediaControlsContainer::create(layoutObject, axObjectCache); |
| 65 | 65 |
| 66 default: | 66 default: |
| 67 return adoptRef(new AccessibilityMediaControl(layoutObject, axObjectCach
e)); | 67 return adoptRefWillBeNoop(new AccessibilityMediaControl(layoutObject, ax
ObjectCache)); |
| 68 } | 68 } |
| 69 } | 69 } |
| 70 | 70 |
| 71 MediaControlElementType AccessibilityMediaControl::controlType() const | 71 MediaControlElementType AccessibilityMediaControl::controlType() const |
| 72 { | 72 { |
| 73 if (!layoutObject() || !layoutObject()->node()) | 73 if (!layoutObject() || !layoutObject()->node()) |
| 74 return MediaTimelineContainer; // Timeline container is not accessible. | 74 return MediaTimelineContainer; // Timeline container is not accessible. |
| 75 | 75 |
| 76 return mediaControlElementType(layoutObject()->node()); | 76 return mediaControlElementType(layoutObject()->node()); |
| 77 } | 77 } |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 | 184 |
| 185 | 185 |
| 186 // | 186 // |
| 187 // AXMediaControlsContainer | 187 // AXMediaControlsContainer |
| 188 | 188 |
| 189 AXMediaControlsContainer::AXMediaControlsContainer(LayoutObject* layoutObject, A
XObjectCacheImpl& axObjectCache) | 189 AXMediaControlsContainer::AXMediaControlsContainer(LayoutObject* layoutObject, A
XObjectCacheImpl& axObjectCache) |
| 190 : AccessibilityMediaControl(layoutObject, axObjectCache) | 190 : AccessibilityMediaControl(layoutObject, axObjectCache) |
| 191 { | 191 { |
| 192 } | 192 } |
| 193 | 193 |
| 194 PassRefPtr<AXObject> AXMediaControlsContainer::create(LayoutObject* layoutObject
, AXObjectCacheImpl& axObjectCache) | 194 PassRefPtrWillBeRawPtr<AXObject> AXMediaControlsContainer::create(LayoutObject*
layoutObject, AXObjectCacheImpl& axObjectCache) |
| 195 { | 195 { |
| 196 return adoptRef(new AXMediaControlsContainer(layoutObject, axObjectCache)); | 196 return adoptRefWillBeNoop(new AXMediaControlsContainer(layoutObject, axObjec
tCache)); |
| 197 } | 197 } |
| 198 | 198 |
| 199 String AXMediaControlsContainer::deprecatedAccessibilityDescription() const | 199 String AXMediaControlsContainer::deprecatedAccessibilityDescription() const |
| 200 { | 200 { |
| 201 return queryString(isControllingVideoElement() ? WebLocalizedString::AXMedia
VideoElement : WebLocalizedString::AXMediaAudioElement); | 201 return queryString(isControllingVideoElement() ? WebLocalizedString::AXMedia
VideoElement : WebLocalizedString::AXMediaAudioElement); |
| 202 } | 202 } |
| 203 | 203 |
| 204 String AXMediaControlsContainer::deprecatedHelpText() const | 204 String AXMediaControlsContainer::deprecatedHelpText() const |
| 205 { | 205 { |
| 206 return queryString(isControllingVideoElement() ? WebLocalizedString::AXMedia
VideoElementHelp : WebLocalizedString::AXMediaAudioElementHelp); | 206 return queryString(isControllingVideoElement() ? WebLocalizedString::AXMedia
VideoElementHelp : WebLocalizedString::AXMediaAudioElementHelp); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 219 // FIXME: To be fixed. See | 219 // FIXME: To be fixed. See |
| 220 // http://trac.webkit.org/browser/trunk/Source/WebCore/platform/LocalizedStr
ings.cpp#L928 | 220 // http://trac.webkit.org/browser/trunk/Source/WebCore/platform/LocalizedStr
ings.cpp#L928 |
| 221 return String(); | 221 return String(); |
| 222 } | 222 } |
| 223 | 223 |
| 224 AccessibilityMediaTimeline::AccessibilityMediaTimeline(LayoutObject* layoutObjec
t, AXObjectCacheImpl& axObjectCache) | 224 AccessibilityMediaTimeline::AccessibilityMediaTimeline(LayoutObject* layoutObjec
t, AXObjectCacheImpl& axObjectCache) |
| 225 : AXSlider(layoutObject, axObjectCache) | 225 : AXSlider(layoutObject, axObjectCache) |
| 226 { | 226 { |
| 227 } | 227 } |
| 228 | 228 |
| 229 PassRefPtr<AXObject> AccessibilityMediaTimeline::create(LayoutObject* layoutObje
ct, AXObjectCacheImpl& axObjectCache) | 229 PassRefPtrWillBeRawPtr<AXObject> AccessibilityMediaTimeline::create(LayoutObject
* layoutObject, AXObjectCacheImpl& axObjectCache) |
| 230 { | 230 { |
| 231 return adoptRef(new AccessibilityMediaTimeline(layoutObject, axObjectCache))
; | 231 return adoptRefWillBeNoop(new AccessibilityMediaTimeline(layoutObject, axObj
ectCache)); |
| 232 } | 232 } |
| 233 | 233 |
| 234 String AccessibilityMediaTimeline::valueDescription() const | 234 String AccessibilityMediaTimeline::valueDescription() const |
| 235 { | 235 { |
| 236 Node* node = m_layoutObject->node(); | 236 Node* node = m_layoutObject->node(); |
| 237 if (!isHTMLInputElement(node)) | 237 if (!isHTMLInputElement(node)) |
| 238 return String(); | 238 return String(); |
| 239 | 239 |
| 240 return localizedMediaTimeDescription(toHTMLInputElement(node)->value().toFlo
at()); | 240 return localizedMediaTimeDescription(toHTMLInputElement(node)->value().toFlo
at()); |
| 241 } | 241 } |
| 242 | 242 |
| 243 String AccessibilityMediaTimeline::deprecatedHelpText() const | 243 String AccessibilityMediaTimeline::deprecatedHelpText() const |
| 244 { | 244 { |
| 245 return queryString(isControllingVideoElement() ? WebLocalizedString::AXMedia
VideoSliderHelp : WebLocalizedString::AXMediaAudioSliderHelp); | 245 return queryString(isControllingVideoElement() ? WebLocalizedString::AXMedia
VideoSliderHelp : WebLocalizedString::AXMediaAudioSliderHelp); |
| 246 } | 246 } |
| 247 | 247 |
| 248 | 248 |
| 249 // | 249 // |
| 250 // AccessibilityMediaTimeDisplay | 250 // AccessibilityMediaTimeDisplay |
| 251 | 251 |
| 252 AccessibilityMediaTimeDisplay::AccessibilityMediaTimeDisplay(LayoutObject* layou
tObject, AXObjectCacheImpl& axObjectCache) | 252 AccessibilityMediaTimeDisplay::AccessibilityMediaTimeDisplay(LayoutObject* layou
tObject, AXObjectCacheImpl& axObjectCache) |
| 253 : AccessibilityMediaControl(layoutObject, axObjectCache) | 253 : AccessibilityMediaControl(layoutObject, axObjectCache) |
| 254 { | 254 { |
| 255 } | 255 } |
| 256 | 256 |
| 257 PassRefPtr<AXObject> AccessibilityMediaTimeDisplay::create(LayoutObject* layoutO
bject, AXObjectCacheImpl& axObjectCache) | 257 PassRefPtrWillBeRawPtr<AXObject> AccessibilityMediaTimeDisplay::create(LayoutObj
ect* layoutObject, AXObjectCacheImpl& axObjectCache) |
| 258 { | 258 { |
| 259 return adoptRef(new AccessibilityMediaTimeDisplay(layoutObject, axObjectCach
e)); | 259 return adoptRefWillBeNoop(new AccessibilityMediaTimeDisplay(layoutObject, ax
ObjectCache)); |
| 260 } | 260 } |
| 261 | 261 |
| 262 bool AccessibilityMediaTimeDisplay::computeAccessibilityIsIgnored(IgnoredReasons
* ignoredReasons) const | 262 bool AccessibilityMediaTimeDisplay::computeAccessibilityIsIgnored(IgnoredReasons
* ignoredReasons) const |
| 263 { | 263 { |
| 264 if (!m_layoutObject || !m_layoutObject->style() || m_layoutObject->style()->
visibility() != VISIBLE) | 264 if (!m_layoutObject || !m_layoutObject->style() || m_layoutObject->style()->
visibility() != VISIBLE) |
| 265 return true; | 265 return true; |
| 266 | 266 |
| 267 if (!m_layoutObject->style()->width().value()) | 267 if (!m_layoutObject->style()->width().value()) |
| 268 return true; | 268 return true; |
| 269 | 269 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 281 { | 281 { |
| 282 if (!m_layoutObject || !m_layoutObject->node()) | 282 if (!m_layoutObject || !m_layoutObject->node()) |
| 283 return String(); | 283 return String(); |
| 284 | 284 |
| 285 MediaControlTimeDisplayElement* element = static_cast<MediaControlTimeDispla
yElement*>(m_layoutObject->node()); | 285 MediaControlTimeDisplayElement* element = static_cast<MediaControlTimeDispla
yElement*>(m_layoutObject->node()); |
| 286 float time = element->currentValue(); | 286 float time = element->currentValue(); |
| 287 return localizedMediaTimeDescription(fabsf(time)); | 287 return localizedMediaTimeDescription(fabsf(time)); |
| 288 } | 288 } |
| 289 | 289 |
| 290 } // namespace blink | 290 } // namespace blink |
| OLD | NEW |