Clean up cc/paint interfaces

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/paint/PaintController.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/ClipPathDisplayItem.h"
 #include "platform/graphics/paint/ClipPathRecorder.h"
@@ skipping 780 matching lines @@
            FloatRect(100, 100, 150, 150));
   drawRect(context, second, backgroundDrawingType,
            FloatRect(100, 100, 150, 150));
   getPaintController().commitNewDisplayItems();
 
   EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 2,
                       TestDisplayItem(first, backgroundDrawingType),
                       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();
 
   first.setDisplayItemsUncached();
   EXPECT_FALSE(getPaintController().clientCacheIsValid(first));
   EXPECT_TRUE(getPaintController().clientCacheIsValid(second));
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     getPaintController().updateCurrentPaintChunkProperties(
@@ skipping 769 matching lines @@
   drawRect(context, content, foregroundDrawingType, rect1);
   drawRect(context, content, foregroundDrawingType, rect2);
   getPaintController().endSkippingCache();
 
   getPaintController().commitNewDisplayItems();
 
   EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
                       TestDisplayItem(multicol, backgroundDrawingType),
                       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()) {
     EXPECT_EQ(1u, getPaintController().paintChunks().size());
     EXPECT_THAT(getPaintController().paintChunks()[0].rasterInvalidationRects,
                 UnorderedElementsAre(FloatRect(LayoutRect::infiniteIntRect())));
 
     getPaintController().updateCurrentPaintChunkProperties(
         &m_rootPaintChunkId, defaultPaintChunkProperties());
   }
@@ skipping 14 matching lines @@
   EXPECT_EQ(0, numOutOfOrderMatches());
   EXPECT_EQ(0, numIndexedItems());
 #endif
 
   getPaintController().commitNewDisplayItems();
 
   EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
                       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());
     EXPECT_THAT(
         getPaintController().paintChunks()[0].rasterInvalidationRects,
         UnorderedElementsAre(
             FloatRect(100, 100, 100, 100),    // Old bounds of |content|.
             FloatRect(100, 100, 100, 100)));  // New bounds of |content|.
 
     getPaintController().updateCurrentPaintChunkProperties(
@@ skipping 10 matching lines @@
   drawRect(context, content, foregroundDrawingType, rect2);
   drawRect(context, content, foregroundDrawingType, rect3);
   getPaintController().endSkippingCache();
 
   // We should repaint everything on invalidation of the scope container.
   EXPECT_DISPLAY_LIST(getPaintController().newDisplayItemList(), 4,
                       TestDisplayItem(multicol, backgroundDrawingType),
                       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();
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     EXPECT_EQ(1u, getPaintController().paintChunks().size());
     EXPECT_THAT(
         getPaintController().paintChunks()[0].rasterInvalidationRects,
         UnorderedElementsAre(
             FloatRect(100, 100, 200, 200),    // Old bounds of |multicol|.
             FloatRect(100, 100, 200, 200),    // New bounds of |multicol|.
@@ skipping 19 matching lines @@
   drawRect(context, content, foregroundDrawingType, rect2);
   getPaintController().endSkippingCache();
   drawRect(context, content, foregroundDrawingType, rect3);
 
   getPaintController().commitNewDisplayItems();
 
   EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
                       TestDisplayItem(content, backgroundDrawingType),
                       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.
   EXPECT_FALSE(getPaintController().clientCacheIsValid(content));
   EXPECT_EQ(PaintInvalidationFull, content.getPaintInvalidationReason());
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     getPaintController().updateCurrentPaintChunkProperties(
         &m_rootPaintChunkId, defaultPaintChunkProperties());
   }
@@ skipping 10 matching lines @@
   EXPECT_EQ(0, numOutOfOrderMatches());
   EXPECT_EQ(0, numIndexedItems());
 #endif
 
   getPaintController().commitNewDisplayItems();
 
   EXPECT_DISPLAY_LIST(getPaintController().getDisplayItemList(), 3,
                       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) {
   FakeDisplayItemClient first("first");
   FakeDisplayItemClient second("second");
   FakeDisplayItemClient third("third");
 
   GraphicsContext context(getPaintController());
   drawRect(context, first, backgroundDrawingType, FloatRect(0, 0, 100, 100));
   {
@@ skipping 525 matching lines @@
 }
 
 TEST_F(PaintControllerUnderInvalidationTest,
        FoldCompositingDrawingInSubsequence) {
   testFoldCompositingDrawingInSubsequence();
 }
 
 #endif  // defined(GTEST_HAS_DEATH_TEST) && !OS(ANDROID)
 
 }  // namespace blink