summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/glue/resources/mediaplayer_pause.pngbin0 -> 2930 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_pause_down.pngbin0 -> 3499 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_pause_hover.pngbin0 -> 3470 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_play.pngbin0 -> 3124 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_play_disabled.pngbin0 -> 3108 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_play_down.pngbin0 -> 3731 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_play_hover.pngbin0 -> 3733 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_slider_thumb.pngbin0 -> 3461 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_slider_thumb_down.pngbin0 -> 3635 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_slider_thumb_hover.pngbin0 -> 3608 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_sound_disabled.pngbin0 -> 3123 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_sound_full.pngbin0 -> 3253 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_sound_full_down.pngbin0 -> 4028 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_sound_full_hover.pngbin0 -> 4038 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_sound_level1.pngbin0 -> 3090 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_sound_level1_down.pngbin0 -> 3705 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_sound_level1_hover.pngbin0 -> 3715 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_sound_level2.pngbin0 -> 3181 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_sound_level2_down.pngbin0 -> 3861 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_sound_level2_hover.pngbin0 -> 3874 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_sound_none.pngbin0 -> 3103 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_sound_none_down.pngbin0 -> 3835 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_sound_none_hover.pngbin0 -> 3857 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_volume_slider_thumb.pngbin0 -> 3395 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_volume_slider_thumb_down.pngbin0 -> 3550 bytes
-rw-r--r--webkit/glue/resources/mediaplayer_volume_slider_thumb_hover.pngbin0 -> 3555 bytes
-rw-r--r--webkit/glue/webkit_resources.grd26
-rw-r--r--webkit/glue/webkitclient_impl.cc30
28 files changed, 56 insertions, 0 deletions
diff --git a/webkit/glue/resources/mediaplayer_pause.png b/webkit/glue/resources/mediaplayer_pause.png
new file mode 100644
index 0000000..6bd58c2
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_pause.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_pause_down.png b/webkit/glue/resources/mediaplayer_pause_down.png
new file mode 100644
index 0000000..ae5d487
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_pause_down.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_pause_hover.png b/webkit/glue/resources/mediaplayer_pause_hover.png
new file mode 100644
index 0000000..b41979a
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_pause_hover.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_play.png b/webkit/glue/resources/mediaplayer_play.png
new file mode 100644
index 0000000..5b94102
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_play.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_play_disabled.png b/webkit/glue/resources/mediaplayer_play_disabled.png
new file mode 100644
index 0000000..54ad8c18
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_play_disabled.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_play_down.png b/webkit/glue/resources/mediaplayer_play_down.png
new file mode 100644
index 0000000..7ee1048
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_play_down.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_play_hover.png b/webkit/glue/resources/mediaplayer_play_hover.png
new file mode 100644
index 0000000..6686abe
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_play_hover.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_slider_thumb.png b/webkit/glue/resources/mediaplayer_slider_thumb.png
new file mode 100644
index 0000000..113b526
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_slider_thumb.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_slider_thumb_down.png b/webkit/glue/resources/mediaplayer_slider_thumb_down.png
new file mode 100644
index 0000000..f3120e0
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_slider_thumb_down.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_slider_thumb_hover.png b/webkit/glue/resources/mediaplayer_slider_thumb_hover.png
new file mode 100644
index 0000000..82b87e9
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_slider_thumb_hover.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_sound_disabled.png b/webkit/glue/resources/mediaplayer_sound_disabled.png
new file mode 100644
index 0000000..4b6120c
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_sound_disabled.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_sound_full.png b/webkit/glue/resources/mediaplayer_sound_full.png
new file mode 100644
index 0000000..3a39ffd
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_sound_full.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_sound_full_down.png b/webkit/glue/resources/mediaplayer_sound_full_down.png
new file mode 100644
index 0000000..1e8704a
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_sound_full_down.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_sound_full_hover.png b/webkit/glue/resources/mediaplayer_sound_full_hover.png
new file mode 100644
index 0000000..294a633
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_sound_full_hover.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_sound_level1.png b/webkit/glue/resources/mediaplayer_sound_level1.png
new file mode 100644
index 0000000..465a61a
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_sound_level1.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_sound_level1_down.png b/webkit/glue/resources/mediaplayer_sound_level1_down.png
new file mode 100644
index 0000000..04a7045
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_sound_level1_down.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_sound_level1_hover.png b/webkit/glue/resources/mediaplayer_sound_level1_hover.png
new file mode 100644
index 0000000..33f6b15
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_sound_level1_hover.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_sound_level2.png b/webkit/glue/resources/mediaplayer_sound_level2.png
new file mode 100644
index 0000000..d263cf8
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_sound_level2.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_sound_level2_down.png b/webkit/glue/resources/mediaplayer_sound_level2_down.png
new file mode 100644
index 0000000..e6f3c7c
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_sound_level2_down.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_sound_level2_hover.png b/webkit/glue/resources/mediaplayer_sound_level2_hover.png
new file mode 100644
index 0000000..91d3021
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_sound_level2_hover.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_sound_none.png b/webkit/glue/resources/mediaplayer_sound_none.png
new file mode 100644
index 0000000..80d5f9d
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_sound_none.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_sound_none_down.png b/webkit/glue/resources/mediaplayer_sound_none_down.png
new file mode 100644
index 0000000..d628774
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_sound_none_down.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_sound_none_hover.png b/webkit/glue/resources/mediaplayer_sound_none_hover.png
new file mode 100644
index 0000000..0d9d76b
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_sound_none_hover.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_volume_slider_thumb.png b/webkit/glue/resources/mediaplayer_volume_slider_thumb.png
new file mode 100644
index 0000000..a3d869d
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_volume_slider_thumb.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_volume_slider_thumb_down.png b/webkit/glue/resources/mediaplayer_volume_slider_thumb_down.png
new file mode 100644
index 0000000..eca9c34
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_volume_slider_thumb_down.png
Binary files differ
diff --git a/webkit/glue/resources/mediaplayer_volume_slider_thumb_hover.png b/webkit/glue/resources/mediaplayer_volume_slider_thumb_hover.png
new file mode 100644
index 0000000..e002aad
--- /dev/null
+++ b/webkit/glue/resources/mediaplayer_volume_slider_thumb_hover.png
Binary files differ
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index c30ece0..6dffca2 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -25,6 +25,32 @@
<include name="IDR_MEDIA_SOUND_NONE_BUTTON" file="resources\media_sound_none.png" type="BINDATA" />
<include name="IDR_MEDIA_SLIDER_THUMB" file="resources\media_slider_thumb.png" type="BINDATA" />
<include name="IDR_MEDIA_VOLUME_SLIDER_THUMB" file="resources\media_volume_slider_thumb.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_PAUSE_BUTTON" file="resources\mediaplayer_pause.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER" file="resources\mediaplayer_pause_hover.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN" file="resources\mediaplayer_pause_down.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_PLAY_BUTTON" file="resources\mediaplayer_play.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER" file="resources\mediaplayer_play_hover.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN" file="resources\mediaplayer_play_down.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED" file="resources\mediaplayer_play_disabled.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SOUND_DISABLED" file="resources\mediaplayer_sound_disabled.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SOUND_FULL_BUTTON" file="resources\mediaplayer_sound_full.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SOUND_FULL_BUTTON_HOVER" file="resources\mediaplayer_sound_full_hover.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SOUND_FULL_BUTTON_DOWN" file="resources\mediaplayer_sound_full_down.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON" file="resources\mediaplayer_sound_level2.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER" file="resources\mediaplayer_sound_level2_hover.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN" file="resources\mediaplayer_sound_level2_down.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON" file="resources\mediaplayer_sound_level1.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER" file="resources\mediaplayer_sound_level1_hover.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN" file="resources\mediaplayer_sound_level1_down.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SOUND_NONE_BUTTON" file="resources\mediaplayer_sound_none.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_HOVER" file="resources\mediaplayer_sound_none_hover.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_DOWN" file="resources\mediaplayer_sound_none_down.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SLIDER_THUMB" file="resources\mediaplayer_slider_thumb.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER" file="resources\mediaplayer_slider_thumb_hover.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN" file="resources\mediaplayer_slider_thumb_down.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB" file="resources\mediaplayer_volume_slider_thumb.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER" file="resources\mediaplayer_volume_slider_thumb_hover.png" type="BINDATA" />
+ <include name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN" file="resources\mediaplayer_volume_slider_thumb_down.png" type="BINDATA" />
<include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" />
<include name="IDC_PAN_MIDDLE" file="resources\pan_middle.cur" type="CURSOR" />
<include name="IDC_PAN_NORTH" file="resources\pan_north.cur" type="CURSOR" />
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index ab85a80..07d0e3e 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -361,6 +361,36 @@ const DataResource kDataResources[] = {
{ "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON },
{ "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB },
{ "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB },
+ { "mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON },
+ { "mediaplayerPauseHover", IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER },
+ { "mediaplayerPauseDown", IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN },
+ { "mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON },
+ { "mediaplayerPlayHover", IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER },
+ { "mediaplayerPlayDown", IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN },
+ { "mediaplayerPlayDisabled", IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED },
+ { "mediaplayerSoundDisabled", IDR_MEDIAPLAYER_SOUND_DISABLED },
+ { "mediaplayerSoundFull", IDR_MEDIAPLAYER_SOUND_FULL_BUTTON },
+ { "mediaplayerSoundFullHover", IDR_MEDIAPLAYER_SOUND_FULL_BUTTON_HOVER },
+ { "mediaplayerSoundFullDown", IDR_MEDIAPLAYER_SOUND_FULL_BUTTON_DOWN },
+ { "mediaplayerSoundLevel2", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON },
+ { "mediaplayerSoundLevel2Hover",
+ IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER },
+ { "mediaplayerSoundLevel2Down", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN },
+ { "mediaplayerSoundLevel1", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON },
+ { "mediaplayerSoundLevel1Hover",
+ IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER },
+ { "mediaplayerSoundLevel1Down", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN },
+ { "mediaplayerSoundNone", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON },
+ { "mediaplayerSoundNoneHover", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_HOVER },
+ { "mediaplayerSoundNoneDown", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_DOWN },
+ { "mediaplayerSliderThumb", IDR_MEDIAPLAYER_SLIDER_THUMB },
+ { "mediaplayerSliderThumbHover", IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER },
+ { "mediaplayerSliderThumbDown", IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN },
+ { "mediaplayerVolumeSliderThumb", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB },
+ { "mediaplayerVolumeSliderThumbHover",
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER },
+ { "mediaplayerVolumeSliderThumbDown",
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN },
{ "panIcon", IDR_PAN_SCROLL_ICON },
{ "searchCancel", IDR_SEARCH_CANCEL },
{ "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED },