summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-24 23:20:54 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-24 23:20:54 +0000
commit98f60edd0302dba3ccff439fb9e799e377248c93 (patch)
tree64173dd97fa352720f23d749472dba5d7a55701e /media
parent83fcab4fe5c04ef3bfe0d77c85d4c674c67ee68e (diff)
downloadchromium_src-98f60edd0302dba3ccff439fb9e799e377248c93.zip
chromium_src-98f60edd0302dba3ccff439fb9e799e377248c93.tar.gz
chromium_src-98f60edd0302dba3ccff439fb9e799e377248c93.tar.bz2
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
Diffstat (limited to 'media')
-rw-r--r--media/filters/skcanvas_video_renderer.cc4
-rw-r--r--media/filters/skcanvas_video_renderer.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/media/filters/skcanvas_video_renderer.cc b/media/filters/skcanvas_video_renderer.cc
index 94395bf..5a889e3 100644
--- a/media/filters/skcanvas_video_renderer.cc
+++ b/media/filters/skcanvas_video_renderer.cc
@@ -42,7 +42,7 @@ static bool IsEitherYV12OrYV12AOrYV16OrNative(
//
// TODO(hclam): The fast paint method should support flipping and mirroring.
// Disable the flipping and mirroring checks once we have it.
-static bool CanFastPaint(SkCanvas* canvas, uint8_t alpha,
+static bool CanFastPaint(SkCanvas* canvas, uint8 alpha,
media::VideoFrame::Format format) {
if (alpha != 0xFF || !IsEitherYV12OrYV16(format))
return false;
@@ -284,7 +284,7 @@ SkCanvasVideoRenderer::~SkCanvasVideoRenderer() {}
void SkCanvasVideoRenderer::Paint(media::VideoFrame* video_frame,
SkCanvas* canvas,
const gfx::RectF& dest_rect,
- uint8_t alpha) {
+ uint8 alpha) {
if (alpha == 0) {
return;
}
diff --git a/media/filters/skcanvas_video_renderer.h b/media/filters/skcanvas_video_renderer.h
index 99e9a22..cf960a4 100644
--- a/media/filters/skcanvas_video_renderer.h
+++ b/media/filters/skcanvas_video_renderer.h
@@ -30,7 +30,7 @@ class MEDIA_EXPORT SkCanvasVideoRenderer {
void Paint(media::VideoFrame* video_frame,
SkCanvas* canvas,
const gfx::RectF& dest_rect,
- uint8_t alpha);
+ uint8 alpha);
private:
// An RGB bitmap and corresponding timestamp of the previously converted