diff options
| -rw-r--r-- | webkit/glue/resources/media_play_disabled.png | bin | 0 -> 361 bytes | |||
| -rw-r--r-- | webkit/glue/resources/media_sound_disabled.png | bin | 0 -> 439 bytes | |||
| -rw-r--r-- | webkit/glue/webkit_resources.grd | 2 | ||||
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 3 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_win.cc | 2 |
6 files changed, 9 insertions, 0 deletions
diff --git a/webkit/glue/resources/media_play_disabled.png b/webkit/glue/resources/media_play_disabled.png Binary files differnew file mode 100644 index 0000000..f998a9a --- /dev/null +++ b/webkit/glue/resources/media_play_disabled.png diff --git a/webkit/glue/resources/media_sound_disabled.png b/webkit/glue/resources/media_sound_disabled.png Binary files differnew file mode 100644 index 0000000..da68536 --- /dev/null +++ b/webkit/glue/resources/media_sound_disabled.png diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd index c6c0d1f..35d9837 100644 --- a/webkit/glue/webkit_resources.grd +++ b/webkit/glue/webkit_resources.grd @@ -23,9 +23,11 @@ <include name="IDR_DEVTOOLS_INJECT_JS" file="devtools\js\inject.js" type="BINDATA" /> <include name="IDR_DEVTOOLS_INJECT_WEBKIT_JS" file="..\..\third_party\WebKit\WebCore\inspector\front-end\InjectedScript.js" type="BINDATA" /> <include name="IDR_MEDIA_PLAY_BUTTON" file="resources\media_play.png" type="BINDATA" /> + <include name="IDR_MEDIA_PLAY_BUTTON_DISABLED" file="resources\media_play_disabled.png" type="BINDATA" /> <include name="IDR_MEDIA_PAUSE_BUTTON" file="resources\media_pause.png" type="BINDATA" /> <include name="IDR_MEDIA_SOUND_FULL_BUTTON" file="resources\media_sound_full.png" type="BINDATA" /> <include name="IDR_MEDIA_SOUND_NONE_BUTTON" file="resources\media_sound_none.png" type="BINDATA" /> + <include name="IDR_MEDIA_SOUND_DISABLED" file="resources\media_sound_disabled.png" type="BINDATA" /> <include name="IDR_MEDIA_SLIDER_THUMB" file="resources\media_slider_thumb.png" type="BINDATA" /> <if expr="os == 'linux2'"> diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index fc09b18..afc4f80 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -166,9 +166,11 @@ WebData WebKitClientImpl::loadResource(const char* name) { { "searchMagnifier", IDR_SEARCH_MAGNIFIER }, { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS }, { "mediaPlay", IDR_MEDIA_PLAY_BUTTON }, + { "mediaPlayDisabled", IDR_MEDIA_PLAY_BUTTON_DISABLED }, { "mediaPause", IDR_MEDIA_PAUSE_BUTTON }, { "mediaSoundFull", IDR_MEDIA_SOUND_FULL_BUTTON }, { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON }, + { "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED }, { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB }, #if defined(OS_LINUX) { "linuxCheckboxOff", IDR_LINUX_CHECKBOX_OFF }, diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index 4f37785..bc56f56 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -507,6 +507,9 @@ void WebMediaPlayerImpl::OnPipelineError() { SetNetworkState(WebMediaPlayer::DecodeError); break; } + + // Repaint to trigger UI update. + Repaint(); } void WebMediaPlayerImpl::SetNetworkState( diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 30b38dc..7c682b2 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -740,8 +740,10 @@ StringPiece GetDataResource(int resource_id) { case IDR_SEARCH_MAGNIFIER_RESULTS: case IDR_MEDIA_PAUSE_BUTTON: case IDR_MEDIA_PLAY_BUTTON: + case IDR_MEDIA_PLAY_BUTTON_DISABLED: case IDR_MEDIA_SOUND_FULL_BUTTON: case IDR_MEDIA_SOUND_NONE_BUTTON: + case IDR_MEDIA_SOUND_DISABLED: case IDR_MEDIA_SLIDER_THUMB: return NetResourceProvider(resource_id); |
