Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Side by Side Diff: media/filters/skcanvas_video_renderer.h

Issue 624633002: Fix potential use-after-free bug in VideoImageGenerator::onGetYUV8Planes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_FILTERS_SKCANVAS_VIDEO_RENDERER_H_ 5 #ifndef MEDIA_FILTERS_SKCANVAS_VIDEO_RENDERER_H_
6 #define MEDIA_FILTERS_SKCANVAS_VIDEO_RENDERER_H_ 6 #define MEDIA_FILTERS_SKCANVAS_VIDEO_RENDERER_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
(...skipping 24 matching lines...) Expand all
35 SkCanvas* canvas, 35 SkCanvas* canvas,
36 const gfx::RectF& dest_rect, 36 const gfx::RectF& dest_rect,
37 uint8 alpha, 37 uint8 alpha,
38 SkXfermode::Mode mode, 38 SkXfermode::Mode mode,
39 VideoRotation video_rotation); 39 VideoRotation video_rotation);
40 40
41 // Copy |video_frame| on |canvas|. 41 // Copy |video_frame| on |canvas|.
42 void Copy(const scoped_refptr<VideoFrame>&, SkCanvas* canvas); 42 void Copy(const scoped_refptr<VideoFrame>&, SkCanvas* canvas);
43 43
44 private: 44 private:
45 VideoImageGenerator* generator_;
46
47 // An RGB bitmap and corresponding timestamp of the previously converted 45 // An RGB bitmap and corresponding timestamp of the previously converted
48 // video frame data. 46 // video frame data.
49 SkBitmap last_frame_; 47 SkBitmap last_frame_;
50 base::TimeDelta last_frame_timestamp_; 48 base::TimeDelta last_frame_timestamp_;
51 49
52 DISALLOW_COPY_AND_ASSIGN(SkCanvasVideoRenderer); 50 DISALLOW_COPY_AND_ASSIGN(SkCanvasVideoRenderer);
53 }; 51 };
54 52
55 } // namespace media 53 } // namespace media
56 54
57 #endif // MEDIA_FILTERS_SKCANVAS_VIDEO_RENDERER_H_ 55 #endif // MEDIA_FILTERS_SKCANVAS_VIDEO_RENDERER_H_
OLDNEW
« no previous file with comments | « no previous file | media/filters/skcanvas_video_renderer.cc » ('j') | media/filters/skcanvas_video_renderer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698