Clean up cc/paint interfaces

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

 /*
  * Copyright (C) 2009 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 262 matching lines @@
   return m_previousInterestRect;
 }
 
 void GraphicsLayer::paint(const IntRect* interestRect,
                           GraphicsContext::DisabledMode disabledMode) {
   if (paintWithoutCommit(interestRect, disabledMode)) {
     getPaintController().commitNewDisplayItems(
         offsetFromLayoutObjectWithSubpixelAccumulation());
     if (RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled()) {
       sk_sp<PaintRecord> record = captureRecord();
-      checkPaintUnderInvalidations(*record);
+      checkPaintUnderInvalidations(record);
       RasterInvalidationTracking& tracking =
           rasterInvalidationTrackingMap().add(this);
       tracking.lastPaintedRecord = std::move(record);
       tracking.lastInterestRect = m_previousInterestRect;
       tracking.rasterInvalidationRegionSinceLastPaint = Region();
     }
   }
 }
 
 bool GraphicsLayer::paintWithoutCommit(
@@ skipping 901 matching lines @@
   return abs(c1 - c2) > 2;
 }
 
 static bool pixelsDiffer(SkColor p1, SkColor p2) {
   return pixelComponentsDiffer(SkColorGetA(p1), SkColorGetA(p2)) ||
          pixelComponentsDiffer(SkColorGetR(p1), SkColorGetR(p2)) ||
          pixelComponentsDiffer(SkColorGetG(p1), SkColorGetG(p2)) ||
          pixelComponentsDiffer(SkColorGetB(p1), SkColorGetB(p2));
 }
 
-void GraphicsLayer::checkPaintUnderInvalidations(const PaintRecord& newRecord) {
+void GraphicsLayer::checkPaintUnderInvalidations(sk_sp<PaintRecord> newRecord) {
   if (!drawsContent())
     return;
 
   RasterInvalidationTracking* tracking =
       rasterInvalidationTrackingMap().find(this);
   if (!tracking)
     return;
 
   if (!tracking->lastPaintedRecord)
     return;
 
   IntRect rect = intersection(tracking->lastInterestRect, interestRect());
   if (rect.isEmpty())
     return;
 
   SkBitmap oldBitmap;
   oldBitmap.allocPixels(
       SkImageInfo::MakeN32Premul(rect.width(), rect.height()));
   {
     SkiaPaintCanvas canvas(oldBitmap);
     canvas.clear(SK_ColorTRANSPARENT);
     canvas.translate(-rect.x(), -rect.y());
-    canvas.drawPicture(tracking->lastPaintedRecord.get());
+    canvas.drawPicture(tracking->lastPaintedRecord);
   }
 
   SkBitmap newBitmap;
   newBitmap.allocPixels(
       SkImageInfo::MakeN32Premul(rect.width(), rect.height()));
   {
     SkiaPaintCanvas canvas(newBitmap);
     canvas.clear(SK_ColorTRANSPARENT);
     canvas.translate(-rect.x(), -rect.y());
-    canvas.drawPicture(&newRecord);
+    canvas.drawPicture(std::move(newRecord));
   }
 
   oldBitmap.lockPixels();
   newBitmap.lockPixels();
   int mismatchingPixels = 0;
   static const int maxMismatchesToReport = 50;
   for (int bitmapY = 0; bitmapY < rect.height(); ++bitmapY) {
     int layerY = bitmapY + rect.y();
     for (int bitmapX = 0; bitmapX < rect.width(); ++bitmapX) {
       int layerX = bitmapX + rect.x();
@@ skipping 41 matching lines @@
 void showGraphicsLayerTree(const blink::GraphicsLayer* layer) {
   if (!layer) {
     LOG(INFO) << "Cannot showGraphicsLayerTree for (nil).";
     return;
   }
 
   String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo);
   LOG(INFO) << output.utf8().data();
 }
 #endif