Merge 100408

Source/WebCore/platform/efl/RenderThemeEfl.cpp

 /*
  * Copyright (C) 2007 Apple Inc.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Collabora Ltd.
  * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia
  * Copyright (C) 2009-2010 ProFUSION embedded systems
  * Copyright (C) 2009-2011 Samsung Electronics
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 1184 matching lines @@
 
     return paintThemePart(object, MuteUnMuteButton, info, rect);
 }
 
 bool RenderThemeEfl::paintMediaPlayButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
     Node* node = object->node();
     if (!node || !node->isMediaControlElement())
         return false;
 
-    MediaControlPlayButtonElement* button = static_cast<MediaControlPlayButtonElement*>(node);
-    if (!emitMediaButtonSignal(PlayPauseButton, button->displayType(), rect))
+    if (!emitMediaButtonSignal(PlayPauseButton, mediaControlElementType(node), rect))
         return false;
 
     return paintThemePart(object, PlayPauseButton, info, rect);
 }
 
 bool RenderThemeEfl::paintMediaSeekBackButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
     Node* node = object->node();
     if (!node || !node->isMediaControlElement())
         return 0;
 
-    MediaControlSeekButtonElement* button = static_cast<MediaControlSeekButtonElement*>(node);
-    if (!emitMediaButtonSignal(SeekBackwardButton, button->displayType(), rect))
+    if (!emitMediaButtonSignal(SeekBackwardButton, mediaControlElementType(node), rect))
         return false;
 
     return paintThemePart(object, SeekBackwardButton, info, rect);
 }
 
 bool RenderThemeEfl::paintMediaSeekForwardButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
     Node* node = object->node();
     if (!node || !node->isMediaControlElement())
         return 0;
 
-    MediaControlSeekButtonElement* button = static_cast<MediaControlSeekButtonElement*>(node);
-    if (!emitMediaButtonSignal(SeekForwardButton, button->displayType(), rect))
+    if (!emitMediaButtonSignal(SeekForwardButton, mediaControlElementType(node), rect))
         return false;
 
     return paintThemePart(object, SeekForwardButton, info, rect);
 }
 
 bool RenderThemeEfl::paintMediaSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
     GraphicsContext* context = info.context;
 
     context->fillRect(FloatRect(rect), m_mediaPanelColor, ColorSpaceDeviceRGB);
@@ skipping 70 matching lines @@
     return false;
 }
 
 bool RenderThemeEfl::paintMediaCurrentTime(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
     info.context->fillRect(FloatRect(rect), m_mediaPanelColor, ColorSpaceDeviceRGB);
     return true;
 }
 #endif
 }