PaintChunk::id

third_party/WebKit/Source/core/frame/FrameView.cpp

Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index dd43de21ee964dcb6b99e61db1c51629f77acefd..5eaad4d747d5ae0f1765a96d6a2779e74299579d 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -106,6 +106,7 @@
 #include "platform/graphics/GraphicsLayerDebugInfo.h"
 #include "platform/graphics/paint/CullRect.h"
 #include "platform/graphics/paint/PaintController.h"
+#include "platform/graphics/paint/ScopedPaintChunkProperties.h"
 #include "platform/scheduler/CancellableTaskFactory.h"
 #include "platform/scroll/ScrollAnimatorBase.h"
 #include "platform/scroll/ScrollbarTheme.h"
@@ -2643,16 +2644,15 @@ void FrameView::synchronizedPaintRecursively(GraphicsLayer* graphicsLayer)
         // Usually this is not needed because the PaintLayer will setup the chunk properties
         // altogether. However in debug builds the GraphicsLayer could paint debug background before
         // we ever reach the PaintLayer.
+        Optional<ScopedPaintChunkProperties> scopedPaintChunkProperties;
         if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
             PaintChunkProperties properties;
             properties.transform = m_rootTransform;
             properties.clip = m_rootClip;
             properties.effect = m_rootEffect;
-            graphicsLayer->getPaintController().updateCurrentPaintChunkProperties(properties);
+            scopedPaintChunkProperties.emplace(graphicsLayer->getPaintController(), *layoutView(), DisplayItem::DebugRedFill, properties);

[chrishtr, 2016/07/19 17:27:52]

It's weird that there is a reference to the debug red fill here, but it actually
appears two levels down in the call stack.

How about pushing the ScopedPaintChunkProperties down into
GraphicsLayer::paintWithoutCommit?

[Xianzhu, 2016/07/19 21:57:48]

This had been weird before this CL. To push this down we need to pass the
FrameView's paint properties to GraphicsLayer::paint().

Can we just remove the red debug fill? I vaguely remember we have similar
mechanism elsewhere (in cc? in blue or purple?).

[chrishtr, 2016/07/19 23:42:27]

In debug builds cc does indeed show a color underneath underpainted areas. I
agree, let's just remove it.

         }
         graphicsLayer->paint(nullptr);
-        if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
-            graphicsLayer->getPaintController().updateCurrentPaintChunkProperties(PaintChunkProperties());
     }
 
     if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {