Changeset 83410 in webkit
- Timestamp:
- Apr 10, 2011 6:35:33 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 6 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r83409 r83410 1 2011-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 1 20 2011-04-10 Chris Guillory <chris.guillory@google.com> 2 21 -
trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp
r82962 r83410 607 607 W("mediacontrol/playpause_button"), 608 608 W("mediacontrol/mute_button"), 609 W("mediacontrol/seekforward_button"), 610 W("mediacontrol/seekbackward_button"), 609 611 #endif 610 612 #undef W … … 1077 1079 else if (mediaElementType == MediaUnMuteButton) 1078 1080 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 1080 1086 return false; 1081 1087 … … 1108 1114 HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(mediaNode); 1109 1115 1110 if (!emitMediaButtonSignal(M ediaMuteUnMuteButton, mediaElement->muted() ? MediaMuteButton : MediaUnMuteButton, rect))1116 if (!emitMediaButtonSignal(MuteUnMuteButton, mediaElement->muted() ? MediaMuteButton : MediaUnMuteButton, rect)) 1111 1117 return false; 1112 1118 1113 return paintThemePart(object, M ediaMuteUnMuteButton, info, rect);1119 return paintThemePart(object, MuteUnMuteButton, info, rect); 1114 1120 } 1115 1121 … … 1117 1123 { 1118 1124 Node* node = object->node(); 1119 if (!node )1125 if (!node || !node->isMediaControlElement()) 1120 1126 return false; 1121 1127 1122 1128 MediaControlPlayButtonElement* button = static_cast<MediaControlPlayButtonElement*>(node); 1123 if (!emitMediaButtonSignal( MediaPlayPauseButton, button->displayType(), rect))1129 if (!emitMediaButtonSignal(PlayPauseButton, button->displayType(), rect)) 1124 1130 return false; 1125 1131 1126 return paintThemePart(object, MediaPlayPauseButton, info, rect);1132 return paintThemePart(object, PlayPauseButton, info, rect); 1127 1133 } 1128 1134 1129 1135 bool 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 1148 bool 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 1161 bool RenderThemeEfl::paintMediaSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect) 1130 1162 { 1131 1163 notImplemented(); … … 1133 1165 } 1134 1166 1135 bool RenderThemeEfl::paintMediaS eekForwardButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)1167 bool RenderThemeEfl::paintMediaSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect) 1136 1168 { 1137 1169 notImplemented(); … … 1139 1171 } 1140 1172 1141 bool RenderThemeEfl::paintMedia SliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)1173 bool RenderThemeEfl::paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo& info, const IntRect& rect) 1142 1174 { 1143 1175 notImplemented(); … … 1145 1177 } 1146 1178 1147 bool RenderThemeEfl::paintMedia SliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)1179 bool RenderThemeEfl::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect) 1148 1180 { 1149 1181 notImplemented(); … … 1151 1183 } 1152 1184 1153 bool RenderThemeEfl::paintMediaVolumeSlider Container(RenderObject*, const PaintInfo& info, const IntRect& rect)1185 bool RenderThemeEfl::paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect) 1154 1186 { 1155 1187 notImplemented(); … … 1157 1189 } 1158 1190 1159 bool RenderThemeEfl::paintMedia VolumeSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)1191 bool RenderThemeEfl::paintMediaCurrentTime(RenderObject* object, const PaintInfo& info, const IntRect& rect) 1160 1192 { 1161 1193 notImplemented(); 1162 1194 return false; 1163 1195 } 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 }1176 1196 #endif 1177 1197 } -
trunk/Source/WebCore/platform/efl/RenderThemeEfl.h
r81944 r83410 60 60 SliderHorizontal, 61 61 #if ENABLE(VIDEO) 62 MediaPlayPauseButton, 63 MediaMuteUnMuteButton, 62 PlayPauseButton, 63 MuteUnMuteButton, 64 SeekForwardButton, 65 SeekBackwardButton, 64 66 #endif 65 67 FormTypeLast -
trunk/Source/WebKit/efl/ChangeLog
r82952 r83410 1 2011-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 1 16 2011-04-04 MORITA Hajime <morrita@google.com> 2 17 -
trunk/Source/WebKit/efl/DefaultTheme/default.edc
r81944 r83410 79 79 #include "widget/mediacontrol/playpausebutton/playpause_button.edc" 80 80 #include "widget/mediacontrol/mutebutton/mute_button.edc" 81 #include "widget/mediacontrol/seekforwardbutton/seekforward_button.edc" 82 #include "widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc" 81 83 }
Note: See TracChangeset
for help on using the changeset viewer.