Merge 100408

Source/WebCore/accessibility/AccessibilityMediaControls.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 35 matching lines @@
 using namespace HTMLNames;
 
 
 AccessibilityMediaControl::AccessibilityMediaControl(RenderObject* renderer)
     : AccessibilityRenderObject(renderer)
 {
 }
 
 PassRefPtr<AccessibilityObject> AccessibilityMediaControl::create(RenderObject* renderer)
 {
-    ASSERT(renderer->node() && renderer->node()->isMediaControlElement());
+    ASSERT(renderer->node());
 
-    Node* node = renderer->node();
-    MediaControlElementType controlType;
-
-    if (node->hasTagName(inputTag))
-        controlType = static_cast<MediaControlInputElement*>(node)->displayType();
-    else
-        controlType = static_cast<MediaControlElement*>(node)->displayType();
-
-    switch (controlType) {
+    switch (mediaControlElementType(renderer->node())) {
     case MediaSlider:
         return AccessibilityMediaTimeline::create(renderer);
 
     case MediaCurrentTimeDisplay:
     case MediaTimeRemainingDisplay:
         return AccessibilityMediaTimeDisplay::create(renderer);
 
     case MediaControlsPanel:
         return AccessibilityMediaControlsContainer::create(renderer);
 
     default:
         return adoptRef(new AccessibilityMediaControl(renderer));
     }
 }
 
 MediaControlElementType AccessibilityMediaControl::controlType() const
 {
     if (!renderer() || !renderer()->node())
         return MediaTimelineContainer; // Timeline container is not accessible.
 
-    Node* node = renderer()->node();
-
-    if (node->hasTagName(inputTag))
-        return static_cast<MediaControlInputElement*>(node)->displayType();
-
-    return static_cast<MediaControlElement*>(node)->displayType();
+    return mediaControlElementType(renderer()->node());
 }
 
 String AccessibilityMediaControl::controlTypeName() const
 {
     DEFINE_STATIC_LOCAL(const String, mediaFullscreenButtonName, ("FullscreenButton"));
     DEFINE_STATIC_LOCAL(const String, mediaMuteButtonName, ("MuteButton"));
     DEFINE_STATIC_LOCAL(const String, mediaPlayButtonName, ("PlayButton"));
     DEFINE_STATIC_LOCAL(const String, mediaSeekBackButtonName, ("SeekBackButton"));
     DEFINE_STATIC_LOCAL(const String, mediaSeekForwardButtonName, ("SeekForwardButton"));
     DEFINE_STATIC_LOCAL(const String, mediaRewindButtonName, ("RewindButton"));
@@ skipping 154 matching lines @@
 {
 }
 
 PassRefPtr<AccessibilityObject> AccessibilityMediaTimeline::create(RenderObject* renderer)
 {
     return adoptRef(new AccessibilityMediaTimeline(renderer));
 }
 
 String AccessibilityMediaTimeline::valueDescription() const
 {
-    ASSERT(m_renderer->node()->hasTagName(inputTag));
+    Node* node = m_renderer->node();
+    if (!node->hasTagName(inputTag))
+        return String();
 
-    float time = static_cast<HTMLInputElement*>(m_renderer->node())->value().toFloat();
+    float time = static_cast<HTMLInputElement*>(node)->value().toFloat();
     return localizedMediaTimeDescription(time);
 }
 
 String AccessibilityMediaTimeline::helpText() const
 {
     DEFINE_STATIC_LOCAL(const String, slider, ("Slider"));
     return localizedMediaControlElementHelpText(slider);
 }
 
 
@@ skipping 35 matching lines @@
         return String();
 
     MediaControlTimeDisplayElement* element = static_cast<MediaControlTimeDisplayElement*>(m_renderer->node());
     float time = element->currentValue();
     return localizedMediaTimeDescription(fabsf(time));
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(VIDEO)