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

Unified Diff: media/blink/skcanvas_video_renderer.cc

Issue 1325173005: Video to canvas: don't draw if a SkImage can't be created. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase on master. Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/blink/skcanvas_video_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/skcanvas_video_renderer.cc
diff --git a/media/blink/skcanvas_video_renderer.cc b/media/blink/skcanvas_video_renderer.cc
index 90297f7dc8f1db1321143a86659b1af5ab49357c..0f9fdac7401b361feeef1144e3dc084f5a522d6b 100644
--- a/media/blink/skcanvas_video_renderer.cc
+++ b/media/blink/skcanvas_video_renderer.cc
@@ -125,7 +125,6 @@ skia::RefPtr<SkImage> NewSkImageFromVideoFrameYUVTextures(
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);
}
@@ -334,6 +333,8 @@ void SkCanvasVideoRenderer::Paint(const scoped_refptr<VideoFrame>& video_frame,
auto video_generator = new VideoImageGenerator(video_frame);
last_image_ = skia::AdoptRef(SkImage::NewFromGenerator(video_generator));
}
+ if (!last_image_) // Couldn't create the SkImage.
+ return;
last_timestamp_ = video_frame->timestamp();
}
last_image_deleting_timer_.Reset();
« no previous file with comments | « no previous file | media/blink/skcanvas_video_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698