Video to canvas: don't draw if a SkImage can't be created.

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 107 matching lines @@
 
   SkYUVColorSpace color_space = kRec601_SkYUVColorSpace;
   if (CheckColorSpace(video_frame, media::COLOR_SPACE_JPEG))
     color_space = kJPEG_SkYUVColorSpace;
   else if (CheckColorSpace(video_frame, media::COLOR_SPACE_HD_REC709))
     color_space = kRec709_SkYUVColorSpace;
 
   SkImage* img = SkImage::NewFromYUVTexturesCopy(context_3d.gr_context,
                                                  color_space, handles, yuvSizes,
                                                  kTopLeft_GrSurfaceOrigin);
-  DCHECK(img);
   gl->DeleteTextures(3, source_textures);
   return skia::AdoptRef(img);
 }
 
 // Creates a SkImage from a |video_frame| backed by native resources.
 // The SkImage will take ownership of the underlying resource.
 skia::RefPtr<SkImage> NewSkImageFromVideoFrameNative(
     VideoFrame* video_frame,
     const Context3D& context_3d) {
   DCHECK(PIXEL_FORMAT_ARGB == video_frame->format() ||
@@ skipping 188 matching lines @@
         last_image_ =
             NewSkImageFromVideoFrameNative(video_frame.get(), context_3d);
       } else {
         last_image_ =
             NewSkImageFromVideoFrameYUVTextures(video_frame.get(), context_3d);
       }
     } else {
       auto video_generator = new VideoImageGenerator(video_frame);
       last_image_ = skia::AdoptRef(SkImage::NewFromGenerator(video_generator));
     }
-    last_timestamp_ = video_frame->timestamp();
+    if (last_image_) {

[DaleCurtis, 2015/09/04 21:27:09]

if (!last_image_)
  return;

[Daniele Castagna, 2015/09/04 21:31:32]

Done.

+      last_timestamp_ = video_frame->timestamp();
+    } else {  // Couldn't create the SkImage.
+      return;
+    }
   }
   last_image_deleting_timer_.Reset();
 
   paint.setXfermodeMode(mode);
   paint.setFilterQuality(kLow_SkFilterQuality);
 
   const bool need_transform =
       video_rotation != VIDEO_ROTATION_0 ||
       dest_rect.size() != video_frame->visible_rect().size() ||
       !dest_rect.origin().IsOrigin();
@@ skipping 221 matching lines @@
   video_frame->UpdateReleaseSyncPoint(&client);
 }
 
 void SkCanvasVideoRenderer::ResetCache() {
   // Clear cached values.
   last_image_ = nullptr;
   last_timestamp_ = kNoTimestamp();
 }
 
 }  // namespace media