Clean up cc/paint interfaces

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

 /*
  * Copyright (C) 2012 Google 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 63 matching lines @@
   SkiaPaintCanvas canvas(bitmap);
 
   std::unique_ptr<PaintController> paintController = PaintController::create();
   GraphicsContext context(*paintController);
 
   Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
   FloatRect bounds(0, 0, 100, 100);
 
   context.beginRecording(bounds);
   context.fillRect(FloatRect(0, 0, 50, 50), opaque, SkBlendMode::kSrcOver);
-  sk_sp<const PaintRecord> record = context.endRecording();
-  canvas.drawPicture(record.get());
+  canvas.drawPicture(context.endRecording());
   EXPECT_OPAQUE_PIXELS_ONLY_IN_RECT(bitmap, IntRect(0, 0, 50, 50))
 
   context.beginRecording(bounds);
   context.fillRect(FloatRect(0, 0, 100, 100), opaque, SkBlendMode::kSrcOver);
-  record = context.endRecording();
   // Make sure the opaque region was unaffected by the rect drawn during
   // recording.
   EXPECT_OPAQUE_PIXELS_ONLY_IN_RECT(bitmap, IntRect(0, 0, 50, 50))
 
-  canvas.drawPicture(record.get());
+  canvas.drawPicture(context.endRecording());
   EXPECT_OPAQUE_PIXELS_ONLY_IN_RECT(bitmap, IntRect(0, 0, 100, 100))
 }
 
 TEST(GraphicsContextTest, UnboundedDrawsAreClipped) {
   SkBitmap bitmap;
   bitmap.allocN32Pixels(400, 400);
   bitmap.eraseColor(0);
   SkiaPaintCanvas canvas(bitmap);
 
   Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
@@ skipping 11 matching lines @@
   context.setStrokeStyle(SolidStroke);
 
   // Make skia unable to compute fast bounds for our paths.
   DashArray dashArray;
   dashArray.push_back(1);
   dashArray.push_back(0);
   context.setLineDash(dashArray, 0);
 
   // Make the device opaque in 10,10 40x40.
   context.fillRect(FloatRect(10, 10, 40, 40), opaque, SkBlendMode::kSrcOver);
-  sk_sp<const PaintRecord> record = context.endRecording();
-  canvas.drawPicture(record.get());
+  canvas.drawPicture(context.endRecording());
   EXPECT_OPAQUE_PIXELS_ONLY_IN_RECT(bitmap, IntRect(10, 10, 40, 40));
 
   context.beginRecording(bounds);
   // Clip to the left edge of the opaque area.
   context.clip(IntRect(10, 10, 10, 40));
 
   // Draw a path that gets clipped. This should destroy the opaque area, but
   // only inside the clip.
   Path path;
   path.moveTo(FloatPoint(10, 10));
   path.addLineTo(FloatPoint(40, 40));
   PaintFlags flags;
   flags.setColor(alpha.rgb());
   flags.setBlendMode(SkBlendMode::kSrcOut);
   context.drawPath(path.getSkPath(), flags);
 
-  record = context.endRecording();
-  canvas.drawPicture(record.get());
+  canvas.drawPicture(context.endRecording());
   EXPECT_OPAQUE_PIXELS_IN_RECT(bitmap, IntRect(20, 10, 30, 40));
 }
 
 }  // namespace blink