Changeset 81777 in webkit

Timestamp:

Mar 23, 2011 9:21:29 AM (13 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

2011-03-23 Gyuyoung Kim <​gyuyoung.kim@samsung.com>

Reviewed by Antonio Gomes.

[EFL] Add play / pause button to media control
​https://bugs.webkit.org/show_bug.cgi?id=55463

Add play|pause button to media control.

• platform/efl/RenderThemeEfl.cpp: (WebCore::RenderThemeEfl::edjeGroupFromFormType): (WebCore::RenderThemeEfl::emitMediaButtonSignal): Added. (WebCore::RenderThemeEfl::paintMediaPlayButton):
• platform/efl/RenderThemeEfl.h:

2011-03-23 Gyuyoung Kim <​gyuyoung.kim@samsung.com>

Reviewed by Antonio Gomes.

[EFL] Add play / pause button to media control
​https://bugs.webkit.org/show_bug.cgi?id=55463

Add play|pause button to media control.

• DefaultTheme/default.edc:
• DefaultTheme/widget/mediacontrol/playpausebutton/pausebutton.png: Added.
• DefaultTheme/widget/mediacontrol/playpausebutton/playbutton.png: Added.
• DefaultTheme/widget/mediacontrol/playpausebutton/playpause_button.edc: Added.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/efl/RenderThemeEfl.cpp (modified) (9 diffs)
• WebCore/platform/efl/RenderThemeEfl.h (modified) (3 diffs)
• WebKit/efl/ChangeLog (modified) (1 diff)
• WebKit/efl/DefaultTheme/default.edc (modified) (1 diff)
• WebKit/efl/DefaultTheme/widget/mediacontrol (added)
• WebKit/efl/DefaultTheme/widget/mediacontrol/playpausebutton (added)
• WebKit/efl/DefaultTheme/widget/mediacontrol/playpausebutton/pausebutton.png (added)
• WebKit/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playbutton.png (added)
• WebKit/efl/DefaultTheme/widget/mediacontrol/playpausebutton/playpause_button.edc (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-23  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Add play / pause button to media control
+        https://bugs.webkit.org/show_bug.cgi?id=55463
+
+        Add play|pause button to media control.
+
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::edjeGroupFromFormType):
+        (WebCore::RenderThemeEfl::emitMediaButtonSignal): Added.
+        (WebCore::RenderThemeEfl::paintMediaPlayButton):
+        * platform/efl/RenderThemeEfl.h:
+
 2011-03-23  Aparna Nandyal  <aparna.nand@wipro.com>
 

trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

@@ -594 +594 @@
         W("slider/vertical"),
         W("slider/horizontal"),
+#if ENABLE(VIDEO)
+        W("mediacontrol/playpause_button"),
+#endif
 #undef W
         0
@@ -1046 +1049 @@
 
 #if ENABLE(VIDEO)
+bool RenderThemeEfl::emitMediaButtonSignal(FormType formType, MediaControlElementType mediaElementType, const IntRect& rect)
+{
+    ThemePartCacheEntry* entry;
+
+    entry = cacheThemePartGet(formType, rect.size());
+    ASSERT(entry);
+    if (!entry)
+        return false;
+
+    if (mediaElementType == MediaPlayButton)
+        edje_object_signal_emit(entry->o, "play", "");
+    else if (mediaElementType == MediaPauseButton)
+        edje_object_signal_emit(entry->o, "pause", "");
+    else 
+        return false;
+
+    return true;
+}
+
 String RenderThemeEfl::extraMediaControlsStyleSheet()
 {
@@ -1071 +1093 @@
 bool RenderThemeEfl::paintMediaPlayButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
+    Node* node = object->node();
+    if (!node)
+        return false;
+
+    MediaControlPlayButtonElement* button = static_cast<MediaControlPlayButtonElement*>(node);
+    if (!emitMediaButtonSignal(MediaPlayPauseButton, button->displayType(), rect))
+        return false;
+
+    return paintThemePart(object, MediaPlayPauseButton, info, rect);
+}
+
+bool RenderThemeEfl::paintMediaSeekBackButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
+{
     notImplemented();
     return false;
 }
 
-bool RenderThemeEfl::paintMediaSeekBackButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
+bool RenderThemeEfl::paintMediaSeekForwardButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
     notImplemented();
@@ -1081 +1116 @@
 }
 
-bool RenderThemeEfl::paintMediaSeekForwardButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
+bool RenderThemeEfl::paintMediaSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
     notImplemented();
@@ -1087 +1122 @@
 }
 
-bool RenderThemeEfl::paintMediaSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
+bool RenderThemeEfl::paintMediaSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
     notImplemented();
@@ -1093 +1128 @@
 }
 
-bool RenderThemeEfl::paintMediaSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
+bool RenderThemeEfl::paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo& info, const IntRect& rect)
 {
     notImplemented();
@@ -1099 +1134 @@
 }
 
-bool RenderThemeEfl::paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo& info, const IntRect& rect)
+bool RenderThemeEfl::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
     notImplemented();
@@ -1105 +1140 @@
 }
 
-bool RenderThemeEfl::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
+bool RenderThemeEfl::paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
     notImplemented();
@@ -1111 +1146 @@
 }
 
-bool RenderThemeEfl::paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
+bool RenderThemeEfl::paintMediaCurrentTime(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
     notImplemented();
     return false;
 }
-
-bool RenderThemeEfl::paintMediaCurrentTime(RenderObject* object, const PaintInfo& info, const IntRect& rect)
-{
-    notImplemented();
-    return false;
-}
 #endif
 }

trunk/Source/WebCore/platform/efl/RenderThemeEfl.h

@@ -31 +31 @@
 #define RenderThemeEfl_h
 
+#if ENABLE(VIDEO)
+#include "MediaControlElements.h"
+#endif
 #include "RenderTheme.h"
 
@@ -56 +59 @@
     SliderVertical,
     SliderHorizontal,
+#if ENABLE(VIDEO)
+    MediaPlayPauseButton,
+#endif
     FormTypeLast
 };
@@ -182 +188 @@
     void applyEdjeStateFromForm(Evas_Object*, ControlStates);
     bool paintThemePart(RenderObject*, FormType, const PaintInfo&, const IntRect&);
+
+#if ENABLE(VIDEO)
+    bool emitMediaButtonSignal(FormType, MediaControlElementType, const IntRect&);
+#endif
 
     Page* m_page;

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-03-23  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Add play / pause button to media control
+        https://bugs.webkit.org/show_bug.cgi?id=55463
+
+        Add play|pause button to media control.
+
+        * DefaultTheme/default.edc:
+        * DefaultTheme/widget/mediacontrol/playpausebutton/pausebutton.png: Added.
+        * DefaultTheme/widget/mediacontrol/playpausebutton/playbutton.png: Added.
+        * DefaultTheme/widget/mediacontrol/playpausebutton/playpause_button.edc: Added.
+
 2011-03-22  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebKit/efl/DefaultTheme/default.edc

@@ -77 +77 @@
 #include "widget/search/decoration/search_decoration.edc"
 #include "widget/slider/slider.edc"
+#include "widget/mediacontrol/playpausebutton/playpause_button.edc"
 }