Clean up cc/paint interfaces

third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp

Index: third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
index 6843ba36ea9bd95610e90652fb195de74957a156..1aabcd3938a378d7296febe1fd4f15b12668028a 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp
@@ -798,11 +798,11 @@ TEST_P(PaintControllerTest, CachedDisplayItems) {
                       TestDisplayItem(second, backgroundDrawingType));
   EXPECT_TRUE(getPaintController().clientCacheIsValid(first));
   EXPECT_TRUE(getPaintController().clientCacheIsValid(second));
-  const PaintRecord* firstPaintRecord =
+  sk_sp<const PaintRecord> firstPaintRecord =

[danakj, 2017/03/16 20:06:17]

could be const& if u want

[enne (OOO), 2017/03/20 17:14:15]

ASAN disagrees:
https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium...

I think I could make it a pointer, but why should a test author have to think
that strongly about lifetimes here.  I'm just going to leave it as it was
originally so lifetimes are preserved regardless.

       static_cast<const DrawingDisplayItem&>(
           getPaintController().getDisplayItemList()[0])
           .GetPaintRecord();
-  const PaintRecord* secondPaintRecord =
+  sk_sp<const PaintRecord> secondPaintRecord =

[danakj, 2017/03/16 20:06:17]

same

       static_cast<const DrawingDisplayItem&>(
           getPaintController().getDisplayItemList()[1])
           .GetPaintRecord();
@@ -1593,13 +1593,13 @@ TEST_P(PaintControllerTest, SkipCache) {
                       TestDisplayItem(content, foregroundDrawingType),
                       TestDisplayItem(content, foregroundDrawingType));
   sk_sp<const PaintRecord> record1 =

[danakj, 2017/03/16 20:06:17]

same

-      sk_ref_sp(static_cast<const DrawingDisplayItem&>(
-                    getPaintController().getDisplayItemList()[1])
-                    .GetPaintRecord());
+      static_cast<const DrawingDisplayItem&>(
+          getPaintController().getDisplayItemList()[1])
+          .GetPaintRecord();
   sk_sp<const PaintRecord> record2 =
-      sk_ref_sp(static_cast<const DrawingDisplayItem&>(
-                    getPaintController().getDisplayItemList()[2])
-                    .GetPaintRecord());
+      static_cast<const DrawingDisplayItem&>(
+          getPaintController().getDisplayItemList()[2])
+          .GetPaintRecord();
   EXPECT_NE(record1, record2);
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
@@ -1634,12 +1634,12 @@ TEST_P(PaintControllerTest, SkipCache) {
                       TestDisplayItem(multicol, backgroundDrawingType),
                       TestDisplayItem(content, foregroundDrawingType),
                       TestDisplayItem(content, foregroundDrawingType));
-  EXPECT_NE(record1.get(), static_cast<const DrawingDisplayItem&>(
-                               getPaintController().getDisplayItemList()[1])
-                               .GetPaintRecord());
-  EXPECT_NE(record2.get(), static_cast<const DrawingDisplayItem&>(
-                               getPaintController().getDisplayItemList()[2])
-                               .GetPaintRecord());
+  EXPECT_NE(record1, static_cast<const DrawingDisplayItem&>(
+                         getPaintController().getDisplayItemList()[1])
+                         .GetPaintRecord());
+  EXPECT_NE(record2, static_cast<const DrawingDisplayItem&>(
+                         getPaintController().getDisplayItemList()[2])
+                         .GetPaintRecord());
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     EXPECT_EQ(1u, getPaintController().paintChunks().size());
@@ -1670,12 +1670,12 @@ TEST_P(PaintControllerTest, SkipCache) {
                       TestDisplayItem(content, foregroundDrawingType),
                       TestDisplayItem(content, foregroundDrawingType),
                       TestDisplayItem(content, foregroundDrawingType));
-  EXPECT_NE(record1.get(), static_cast<const DrawingDisplayItem&>(
-                               getPaintController().newDisplayItemList()[1])
-                               .GetPaintRecord());
-  EXPECT_NE(record2.get(), static_cast<const DrawingDisplayItem&>(
-                               getPaintController().newDisplayItemList()[2])
-                               .GetPaintRecord());
+  EXPECT_NE(record1, static_cast<const DrawingDisplayItem&>(
+                         getPaintController().newDisplayItemList()[1])
+                         .GetPaintRecord());
+  EXPECT_NE(record2, static_cast<const DrawingDisplayItem&>(
+                         getPaintController().newDisplayItemList()[2])
+                         .GetPaintRecord());
 
   getPaintController().commitNewDisplayItems();
 
@@ -1716,17 +1716,17 @@ TEST_P(PaintControllerTest, PartialSkipCache) {
                       TestDisplayItem(content, foregroundDrawingType),
                       TestDisplayItem(content, foregroundDrawingType));
   sk_sp<const PaintRecord> record0 =

[danakj, 2017/03/16 20:06:17]

same

-      sk_ref_sp(static_cast<const DrawingDisplayItem&>(
-                    getPaintController().getDisplayItemList()[0])
-                    .GetPaintRecord());
+      static_cast<const DrawingDisplayItem&>(
+          getPaintController().getDisplayItemList()[0])
+          .GetPaintRecord();
   sk_sp<const PaintRecord> record1 =
-      sk_ref_sp(static_cast<const DrawingDisplayItem&>(
-                    getPaintController().getDisplayItemList()[1])
-                    .GetPaintRecord());
+      static_cast<const DrawingDisplayItem&>(
+          getPaintController().getDisplayItemList()[1])
+          .GetPaintRecord();
   sk_sp<const PaintRecord> record2 =
-      sk_ref_sp(static_cast<const DrawingDisplayItem&>(
-                    getPaintController().getDisplayItemList()[2])
-                    .GetPaintRecord());
+      static_cast<const DrawingDisplayItem&>(
+          getPaintController().getDisplayItemList()[2])
+          .GetPaintRecord();
   EXPECT_NE(record1, record2);
 
   // Content's cache is invalid because it has display items skipped cache.
@@ -1757,15 +1757,15 @@ TEST_P(PaintControllerTest, PartialSkipCache) {
                       TestDisplayItem(content, backgroundDrawingType),
                       TestDisplayItem(content, foregroundDrawingType),
                       TestDisplayItem(content, foregroundDrawingType));
-  EXPECT_NE(record0.get(), static_cast<const DrawingDisplayItem&>(
-                               getPaintController().getDisplayItemList()[0])
-                               .GetPaintRecord());
-  EXPECT_NE(record1.get(), static_cast<const DrawingDisplayItem&>(
-                               getPaintController().getDisplayItemList()[1])
-                               .GetPaintRecord());
-  EXPECT_NE(record2.get(), static_cast<const DrawingDisplayItem&>(
-                               getPaintController().getDisplayItemList()[2])
-                               .GetPaintRecord());
+  EXPECT_NE(record0, static_cast<const DrawingDisplayItem&>(
+                         getPaintController().getDisplayItemList()[0])
+                         .GetPaintRecord());
+  EXPECT_NE(record1, static_cast<const DrawingDisplayItem&>(
+                         getPaintController().getDisplayItemList()[1])
+                         .GetPaintRecord());
+  EXPECT_NE(record2, static_cast<const DrawingDisplayItem&>(
+                         getPaintController().getDisplayItemList()[2])
+                         .GetPaintRecord());
 }
 
 TEST_F(PaintControllerTestBase, OptimizeNoopPairs) {