Cleanups of PaintController

third_party/WebKit/Source/platform/graphics/paint/PaintController.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/TraceEvent.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "third_party/skia/include/core/SkPictureAnalyzer.h"
@@ skipping 683 matching lines @@
 {
     StringBuilder stringBuilder;
     size_t i = 0;
     for (auto it = list.begin(); it != list.end(); ++it, ++i) {
         const DisplayItem& displayItem = *it;
         if (i)
             stringBuilder.append(",\n");
         stringBuilder.append(String::format("{index: %zu, ", i));
 #ifndef NDEBUG
         displayItem.dumpPropertiesAsDebugString(stringBuilder);
+#endif
+
+        if (displayItem.hasValidClient()) {
+#if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
+            if (!displayItem.client().isAlive()) {
+                stringBuilder.append(", clientIsAlive: false");
+            } else {
 #else
-        stringBuilder.append(String::format("clientDebugName: %s", displayItem.client().debugName().ascii().data()));
+            // debugName() and clientCacheIsValid() can only be called on alive client, so only output it for
+            // m_newDisplayItemList in which we are sure the clients are all alive.
+            if (&list == &m_newDisplayItemList) {
 #endif
-        if (displayItem.hasValidClient()) {
-            do {
-#if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
-                if (!displayItem.client().isAlive()) {
-                    stringBuilder.append(", clientIsAlive: false");
-                    break;
-                }
+#ifdef NDEBUG
+                stringBuilder.append(String::format("clientDebugName: \"%s\"", displayItem.client().debugName().ascii().data()));
 #endif
                 stringBuilder.append(", cacheIsValid: ");
                 stringBuilder.append(clientCacheIsValid(displayItem.client()) ? "true" : "false");
-            } while (false);
+            }
 #ifndef NDEBUG
             if (showPictures && displayItem.isDrawing()) {
                 if (const SkPicture* picture = static_cast<const DrawingDisplayItem&>(displayItem).picture()) {
                     stringBuilder.append(", picture: ");
                     stringBuilder.append(pictureAsDebugString(picture));
                 }
             }
 #endif
         }
         if (list.hasVisualRect(i)) {
             IntRect visualRect = list.visualRect(i);
             stringBuilder.append(String::format(", visualRect: [%d,%d %dx%d]",
                 visualRect.x(), visualRect.y(),
                 visualRect.width(), visualRect.height()));
         }
         stringBuilder.append('}');
     }
     return stringBuilder.toString();
 }
 
 void PaintController::showDebugDataInternal(bool showPictures) const
 {
     WTFLogAlways("current display item list: [%s]\n", displayItemListAsDebugString(m_currentPaintArtifact.getDisplayItemList(), showPictures).utf8().data());
     WTFLogAlways("new display item list: [%s]\n", displayItemListAsDebugString(m_newDisplayItemList, showPictures).utf8().data());
 }
 
 } // namespace blink