| Index: media/blink/skcanvas_video_renderer.h
|
| diff --git a/media/blink/skcanvas_video_renderer.h b/media/blink/skcanvas_video_renderer.h
|
| index 9b75cd01e0fad04c242dd1463c73c6142e853845..94a6fa71697ed0e73e9135643e8863e94fc492e3 100644
|
| --- a/media/blink/skcanvas_video_renderer.h
|
| +++ b/media/blink/skcanvas_video_renderer.h
|
| @@ -11,7 +11,6 @@
|
| #include "media/base/media_export.h"
|
| #include "media/base/video_rotation.h"
|
| #include "media/filters/context_3d.h"
|
| -#include "third_party/skia/include/core/SkBitmap.h"
|
| #include "third_party/skia/include/core/SkXfermode.h"
|
| #include "ui/gfx/geometry/rect.h"
|
|
|
| @@ -20,7 +19,6 @@ class SkCanvas;
|
| namespace media {
|
|
|
| class VideoFrame;
|
| -class VideoImageGenerator;
|
|
|
| // Handles rendering of VideoFrames to SkCanvases, doing any necessary YUV
|
| // conversion and caching of resulting RGB bitmaps.
|
| @@ -70,25 +68,6 @@ class MEDIA_EXPORT SkCanvasVideoRenderer {
|
| bool flip_y);
|
|
|
| private:
|
| - void ResetLastFrame();
|
| - void ResetAcceleratedLastFrame();
|
| -
|
| - // An RGB bitmap and corresponding timestamp of the previously converted
|
| - // video frame data by software color space conversion.
|
| - SkBitmap last_frame_;
|
| - base::TimeDelta last_frame_timestamp_;
|
| - // If |last_frame_| is not used for a while, it's deleted to save memory.
|
| - base::DelayTimer<SkCanvasVideoRenderer> frame_deleting_timer_;
|
| -
|
| - // This is a hardware accelerated copy of the frame generated by
|
| - // |accelerated_generator_|.
|
| - // It's used when |canvas| parameter in Paint() is Ganesh canvas.
|
| - // Note: all GrContext in SkCanvas instances are same.
|
| - SkBitmap accelerated_last_frame_;
|
| - VideoImageGenerator* accelerated_generator_;
|
| - base::TimeDelta accelerated_last_frame_timestamp_;
|
| - base::DelayTimer<SkCanvasVideoRenderer> accelerated_frame_deleting_timer_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(SkCanvasVideoRenderer);
|
| };
|
|
|
|
|