| Index: media/base/android/video_decoder_job.cc
|
| diff --git a/media/base/android/video_decoder_job.cc b/media/base/android/video_decoder_job.cc
|
| index 8f81c0fdd0572bc672cc5db2637fed31d68ae9a4..bca7fa4afb4be1cdd9237fe33ff8ff412092cbda 100644
|
| --- a/media/base/android/video_decoder_job.cc
|
| +++ b/media/base/android/video_decoder_job.cc
|
| @@ -42,7 +42,7 @@ VideoDecoderJob::VideoDecoderJob(
|
|
|
| VideoDecoderJob::~VideoDecoderJob() {}
|
|
|
| -bool VideoDecoderJob::SetVideoSurface(gfx::ScopedJavaSurface surface) {
|
| +bool VideoDecoderJob::SetVideoSurface(gl::ScopedJavaSurface surface) {
|
| // For an empty surface, always pass it to the |media_codec_bridge_| job so
|
| // that it can detach from the current one. Otherwise, don't pass an
|
| // unprotected surface if the video content requires a protected one.
|
| @@ -62,7 +62,7 @@ bool VideoDecoderJob::HasStream() const {
|
|
|
| void VideoDecoderJob::ReleaseDecoderResources() {
|
| MediaDecoderJob::ReleaseDecoderResources();
|
| - surface_ = gfx::ScopedJavaSurface();
|
| + surface_ = gl::ScopedJavaSurface();
|
| }
|
|
|
| void VideoDecoderJob::SetDemuxerConfigs(const DemuxerConfigs& configs) {
|
|
|