Fix GraphicsLayer traversal in SimCompositor

third_party/WebKit/Source/web/tests/sim/SimCompositor.cpp

 // Copyright 2015 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 "web/tests/sim/SimCompositor.h"
 
 #include "core/frame/FrameView.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
+#include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/graphics/ContentLayerDelegate.h"
+#include "platform/graphics/GraphicsLayer.h"
 #include "public/platform/WebRect.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/sim/SimDisplayItemList.h"
 #include "wtf/CurrentTime.h"
 
 namespace blink {
 
+/*
 static void paintLayers(PaintLayer& layer, SimDisplayItemList& displayList)

[Sami, 2016/09/07 14:48:43]

Probably meant to delete this completely?

[szager1, 2016/09/07 16:53:01]

Yep, done.

 {
     if (layer.isAllowedToQueryCompositingState() && layer.compositingState() == PaintsIntoOwnBacking) {
         CompositedLayerMapping* mapping = layer.compositedLayerMapping();
         GraphicsLayer* graphicsLayer = mapping->mainGraphicsLayer();
         if (graphicsLayer->hasTrackedPaintInvalidations()) {
             ContentLayerDelegate* delegate = graphicsLayer->contentLayerDelegateForTesting();
             delegate->paintContents(&displayList);
             graphicsLayer->resetTrackedPaintInvalidations();
         }
     }
     for (PaintLayer* child = layer.firstChild(); child; child = child->nextSibling())
         paintLayers(*child, displayList);
 }
+*/
+
+static void paintLayers(GraphicsLayer& layer, SimDisplayItemList& displayList)
+{
+    if (layer.drawsContent() && layer.hasTrackedPaintInvalidations()) {
+        ContentLayerDelegate* delegate = layer.contentLayerDelegateForTesting();
+        delegate->paintContents(&displayList);
+        layer.resetTrackedPaintInvalidations();
+    }
+
+    if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {

[chrishtr, 2016/09/07 16:40:49]

I don't think you need this conditional.

[szager1, 2016/09/07 16:53:01]

Done.

+        if (GraphicsLayer* maskLayer = layer.maskLayer())
+            paintLayers(*maskLayer, displayList);
+        if (GraphicsLayer* contentsClippingMaskLayer = layer.contentsClippingMaskLayer())
+            paintLayers(*contentsClippingMaskLayer, displayList);
+        if (GraphicsLayer* replicaLayer = layer.replicaLayer())
+            paintLayers(*replicaLayer, displayList);
+    }
+
+    for (auto child : layer.children())
+        paintLayers(*child, displayList);
+}
 
 static void paintFrames(LocalFrame& root, SimDisplayItemList& displayList)
 {
-    for (Frame* frame = &root; frame; frame = frame->tree().traverseNext(&root)) {
-        if (!frame->isLocalFrame())
-            continue;
-        PaintLayer* layer = toLocalFrame(frame)->view()->layoutViewItem().layer();
-        paintLayers(*layer, displayList);
-    }
+    GraphicsLayer* layer = root.view()->layoutViewItem().compositor()->rootGraphicsLayer();
+    paintLayers(*layer, displayList);
 }
 
 SimCompositor::SimCompositor()
     : m_needsAnimate(false)
     , m_deferCommits(true)
     , m_hasSelection(false)
     , m_webViewImpl(0)
     , m_lastFrameTimeMonotonic(0)
 {
     FrameView::setInitialTracksPaintInvalidationsForTesting(true);
@@ skipping 44 matching lines @@
 
     LocalFrame* root = m_webViewImpl->mainFrameImpl()->frame();
 
     SimDisplayItemList displayList;
     paintFrames(*root, displayList);
 
     return displayList;
 }
 
 } // namespace blink