Revert of Add stable id to PaintImage.

media/renderers/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/renderers/skcanvas_video_renderer.h"
 
 #include <GLES3/gl3.h>
 #include <limits>
 
 #include "base/macros.h"
@@ skipping 326 matching lines @@
   scoped_refptr<VideoFrame> frame_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoImageGenerator);
 };
 
 SkCanvasVideoRenderer::SkCanvasVideoRenderer()
     : last_image_deleting_timer_(
           FROM_HERE,
           base::TimeDelta::FromSeconds(kTemporaryResourceDeletionDelay),
           this,
-          &SkCanvasVideoRenderer::ResetCache),
-      renderer_stable_id_(cc::PaintImage::GetNextId()) {}
+          &SkCanvasVideoRenderer::ResetCache) {}
 
 SkCanvasVideoRenderer::~SkCanvasVideoRenderer() {
   ResetCache();
 }
 
 void SkCanvasVideoRenderer::Paint(const scoped_refptr<VideoFrame>& video_frame,
                                   cc::PaintCanvas* canvas,
                                   const gfx::RectF& dest_rect,
                                   cc::PaintFlags& flags,
                                   VideoRotation video_rotation,
@@ skipping 72 matching lines @@
   // safe to access on another thread or GL context. So if we're drawing into a
   // recording canvas we read the texture back into CPU memory and record that
   // sw image into the SkPicture. The long term solution is for Skia to provide
   // a SkPicture filter that makes a picture safe for multiple CPU raster
   // threads. (skbug.com/4321).
   sk_sp<SkImage> image;
   if (canvas->imageInfo().colorType() == kUnknown_SkColorType)
     image = last_image_->makeNonTextureImage();
   else
     image = last_image_;
-  canvas->drawImage(cc::PaintImage(renderer_stable_id_, std::move(image),
-                                   cc::PaintImage::AnimationType::VIDEO,
-                                   cc::PaintImage::CompletionState::DONE),
-                    0, 0, &video_flags);
+  canvas->drawImage(
+      cc::PaintImage(std::move(image), cc::PaintImage::AnimationType::VIDEO,
+                     cc::PaintImage::CompletionState::DONE),
+      0, 0, &video_flags);
 
   if (need_transform)
     canvas->restore();
   // Make sure to flush so we can remove the videoframe from the generator.
   canvas->flush();
 
   if (video_frame->HasTextures()) {
     DCHECK(gl);
     SyncTokenClientImpl client(gl);
     video_frame->UpdateReleaseSyncToken(&client);
@@ skipping 630 matching lines @@
       last_image_->bounds().contains(visible_rect)) {
     last_image_ = last_image_->makeSubset(visible_rect);
   }
 }
 
 SkISize SkCanvasVideoRenderer::LastImageDimensionsForTesting() {
   return last_image_dimensions_for_testing_;
 }
 
 }  // namespace media