Remove unit8_t from WebMediaPlayer implementations.

This is the chromium side change of https://codereview.chromium.org/15857006.

BUG=243347
TEST=Everything still compiles.
R=acolwell@chromium.org

Review URL: https://codereview.chromium.org/15784006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202219 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 7 insertions, 11 deletions

diff --git a/webkit/media/android/webmediaplayer_android.cc b/webkit/media/android/webmediaplayer_android.cc
index 3dfd945..cc88632 100644
--- a/webkit/media/android/webmediaplayer_android.cc
+++ b/webkit/media/android/webmediaplayer_android.cc
@@ -287,7 +287,7 @@ void WebMediaPlayerAndroid::setSize(const WebKit::WebSize& size) {
 
 void WebMediaPlayerAndroid::paint(WebKit::WebCanvas* canvas,
                                   const WebKit::WebRect& rect,
-                                  uint8_t alpha) {
+                                  unsigned char alpha) {
   NOTIMPLEMENTED();
 }
 
diff --git a/webkit/media/android/webmediaplayer_android.h b/webkit/media/android/webmediaplayer_android.h
index 7d45d3713..ce4f95e 100644
--- a/webkit/media/android/webmediaplayer_android.h
+++ b/webkit/media/android/webmediaplayer_android.h
@@ -91,7 +91,7 @@ class WebMediaPlayerAndroid
   virtual void setSize(const WebKit::WebSize& size);
   virtual void paint(WebKit::WebCanvas* canvas,
                      const WebKit::WebRect& rect,
-                     uint8_t alpha);
+                     unsigned char alpha);
 
   virtual bool copyVideoTextureToPlatformTexture(
       WebKit::WebGraphicsContext3D* web_graphics_context,
diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc
index 3e445c4..1a87024 100644
--- a/webkit/media/crypto/proxy_decryptor.cc
+++ b/webkit/media/crypto/proxy_decryptor.cc
@@ -13,14 +13,10 @@
 #if defined(ENABLE_PEPPER_CDMS)
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 #include "webkit/media/crypto/ppapi_decryptor.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
-// TODO(xhwang): Put this include after "ppapi_plugin_instance.h" for definition
-// of "uint8_t", which WebMediaPlayer.h uses without including a header for it.
-// See: https://bugs.webkit.org/show_bug.cgi?id=92031
-// Fix include order here when the bug is fixed.
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 namespace webkit_media {
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 140a1e9..481c0da 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -521,7 +521,7 @@ void WebMediaPlayerImpl::setSize(const WebSize& size) {
 
 void WebMediaPlayerImpl::paint(WebCanvas* canvas,
                                const WebRect& rect,
-                               uint8_t alpha) {
+                               unsigned char alpha) {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
   if (!accelerated_compositing_reported_) {
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index 00f9a9f..53cb42f 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -112,7 +112,7 @@ class WebMediaPlayerImpl
 
   virtual void paint(WebKit::WebCanvas* canvas,
                      const WebKit::WebRect& rect,
-                     uint8_t alpha);
+                     unsigned char alpha);
 
   // True if the loaded media has a playable video/audio track.
   virtual bool hasVideo() const;
diff --git a/webkit/media/webmediaplayer_ms.cc b/webkit/media/webmediaplayer_ms.cc
index 4ecfeee..2b5cdd2 100644
--- a/webkit/media/webmediaplayer_ms.cc
+++ b/webkit/media/webmediaplayer_ms.cc
@@ -306,7 +306,7 @@ void WebMediaPlayerMS::setSize(const WebSize& size) {
 
 void WebMediaPlayerMS::paint(WebCanvas* canvas,
                              const WebRect& rect,
-                             uint8_t alpha) {
+                             unsigned char alpha) {
   DVLOG(3) << "WebMediaPlayerMS::paint";
   DCHECK(thread_checker_.CalledOnValidThread());
 
diff --git a/webkit/media/webmediaplayer_ms.h b/webkit/media/webmediaplayer_ms.h
index 5213ca9..580dff9 100644
--- a/webkit/media/webmediaplayer_ms.h
+++ b/webkit/media/webmediaplayer_ms.h
@@ -88,7 +88,7 @@ class WebMediaPlayerMS
 
   virtual void paint(WebKit::WebCanvas* canvas,
                      const WebKit::WebRect& rect,
-                     uint8_t alpha) OVERRIDE;
+                     unsigned char alpha) OVERRIDE;
 
   // True if the loaded media has a playable video/audio track.
   virtual bool hasVideo() const OVERRIDE;