From bb2c1f391d836f04368b0d6808f573342f66f7ea Mon Sep 17 00:00:00 2001
From: "kylep@chromium.org"
 <kylep@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 14 Aug 2009 04:14:50 +0000
Subject: Add disabled play and mute icons for media player. BUG=18969,18970
 TEST=none Review URL: http://codereview.chromium.org/164356

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23415 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/glue/resources/media_play_disabled.png  | Bin 0 -> 361 bytes
 webkit/glue/resources/media_sound_disabled.png | Bin 0 -> 439 bytes
 webkit/glue/webkit_resources.grd               |   2 ++
 webkit/glue/webkitclient_impl.cc               |   2 ++
 webkit/glue/webmediaplayer_impl.cc             |   3 +++
 webkit/tools/test_shell/test_shell_win.cc      |   2 ++
 6 files changed, 9 insertions(+)
 create mode 100644 webkit/glue/resources/media_play_disabled.png
 create mode 100644 webkit/glue/resources/media_sound_disabled.png

diff --git a/webkit/glue/resources/media_play_disabled.png b/webkit/glue/resources/media_play_disabled.png
new file mode 100644
index 0000000..f998a9a
Binary files /dev/null and b/webkit/glue/resources/media_play_disabled.png differ
diff --git a/webkit/glue/resources/media_sound_disabled.png b/webkit/glue/resources/media_sound_disabled.png
new file mode 100644
index 0000000..da68536
Binary files /dev/null and b/webkit/glue/resources/media_sound_disabled.png differ
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);
 
-- 
cgit v1.1