onGetInfo is deprecated, just pass info to constructor

media/blink/skcanvas_video_renderer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/blink/skcanvas_video_renderer.h"
 
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "media/base/video_frame.h"
@@ skipping 152 matching lines @@
   gpu::gles2::GLES2Interface* gl_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(SyncPointClientImpl);
 };
 
 }  // anonymous namespace
 
 // 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. Use frame instead?

[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 {}
 
   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,
                      SkPMColor ctable[],
                      int* ctable_count) override {
     if (!frame_.get())
       return kInvalidInput;
     // If skia couldn't do the YUV conversion on GPU, we will on CPU.
     SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels(
         frame_, pixels, row_bytes);
@@ skipping 442 matching lines @@
   last_frame_timestamp_ = media::kNoTimestamp();
 }
 
 void SkCanvasVideoRenderer::ResetAcceleratedLastFrame() {
   accelerated_last_frame_.reset();
   accelerated_generator_ = nullptr;
   accelerated_last_frame_timestamp_ = media::kNoTimestamp();
 }
 
 }  // namespace media