| Index: media/base/android/stream_texture_wrapper.h
|
| diff --git a/media/blink/stream_texture_wrapper.h b/media/base/android/stream_texture_wrapper.h
|
| similarity index 87%
|
| rename from media/blink/stream_texture_wrapper.h
|
| rename to media/base/android/stream_texture_wrapper.h
|
| index bc4308e1bc7ff9cb163ad9b039ce9f4502170e95..fe4356125cd36718986e11b5afebfcc112324161 100644
|
| --- a/media/blink/stream_texture_wrapper.h
|
| +++ b/media/base/android/stream_texture_wrapper.h
|
| @@ -2,10 +2,9 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_BLINK_STREAM_TEXTURE_WRAPPER_H_
|
| -#define MEDIA_BLINK_STREAM_TEXTURE_WRAPPER_H_
|
| +#ifndef MEDIA_BASE_ANDROID_STREAM_TEXTURE_WRAPPER_H_
|
| +#define MEDIA_BASE_ANDROID_STREAM_TEXTURE_WRAPPER_H_
|
|
|
| -#include "cc/layers/video_frame_provider.h"
|
| #include "media/base/video_frame.h"
|
|
|
| namespace media {
|
| @@ -23,7 +22,7 @@ class MEDIA_EXPORT StreamTextureWrapper {
|
| // Initialize the underlying StreamTexture.
|
| // See StreamTextureWrapperImpl.
|
| virtual void Initialize(
|
| - cc::VideoFrameProvider::Client* client,
|
| + const base::Closure& received_frame_cb,
|
| const gfx::Size& natural_size,
|
| scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner,
|
| const base::Closure& init_cb) = 0;
|
| @@ -53,4 +52,4 @@ typedef std::unique_ptr<StreamTextureWrapper, StreamTextureWrapper::Deleter>
|
|
|
| } // namespace media
|
|
|
| -#endif // MEDIA_BLINK_STREAM_TEXTURE_WRAPPER_H_
|
| +#endif // MEDIA_BASE_ANDROID_STREAM_TEXTURE_WRAPPER_H_
|
|
|