Index: media/blink/skcanvas_video_renderer.cc |
diff --git a/media/blink/skcanvas_video_renderer.cc b/media/blink/skcanvas_video_renderer.cc |
index bbfeef82b511e29d58b80ccad096cd18199f80e8..d2df8a1d5945700826ff80f9972813a72af0d0fc 100644 |
--- a/media/blink/skcanvas_video_renderer.cc |
+++ b/media/blink/skcanvas_video_renderer.cc |
@@ -170,7 +170,11 @@ class SyncPointClientImpl : public VideoFrame::SyncPointClient { |
// Generates an RGB image from a VideoFrame. Convert YUV to RGB plain on GPU. |
class VideoImageGenerator : public SkImageGenerator { |
public: |
- VideoImageGenerator(const scoped_refptr<VideoFrame>& frame) : frame_(frame) { |
+ VideoImageGenerator(const scoped_refptr<VideoFrame>& frame) |
+ : SkImageGenerator( |
+ SkImageInfo::MakeN32Premul(frame_->visible_rect().width(), |
f(malita)
2015/05/03 13:19:01
Looks like frame_ is not initialized at this point
reed2
2015/05/03 19:32:32
Doh! thanks.
|
+ frame_->visible_rect().height())), |
+ frame_(frame) { |
f(malita)
2015/05/03 13:19:01
Formatting nit: the comma should go on this line
reed2
2015/05/03 19:32:32
Done.
|
DCHECK(frame_.get()); |
} |
~VideoImageGenerator() override {} |
@@ -178,14 +182,6 @@ class VideoImageGenerator : public SkImageGenerator { |
void set_frame(const scoped_refptr<VideoFrame>& frame) { frame_ = frame; } |
protected: |
- bool onGetInfo(SkImageInfo* info) override { |
- info->fWidth = frame_->visible_rect().width(); |
- info->fHeight = frame_->visible_rect().height(); |
- info->fColorType = kN32_SkColorType; |
- info->fAlphaType = kPremul_SkAlphaType; |
- return true; |
- } |
- |
Result onGetPixels(const SkImageInfo& info, |
void* pixels, |
size_t row_bytes, |