Add optional debugging output of what paint chunks go into what layers.

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

 // Copyright 2016 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/DisplayItemList.h"
 
 #include "platform/graphics/LoggingCanvas.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/graphics/paint/PaintChunk.h"
 #include "third_party/skia/include/core/SkPictureAnalyzer.h"
@@ skipping 48 matching lines @@
     std::unique_ptr<JSONObject> json = JSONObject::create();
 
     const DisplayItem& displayItem = *it;
     if ((options & SkipNonDrawings) && !displayItem.isDrawing())
       continue;
 
     json->setInteger("index", i);
 #ifndef NDEBUG
     StringBuilder stringBuilder;
     displayItem.dumpPropertiesAsDebugString(stringBuilder);
-    json->setString("properties", stringBuilder.toString());
+
+    if (options & ShownOnlyDisplayItemTypes) {
+      json->setString("type",
+                      DisplayItem::typeAsDebugString(displayItem.getType()));
+    } else {
+      json->setString("properties", stringBuilder.toString());
+    }
+
 #endif
     if (displayItem.hasValidClient()) {
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
       if (!displayItem.client().isAlive()) {
         json->setBoolean("clientIsAlive", true);
       } else {
 #else
 
       if (options & ShowClientDebugName) {
 #endif
-#ifdef NDEBUG
         json->setString(
             "clientDebugName",
             String::format("clientDebugName: \"%s\"",
                            displayItem.client().debugName().ascii().data()));
-#endif
       }
 #ifndef NDEBUG
       if ((options & ShowPictures) && displayItem.isDrawing()) {
         if (const SkPicture* picture =
                 static_cast<const DrawingDisplayItem&>(displayItem).picture()) {
           json->setString("picture", pictureAsDebugString(picture));
         }
       }
 #endif
     }
     if (hasVisualRect(i)) {
       IntRect localVisualRect = visualRect(i);
       json->setString(
           "visualRect",
           String::format("[%d,%d %dx%d]", localVisualRect.x(),
                          localVisualRect.y(), localVisualRect.width(),
                          localVisualRect.height()));
     }
     jsonArray->pushObject(std::move(json));
   }
   return jsonArray;
 }
 
 }  // namespace blink