Clean up cc/paint interfaces

third_party/WebKit/Source/platform/graphics/BitmapImage.cpp

Index: third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp b/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
index 766cadf234a13ec79e6d85bfec2216c8681af312..55cdde875ea27bc6086b234eba3fae38c1cabdeb 100644
--- a/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
+++ b/third_party/WebKit/Source/platform/graphics/BitmapImage.cpp
@@ -298,11 +298,15 @@ void BitmapImage::draw(
     }
   }
 
-  canvas->drawImageRect(image.get(), adjustedSrcRect, adjustedDstRect, &flags,
+  uint32_t uniqueID = image->uniqueID();
+  bool isLazyGenerated = image->isLazyGenerated();
+
+  canvas->drawImageRect(std::move(image), adjustedSrcRect, adjustedDstRect,
+                        &flags,
                         WebCoreClampingModeToSkiaRectConstraint(clampMode));
 
-  if (image->isLazyGenerated())
-    PlatformInstrumentation::didDrawLazyPixelRef(image->uniqueID());
+  if (isLazyGenerated)
+    PlatformInstrumentation::didDrawLazyPixelRef(uniqueID);
 
   startAnimation();
 }