Merge to M46 for BUG=510252

media/blink/skcanvas_video_renderer.cc

Index: media/blink/skcanvas_video_renderer.cc
diff --git a/media/blink/skcanvas_video_renderer.cc b/media/blink/skcanvas_video_renderer.cc
index 6aa863e89b1bc19cfc92a8ad2f84c89f2be6c209..edbb556e559279888d05fcb169d87afebdffefd2 100644
--- a/media/blink/skcanvas_video_renderer.cc
+++ b/media/blink/skcanvas_video_renderer.cc
@@ -127,12 +127,6 @@ skia::RefPtr<SkImage> NewSkImageFromVideoFrameYUVTextures(
   return skia::AdoptRef(img);
 }
 
-bool ShouldCacheVideoFrameSkImage(const VideoFrame* video_frame) {
-  return !video_frame->HasTextures() ||
-         media::VideoFrame::NumPlanes(video_frame->format()) != 1 ||
-         video_frame->mailbox_holder(0).texture_target != GL_TEXTURE_2D;
-}
-
 // Creates a SkImage from a |video_frame| backed by native resources.
 // The SkImage will take ownership of the underlying resource.
 skia::RefPtr<SkImage> NewSkImageFromVideoFrameNative(
@@ -388,9 +382,6 @@ void SkCanvasVideoRenderer::Paint(const scoped_refptr<VideoFrame>& video_frame,
   // Make sure to flush so we can remove the videoframe from the generator.
   canvas->flush();
 
-  if (!ShouldCacheVideoFrameSkImage(video_frame.get()))
-    ResetCache();
-
   if (video_frame->HasTextures()) {
     DCHECK(gl);
     SyncPointClientImpl client(gl);