Clean up cc/paint interfaces

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

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 280 matching lines @@
     if (orientation.usesWidthAsHeight()) {
       // The destination rect will have its width and height already reversed
       // for the orientation of the image, as it was needed for page layout, so
       // we need to reverse it back here.
       adjustedDstRect =
           FloatRect(adjustedDstRect.x(), adjustedDstRect.y(),
                     adjustedDstRect.height(), adjustedDstRect.width());
     }
   }
 
-  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();
 }
 
 size_t BitmapImage::frameCount() {
   if (!m_haveFrameCount) {
     m_frameCount = m_source.frameCount();
     // If decoder is not initialized yet, m_source.frameCount() returns 0.
     if (m_frameCount)
       m_haveFrameCount = true;
@@ skipping 319 matching lines @@
     getImageObserver()->animationAdvanced(this);
 
   return true;
 }
 
 void BitmapImage::notifyObserversOfAnimationAdvance(TimerBase*) {
   getImageObserver()->animationAdvanced(this);
 }
 
 }  // namespace blink