Dump properties in FindPropertiesNeedingUpdate

third_party/WebKit/Source/core/paint/FindPropertiesNeedingUpdate.h

 // 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.
 
 #ifndef FindPropertiesNeedingUpdate_h
 #define FindPropertiesNeedingUpdate_h
 
 #if DCHECK_IS_ON()
 namespace blink {
 
 // This file contains two scope classes for catching cases where paint
 // properties need an update but where not marked as such. If paint properties
 // will change, the object must be marked as needing a paint property update
 // using {FrameView, LayoutObject}::setNeedsPaintPropertyUpdate() or by forcing
 // a subtree update (see: PaintPropertyTreeBuilderContext::forceSubtreeupdate).
 //
 // Both scope classes work by recording the paint property state of an object
 // before rebuilding properties, forcing the properties to get updated, then
 // checking that the updated properties match the original properties.
 
-#define DCHECK_FRAMEVIEW_PROPERTY_EQ(original, updated)                      \
-  do {                                                                       \
-    DCHECK(!!original == !!updated) << "Property was created or deleted "    \
-                                       "without the FrameView needing a "    \
-                                       "paint property update.";             \
-    if (!!original && !!updated) {                                           \
-      DCHECK(*original == *updated) << "Property was updated without the "   \
-                                       "FrameView needing a paint property " \
-                                       "update.";                            \
-    }                                                                        \
-  } while (0);
+#define DUMP_PROPERTIES(original, updated)                           \
+  "\nOriginal:\n"                                                    \
+      << (original ? (original)->toString().ascii().data() : "null") \
+      << "\nUpdated:\n"                                              \
+      << (updated ? (updated)->toString().ascii().data() : "null")
+
+#define CHECK_PROPERTY_EQ(thing, original, updated)                        \
+  do {                                                                     \
+    DCHECK(!!original == !!updated) << "Property was created or deleted "  \
+                                    << "without " << thing                 \
+                                    << " needing a paint property update." \
+                                    << DUMP_PROPERTIES(original, updated); \
+    if (!!original && !!updated) {                                         \
+      DCHECK(*original == *updated) << "Property was updated without "     \
+                                    << thing                               \
+                                    << " needing a paint property update." \
+                                    << DUMP_PROPERTIES(original, updated); \
+    }                                                                      \
+  } while (0)
+
+#define DCHECK_FRAMEVIEW_PROPERTY_EQ(original, updated) \
+  CHECK_PROPERTY_EQ("the FrameView", original, updated)
 
 class FindFrameViewPropertiesNeedingUpdateScope {
  public:
   FindFrameViewPropertiesNeedingUpdateScope(
       FrameView* frameView,
       PaintPropertyTreeBuilderContext& context)
       : m_frameView(frameView),
         m_neededPaintPropertyUpdate(frameView->needsPaintPropertyUpdate()),
         m_neededForcedSubtreeUpdate(context.forceSubtreeUpdate) {
     // No need to check if an update was already needed.
@@ skipping 39 matching lines @@
  private:
   Persistent<FrameView> m_frameView;
   bool m_neededPaintPropertyUpdate;
   bool m_neededForcedSubtreeUpdate;
   RefPtr<TransformPaintPropertyNode> m_originalPreTranslation;
   RefPtr<ClipPaintPropertyNode> m_originalContentClip;
   RefPtr<TransformPaintPropertyNode> m_originalScrollTranslation;
   RefPtr<ScrollPaintPropertyNode> m_originalScroll;
 };
 
-#define DCHECK_OBJECT_PROPERTY_EQ(object, original, updated)                 \
-  do {                                                                       \
-    DCHECK(!!original == !!updated) << "Property was created or deleted "    \
-                                       "without the layout object ("         \
-                                    << object.debugName()                    \
-                                    << ") needing a paint property update."; \
-    if (!!original && !!updated) {                                           \
-      DCHECK(*original == *updated) << "Property was updated without the "   \
-                                       "layout object ("                     \
-                                    << object.debugName()                    \
-                                    << ") needing a paint property update."; \
-    }                                                                        \
-  } while (0);
+#define DCHECK_OBJECT_PROPERTY_EQ(object, original, updated)            \
+  CHECK_PROPERTY_EQ("the layout object (" << object.debugName() << ")", \
+                    original, updated)
 
 class FindObjectPropertiesNeedingUpdateScope {
  public:
   FindObjectPropertiesNeedingUpdateScope(
       const LayoutObject& object,
       PaintPropertyTreeBuilderContext& context)
       : m_object(object),
         m_neededPaintPropertyUpdate(object.needsPaintPropertyUpdate()),
         m_neededForcedSubtreeUpdate(context.forceSubtreeUpdate) {
     // No need to check if an update was already needed.
@@ skipping 50 matching lines @@
                                 m_originalProperties->scrollTranslation(),
                                 objectProperties->scrollTranslation());
       DCHECK_OBJECT_PROPERTY_EQ(m_object,
                                 m_originalProperties->scrollbarPaintOffset(),
                                 objectProperties->scrollbarPaintOffset());
       const auto* originalBorderBox =
           m_originalProperties->localBorderBoxProperties();
       const auto* objectBorderBox =
           objectProperties->localBorderBoxProperties();
       if (originalBorderBox && objectBorderBox) {
-        DCHECK(originalBorderBox->paintOffset == objectBorderBox->paintOffset)
-            << "Border box paint offset was updated without the layout object ("
-            << m_object.debugName() << ") needing a paint property update.";
+        DCHECK_OBJECT_PROPERTY_EQ(m_object, &originalBorderBox->paintOffset,
+                                  &objectBorderBox->paintOffset);
         DCHECK_OBJECT_PROPERTY_EQ(
             m_object, originalBorderBox->propertyTreeState.transform(),
             objectBorderBox->propertyTreeState.transform());
         DCHECK_OBJECT_PROPERTY_EQ(m_object,
                                   originalBorderBox->propertyTreeState.clip(),
                                   objectBorderBox->propertyTreeState.clip());
         DCHECK_OBJECT_PROPERTY_EQ(m_object,
                                   originalBorderBox->propertyTreeState.effect(),
                                   objectBorderBox->propertyTreeState.effect());
         DCHECK_OBJECT_PROPERTY_EQ(m_object,
@@ skipping 13 matching lines @@
   const LayoutObject& m_object;
   bool m_neededPaintPropertyUpdate;
   bool m_neededForcedSubtreeUpdate;
   std::unique_ptr<const ObjectPaintProperties> m_originalProperties;
 };
 
 }  // namespace blink
 #endif  // DCHECK_IS_ON()
 
 #endif  // FindPropertiesNeedingUpdate_h