Add PaintController::showDebugDataWithPictures()

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 653 matching lines @@
 
     // Discard the forced repainted display item and move the cached item into m_newDisplayItemList.
     // This is to align with the non-under-invalidation-checking path to empty the original cached slot,
     // leaving only disappeared or invalidated display items in the old list after painting.
     m_newDisplayItemList.removeLast();
     m_newDisplayItemList.appendByMoving(*oldItem);
 
     ++m_underInvalidationCheckingBegin;
 }
 
-String PaintController::displayItemListAsDebugString(const DisplayItemList& list) const
+String PaintController::displayItemListAsDebugString(const DisplayItemList& list, bool showPictures) const
 {
     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: %d, ", (int)i));
 #ifndef NDEBUG
         displayItem.dumpPropertiesAsDebugString(stringBuilder);
 #else
         stringBuilder.append(String::format("clientDebugName: %s", displayItem.client().debugName().ascii().data()));
 #endif
         if (displayItem.hasValidClient()) {
             do {
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
                 if (!displayItem.client().isAlive()) {
                     stringBuilder.append(", clientIsAlive: false");
                     break;
                 }
 #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::showDebugData() const
+void PaintController::showDebugDataInternal(bool showPictures) const
 {
-    WTFLogAlways("current display item list: [%s]\n", displayItemListAsDebugString(m_currentPaintArtifact.getDisplayItemList()).utf8().data());
-    WTFLogAlways("new display item list: [%s]\n", displayItemListAsDebugString(m_newDisplayItemList).utf8().data());
+    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