DO NOT COMMIT: Results of running new (proposed) clang-format on Blink

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 <memory>
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/ClipPathDisplayItem.h"
@@ skipping 56 matching lines @@
       : DisplayItem(client, type, sizeof(*this)) {}
 
   void replay(GraphicsContext&) const final { ASSERT_NOT_REACHED(); }
   void appendToWebDisplayItemList(const IntRect&,
                                   WebDisplayItemList*) const final {
     ASSERT_NOT_REACHED();
   }
 };
 
 #ifndef NDEBUG
-#define TRACE_DISPLAY_ITEMS(i, expected, actual)                 \
-  String trace = String::format("%d: ", (int)i) + "Expected: " + \
-                 (expected).asDebugString() + " Actual: " +      \
-                 (actual).asDebugString();                       \
+#define TRACE_DISPLAY_ITEMS(i, expected, actual)             \
+  String trace = String::format("%d: ", (int)i) +            \
+                 "Expected: " + (expected).asDebugString() + \
+                 " Actual: " + (actual).asDebugString();     \
   SCOPED_TRACE(trace.utf8().data());
 #else
 #define TRACE_DISPLAY_ITEMS(i, expected, actual)
 #endif
 
 #define EXPECT_DISPLAY_LIST(actual, expectedSize, ...)                     \
   do {                                                                     \
     EXPECT_EQ((size_t)expectedSize, actual.size());                        \
     if (expectedSize != actual.size())                                     \
       break;                                                               \
@@ skipping 727 matching lines @@
   drawRect(context, first, backgroundDrawingType,
            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));
   // The first display item should be updated.
-  EXPECT_NE(firstPaintRecord, static_cast<const DrawingDisplayItem&>(
-                                  getPaintController().getDisplayItemList()[0])
-                                  .GetPaintRecord());
+  EXPECT_NE(firstPaintRecord,
+            static_cast<const DrawingDisplayItem&>(
+                getPaintController().getDisplayItemList()[0])
+                .GetPaintRecord());
   // The second display item should be cached.
   if (!RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled()) {
     EXPECT_EQ(secondPaintRecord,
               static_cast<const DrawingDisplayItem&>(
                   getPaintController().getDisplayItemList()[1])
                   .GetPaintRecord());
   }
   EXPECT_TRUE(getPaintController().clientCacheIsValid(first));
   EXPECT_TRUE(getPaintController().clientCacheIsValid(second));
 
@@ skipping 786 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.get(),
+            static_cast<const DrawingDisplayItem&>(
+                getPaintController().getDisplayItemList()[1])
+                .GetPaintRecord());
+  EXPECT_NE(record2.get(),
+            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.get(),
+            static_cast<const DrawingDisplayItem&>(
+                getPaintController().newDisplayItemList()[1])
+                .GetPaintRecord());
+  EXPECT_NE(record2.get(),
+            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 61 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.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());
 }
 
 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