Changeset 83410 in webkit


Ignore:
Timestamp:
Apr 10, 2011 6:35:33 PM (13 years ago)
Author:
gyuyoung.kim@samsung.com
Message:

2011-04-10 Gyuyoung Kim <gyuyoung.kim@samsung.com>

Reviewed by Eric Carlson.

[EFL] Add seek forward / backward buttons to MediaControl UI.
https://bugs.webkit.org/show_bug.cgi?id=56810

Add seek forward / backward buttons to media control. And, change formType name
for media control.

  • platform/efl/RenderThemeEfl.cpp: (WebCore::RenderThemeEfl::edjeGroupFromFormType): (WebCore::RenderThemeEfl::emitMediaButtonSignal): (WebCore::RenderThemeEfl::paintMediaMuteButton): (WebCore::RenderThemeEfl::paintMediaPlayButton): (WebCore::RenderThemeEfl::paintMediaSeekBackButton): (WebCore::RenderThemeEfl::paintMediaSeekForwardButton):
  • platform/efl/RenderThemeEfl.h:

2011-04-10 Gyuyoung Kim <gyuyoung.kim@samsung.com>

Reviewed by Eric Carlson.

[EFL] Add seek forward / backward buttons to MediaControl UI.
https://bugs.webkit.org/show_bug.cgi?id=56810

Add seek forward / backward buttons to media control.

  • DefaultTheme/default.edc:
  • DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc: Added.
  • DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png: Added.
  • DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforward_button.edc: Added.
  • DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforwardbutton.png: Added.
Location:
trunk/Source
Files:
6 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r83409 r83410  
     12011-04-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Reviewed by Eric Carlson.
     4
     5        [EFL] Add seek forward / backward buttons to MediaControl UI.
     6        https://bugs.webkit.org/show_bug.cgi?id=56810
     7
     8        Add seek forward / backward buttons to media control. And, change formType name
     9        for media control.
     10
     11        * platform/efl/RenderThemeEfl.cpp:
     12        (WebCore::RenderThemeEfl::edjeGroupFromFormType):
     13        (WebCore::RenderThemeEfl::emitMediaButtonSignal):
     14        (WebCore::RenderThemeEfl::paintMediaMuteButton):
     15        (WebCore::RenderThemeEfl::paintMediaPlayButton):
     16        (WebCore::RenderThemeEfl::paintMediaSeekBackButton):
     17        (WebCore::RenderThemeEfl::paintMediaSeekForwardButton):
     18        * platform/efl/RenderThemeEfl.h:
     19
    1202011-04-10  Chris Guillory  <chris.guillory@google.com>
    221
  • trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

    r82962 r83410  
    607607        W("mediacontrol/playpause_button"),
    608608        W("mediacontrol/mute_button"),
     609        W("mediacontrol/seekforward_button"),
     610        W("mediacontrol/seekbackward_button"),
    609611#endif
    610612#undef W
     
    10771079    else if (mediaElementType == MediaUnMuteButton)
    10781080        edje_object_signal_emit(entry->o, "sound", "");
    1079     else
     1081    else if (mediaElementType == MediaSeekForwardButton)
     1082        edje_object_signal_emit(entry->o, "seekforward", "");
     1083    else if (mediaElementType == MediaSeekBackButton)
     1084        edje_object_signal_emit(entry->o, "seekbackward", "");
     1085    else
    10801086        return false;
    10811087
     
    11081114    HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(mediaNode);
    11091115
    1110     if (!emitMediaButtonSignal(MediaMuteUnMuteButton, mediaElement->muted() ? MediaMuteButton : MediaUnMuteButton, rect))
     1116    if (!emitMediaButtonSignal(MuteUnMuteButton, mediaElement->muted() ? MediaMuteButton : MediaUnMuteButton, rect))
    11111117        return false;
    11121118
    1113     return paintThemePart(object, MediaMuteUnMuteButton, info, rect);
     1119    return paintThemePart(object, MuteUnMuteButton, info, rect);
    11141120}
    11151121
     
    11171123{
    11181124    Node* node = object->node();
    1119     if (!node)
     1125    if (!node || !node->isMediaControlElement())
    11201126        return false;
    11211127
    11221128    MediaControlPlayButtonElement* button = static_cast<MediaControlPlayButtonElement*>(node);
    1123     if (!emitMediaButtonSignal(MediaPlayPauseButton, button->displayType(), rect))
     1129    if (!emitMediaButtonSignal(PlayPauseButton, button->displayType(), rect))
    11241130        return false;
    11251131
    1126     return paintThemePart(object, MediaPlayPauseButton, info, rect);
     1132    return paintThemePart(object, PlayPauseButton, info, rect);
    11271133}
    11281134
    11291135bool RenderThemeEfl::paintMediaSeekBackButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     1136{
     1137    Node* node = object->node();
     1138    if (!node || !node->isMediaControlElement())
     1139        return 0;
     1140
     1141    MediaControlSeekButtonElement* button = static_cast<MediaControlSeekButtonElement*>(node);
     1142    if (!emitMediaButtonSignal(SeekBackwardButton, button->displayType(), rect))
     1143        return false;
     1144
     1145    return paintThemePart(object, SeekBackwardButton, info, rect);
     1146}
     1147
     1148bool RenderThemeEfl::paintMediaSeekForwardButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     1149{
     1150    Node* node = object->node();
     1151    if (!node || !node->isMediaControlElement())
     1152        return 0;
     1153
     1154    MediaControlSeekButtonElement* button = static_cast<MediaControlSeekButtonElement*>(node);
     1155    if (!emitMediaButtonSignal(SeekForwardButton, button->displayType(), rect))
     1156        return false;
     1157
     1158    return paintThemePart(object, SeekForwardButton, info, rect);
     1159}
     1160
     1161bool RenderThemeEfl::paintMediaSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    11301162{
    11311163    notImplemented();
     
    11331165}
    11341166
    1135 bool RenderThemeEfl::paintMediaSeekForwardButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     1167bool RenderThemeEfl::paintMediaSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    11361168{
    11371169    notImplemented();
     
    11391171}
    11401172
    1141 bool RenderThemeEfl::paintMediaSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     1173bool RenderThemeEfl::paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo& info, const IntRect& rect)
    11421174{
    11431175    notImplemented();
     
    11451177}
    11461178
    1147 bool RenderThemeEfl::paintMediaSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     1179bool RenderThemeEfl::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    11481180{
    11491181    notImplemented();
     
    11511183}
    11521184
    1153 bool RenderThemeEfl::paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo& info, const IntRect& rect)
     1185bool RenderThemeEfl::paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    11541186{
    11551187    notImplemented();
     
    11571189}
    11581190
    1159 bool RenderThemeEfl::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     1191bool RenderThemeEfl::paintMediaCurrentTime(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    11601192{
    11611193    notImplemented();
    11621194    return false;
    11631195}
    1164 
    1165 bool RenderThemeEfl::paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    1166 {
    1167     notImplemented();
    1168     return false;
    1169 }
    1170 
    1171 bool RenderThemeEfl::paintMediaCurrentTime(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    1172 {
    1173     notImplemented();
    1174     return false;
    1175 }
    11761196#endif
    11771197}
  • trunk/Source/WebCore/platform/efl/RenderThemeEfl.h

    r81944 r83410  
    6060    SliderHorizontal,
    6161#if ENABLE(VIDEO)
    62     MediaPlayPauseButton,
    63     MediaMuteUnMuteButton,
     62    PlayPauseButton,
     63    MuteUnMuteButton,
     64    SeekForwardButton,
     65    SeekBackwardButton,
    6466#endif
    6567    FormTypeLast
  • trunk/Source/WebKit/efl/ChangeLog

    r82952 r83410  
     12011-04-10  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Reviewed by Eric Carlson.
     4
     5        [EFL] Add seek forward / backward buttons to MediaControl UI.
     6        https://bugs.webkit.org/show_bug.cgi?id=56810
     7
     8        Add seek forward / backward buttons to media control.
     9
     10        * DefaultTheme/default.edc:
     11        * DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc: Added.
     12        * DefaultTheme/widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png: Added.
     13        * DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforward_button.edc: Added.
     14        * DefaultTheme/widget/mediacontrol/seekforwardbutton/seekforwardbutton.png: Added.
     15
    1162011-04-04  MORITA Hajime  <morrita@google.com>
    217
  • trunk/Source/WebKit/efl/DefaultTheme/default.edc

    r81944 r83410  
    7979#include "widget/mediacontrol/playpausebutton/playpause_button.edc"
    8080#include "widget/mediacontrol/mutebutton/mute_button.edc"
     81#include "widget/mediacontrol/seekforwardbutton/seekforward_button.edc"
     82#include "widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc"
    8183}
Note: See TracChangeset for help on using the changeset viewer.