Clean up cc/paint interfaces

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 402 matching lines @@
   // This is a workaround for crbug.com/524717. A texture backed image is not
   // 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).
   if (canvas->imageInfo().colorType() == kUnknown_SkColorType) {
     sk_sp<SkImage> swImage = last_image_->makeNonTextureImage();
     canvas->drawImage(swImage, 0, 0, &video_flags);
   } else {
-    canvas->drawImage(last_image_.get(), 0, 0, &video_flags);
+    canvas->drawImage(last_image_, 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);
@@ skipping 523 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