| Index: media/base/video_frame.cc
|
| diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
|
| index 32c203ceadb8b0bf67c368899a21129b28507517..c08e9d5c5ff5d9f962740b6f7c9bb0e3b52211d2 100644
|
| --- a/media/base/video_frame.cc
|
| +++ b/media/base/video_frame.cc
|
| @@ -16,10 +16,6 @@
|
| #include "media/base/video_util.h"
|
| #include "ui/gfx/geometry/point.h"
|
|
|
| -#if !defined(MEDIA_FOR_CAST_IOS)
|
| -#include "third_party/skia/include/core/SkBitmap.h"
|
| -#endif
|
| -
|
| namespace media {
|
|
|
| static bool IsPowerOfTwo(size_t x) {
|
| @@ -247,8 +243,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapNativeTexture(
|
| const gfx::Size& coded_size,
|
| const gfx::Rect& visible_rect,
|
| const gfx::Size& natural_size,
|
| - base::TimeDelta timestamp,
|
| - const ReadPixelsCB& read_pixels_cb) {
|
| + base::TimeDelta timestamp) {
|
| scoped_refptr<VideoFrame> frame(new VideoFrame(NATIVE_TEXTURE,
|
| coded_size,
|
| visible_rect,
|
| @@ -257,19 +252,10 @@ scoped_refptr<VideoFrame> VideoFrame::WrapNativeTexture(
|
| timestamp,
|
| false));
|
| frame->mailbox_holder_release_cb_ = mailbox_holder_release_cb;
|
| - frame->read_pixels_cb_ = read_pixels_cb;
|
|
|
| return frame;
|
| }
|
|
|
| -#if !defined(MEDIA_FOR_CAST_IOS)
|
| -void VideoFrame::ReadPixelsFromNativeTexture(const SkBitmap& pixels) {
|
| - DCHECK_EQ(format_, NATIVE_TEXTURE);
|
| - if (!read_pixels_cb_.is_null())
|
| - read_pixels_cb_.Run(pixels);
|
| -}
|
| -#endif
|
| -
|
| // static
|
| scoped_refptr<VideoFrame> VideoFrame::WrapExternalPackedMemory(
|
| Format format,
|
|
|