Added showing slow scroll rectangles in Layers panel.

Source/core/inspector/InspectorLayerTreeAgent.cpp

 /*
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 92 matching lines @@
             transformArray->addItem(flattenedMatrix[i]);
         layerObject->setTransform(transformArray);
         const FloatPoint3D& anchor = graphicsLayer->anchorPoint();
         layerObject->setAnchorX(anchor.x());
         layerObject->setAnchorY(anchor.y());
         layerObject->setAnchorZ(anchor.z());
     }
     return layerObject;
 }
 
+static void addRegionObjects(const blink::WebVector<blink::WebRect>& regions,
+    TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect>& scrollRects,
+    const TypeBuilder::LayerTree::ScrollRect::Type::Enum& type,
+    const TypeBuilder::LayerTree::LayerId& layerId)
+{
+    for (size_t i = 0; i < regions.size(); ++i) {
+        RefPtr<TypeBuilder::LayerTree::ScrollRect> regionObject = TypeBuilder::LayerTree::ScrollRect::create()
+            .setLayerId(layerId)
+            .setX(regions[i].x)
+            .setY(regions[i].y)
+            .setHeight(regions[i].height)
+            .setWidth(regions[i].width)
+            .setType(type);
+        scrollRects.addItem(regionObject);
+    }
+}
+
+static void addScrollRectsForLayer(GraphicsLayer* graphicsLayer,
+    TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect>& scrollRects)
+{
+    blink::WebLayer* webLayer = graphicsLayer->platformLayer();
+    addRegionObjects(webLayer->nonFastScrollableRegion(),

[caseq, 2014/02/26 11:21:10]

nit: you don't have to wrap this call, we don't have line width limitations.

[malch, 2014/02/26 11:43:36]

Done.

+        scrollRects,
+        TypeBuilder::LayerTree::ScrollRect::Type::RepaintsOnScroll,
+        idForLayer(graphicsLayer));
+    addRegionObjects(webLayer->touchEventHandlerRegion(),

[caseq, 2014/02/26 11:21:10]

ditto.

[malch, 2014/02/26 11:43:36]

Done.

+        scrollRects,
+        TypeBuilder::LayerTree::ScrollRect::Type::TouchEventHandler,
+        idForLayer(graphicsLayer));
+    if (webLayer->haveWheelEventHandlers()) {
+        RefPtr<TypeBuilder::LayerTree::ScrollRect> regionObject = TypeBuilder::LayerTree::ScrollRect::create()
+            .setLayerId(idForLayer(graphicsLayer))
+            .setX(webLayer->position().x)
+            .setY(webLayer->position().y)
+            .setHeight(webLayer->bounds().height)
+            .setWidth(webLayer->bounds().width)
+            .setType(TypeBuilder::LayerTree::ScrollRect::Type::WheelEventHandler);
+        scrollRects.addItem(regionObject);
+    }
+}
+
 InspectorLayerTreeAgent::InspectorLayerTreeAgent(InspectorDOMAgent* domAgent, Page* page)
     : InspectorBaseAgent<InspectorLayerTreeAgent>("LayerTree")
     , m_frontend(0)
     , m_page(page)
     , m_domAgent(domAgent)
 {
 }
 
 InspectorLayerTreeAgent::~InspectorLayerTreeAgent()
 {
@@ skipping 24 matching lines @@
 }
 
 void InspectorLayerTreeAgent::disable(ErrorString*)
 {
     m_instrumentingAgents->setInspectorLayerTreeAgent(0);
     m_snapshotById.clear();
 }
 
 void InspectorLayerTreeAgent::layerTreeDidChange()
 {
-    m_frontend->layerTreeDidChange(buildLayerTree());
+    RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::Layer> > layers = TypeBuilder::Array<TypeBuilder::LayerTree::Layer>::create();
+    RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect> > scrollRects = TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect>::create();
+    if (buildLayerTree(*layers, *scrollRects))
+        m_frontend->layerTreeDidChange(layers, scrollRects);
+    else
+        m_frontend->layerTreeDidChange(nullptr, nullptr);
 }
 
 void InspectorLayerTreeAgent::didPaint(RenderObject*, const GraphicsLayer* graphicsLayer, GraphicsContext*, const LayoutRect& rect)
 {
     // Should only happen for FrameView paints when compositing is off. Consider different instrumentation method for that.
     if (!graphicsLayer)
         return;
 
     RefPtr<TypeBuilder::DOM::Rect> domRect = TypeBuilder::DOM::Rect::create()
         .setX(rect.x())
         .setY(rect.y())
         .setWidth(rect.width())
         .setHeight(rect.height());
     m_frontend->layerPainted(idForLayer(graphicsLayer), domRect.release());
 }
 
-PassRefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::Layer> > InspectorLayerTreeAgent::buildLayerTree()
+bool InspectorLayerTreeAgent::buildLayerTree(TypeBuilder::Array<TypeBuilder::LayerTree::Layer>& layers,
+    TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect>& scrollRects)
 {
     RenderLayerCompositor* compositor = renderLayerCompositor();
     if (!compositor || !compositor->inCompositingMode())
-        return nullptr;
+        return false;
     LayerIdToNodeIdMap layerIdToNodeIdMap;
-    RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::Layer> > layers = TypeBuilder::Array<TypeBuilder::LayerTree::Layer>::create();
     buildLayerIdToNodeIdMap(compositor->rootRenderLayer(), layerIdToNodeIdMap);
-    gatherGraphicsLayers(compositor->rootGraphicsLayer(), layerIdToNodeIdMap, layers);
-    return layers.release();
+    gatherGraphicsLayers(compositor->rootGraphicsLayer(), layerIdToNodeIdMap, layers, scrollRects);
+    return true;
 }
 
 void InspectorLayerTreeAgent::buildLayerIdToNodeIdMap(RenderLayer* root, LayerIdToNodeIdMap& layerIdToNodeIdMap)
 {
     if (root->hasCompositedLayerMapping()) {
         if (Node* node = root->renderer()->generatingNode()) {
             GraphicsLayer* graphicsLayer = root->compositedLayerMapping()->childForSuperlayers();
             layerIdToNodeIdMap.set(graphicsLayer->platformLayer()->id(), idForNode(node));
         }
     }
     for (RenderLayer* child = root->firstChild(); child; child = child->nextSibling())
         buildLayerIdToNodeIdMap(child, layerIdToNodeIdMap);
     if (!root->renderer()->isRenderIFrame())
         return;
     FrameView* childFrameView = toFrameView(toRenderWidget(root->renderer())->widget());
     if (RenderView* childRenderView = childFrameView->renderView()) {
         if (RenderLayerCompositor* childCompositor = childRenderView->compositor())
             buildLayerIdToNodeIdMap(childCompositor->rootRenderLayer(), layerIdToNodeIdMap);
     }
 }
 
-void InspectorLayerTreeAgent::gatherGraphicsLayers(GraphicsLayer* root, HashMap<int, int>& layerIdToNodeIdMap, RefPtr<TypeBuilder::Array<TypeBuilder::LayerTree::Layer> >& layers)
+void InspectorLayerTreeAgent::gatherGraphicsLayers(GraphicsLayer* root, HashMap<int, int>& layerIdToNodeIdMap,
+    TypeBuilder::Array<TypeBuilder::LayerTree::Layer>& layers, TypeBuilder::Array<TypeBuilder::LayerTree::ScrollRect>& scrollRects)
 {
     int layerId = root->platformLayer()->id();
     if (m_pageOverlayLayerIds.find(layerId) != WTF::kNotFound)
         return;
-    layers->addItem(buildObjectForLayer(root, layerIdToNodeIdMap.get(layerId)));
+    layers.addItem(buildObjectForLayer(root, layerIdToNodeIdMap.get(layerId)));
+    addScrollRectsForLayer(root, scrollRects);
     if (GraphicsLayer* replica = root->replicaLayer())
-        gatherGraphicsLayers(replica, layerIdToNodeIdMap, layers);
+        gatherGraphicsLayers(replica, layerIdToNodeIdMap, layers, scrollRects);
     for (size_t i = 0, size = root->children().size(); i < size; ++i)
-        gatherGraphicsLayers(root->children()[i], layerIdToNodeIdMap, layers);
+        gatherGraphicsLayers(root->children()[i], layerIdToNodeIdMap, layers, scrollRects);
 }
 
 int InspectorLayerTreeAgent::idForNode(Node* node)
 {
     int nodeId = m_domAgent->boundNodeId(node);
     if (!nodeId) {
         ErrorString ignoredError;
         nodeId = m_domAgent->pushNodeToFrontend(&ignoredError, m_domAgent->boundNodeId(&node->document()), node);
     }
     return nodeId;
@@ skipping 169 matching lines @@
 void InspectorLayerTreeAgent::didRemovePageOverlay(const GraphicsLayer* layer)
 {
     size_t index = m_pageOverlayLayerIds.find(layer->platformLayer()->id());
     if (index == WTF::kNotFound)
         return;
     m_pageOverlayLayerIds.remove(index);
 }
 
 
 } // namespace WebCore