DevTools: expose setLayerTreeId() so we can relate events from LayerTreeHost

Source/core/inspector/TimelineTraceEventProcessor.cpp

Index: Source/core/inspector/TimelineTraceEventProcessor.cpp
diff --git a/Source/core/inspector/TimelineTraceEventProcessor.cpp b/Source/core/inspector/TimelineTraceEventProcessor.cpp
index a2323e097981c6a61020adc7f4535729dd65ce71..6d0c6e42bd423ac47b3407101e9619743e70e388 100644
--- a/Source/core/inspector/TimelineTraceEventProcessor.cpp
+++ b/Source/core/inspector/TimelineTraceEventProcessor.cpp
@@ -152,15 +152,16 @@ TimelineTraceEventProcessor::TimelineTraceEventProcessor(WeakPtr<InspectorTimeli
     , m_timeConverter(timelineAgent.get()->timeConverter())
     , m_inspectorClient(client)
     , m_pageId(reinterpret_cast<unsigned long long>(m_timelineAgent.get()->page()))
+    , m_layerTreeId(m_timelineAgent.get()->layerTreeId())
     , m_layerId(0)
     , m_paintSetupStart(0)
     , m_paintSetupEnd(0)
 {
     registerHandler(InstrumentationEvents::BeginFrame, TracePhaseInstant, &TimelineTraceEventProcessor::onBeginFrame);
+    registerHandler(InstrumentationEvents::UpdateLayer, TracePhaseBegin, &TimelineTraceEventProcessor::onUpdateLayerBegin);
+    registerHandler(InstrumentationEvents::UpdateLayer, TracePhaseEnd, &TimelineTraceEventProcessor::onUpdateLayerEnd);
     registerHandler(InstrumentationEvents::PaintSetup, TracePhaseBegin, &TimelineTraceEventProcessor::onPaintSetupBegin);
     registerHandler(InstrumentationEvents::PaintSetup, TracePhaseEnd, &TimelineTraceEventProcessor::onPaintSetupEnd);
-    registerHandler(InstrumentationEvents::PaintLayer, TracePhaseBegin, &TimelineTraceEventProcessor::onPaintLayerBegin);
-    registerHandler(InstrumentationEvents::PaintLayer, TracePhaseEnd, &TimelineTraceEventProcessor::onPaintLayerEnd);
     registerHandler(InstrumentationEvents::RasterTask, TracePhaseBegin, &TimelineTraceEventProcessor::onRasterTaskBegin);
     registerHandler(InstrumentationEvents::RasterTask, TracePhaseEnd, &TimelineTraceEventProcessor::onRasterTaskEnd);
     registerHandler(InstrumentationEvents::ImageDecodeTask, TracePhaseBegin, &TimelineTraceEventProcessor::onImageDecodeTaskBegin);
@@ -169,6 +170,8 @@ TimelineTraceEventProcessor::TimelineTraceEventProcessor(WeakPtr<InspectorTimeli
     registerHandler(InstrumentationEvents::Paint, TracePhaseInstant, &TimelineTraceEventProcessor::onPaint);
     registerHandler(PlatformInstrumentation::ImageDecodeEvent, TracePhaseBegin, &TimelineTraceEventProcessor::onImageDecodeBegin);
     registerHandler(PlatformInstrumentation::ImageDecodeEvent, TracePhaseEnd, &TimelineTraceEventProcessor::onImageDecodeEnd);
+    registerHandler(PlatformInstrumentation::RasterizeCanvasEvent, TracePhaseBegin, &TimelineTraceEventProcessor::onRasterizeCanvasBegin);
+    registerHandler(PlatformInstrumentation::RasterizeCanvasEvent, TracePhaseEnd, &TimelineTraceEventProcessor::onRasterizeCanvasEnd);
 
     TraceEventDispatcher::instance()->addProcessor(this, m_inspectorClient);
 }
@@ -230,27 +233,33 @@ void TimelineTraceEventProcessor::onBeginFrame(const TraceEvent&)
     processBackgroundEvents();
 }
 
-void TimelineTraceEventProcessor::onPaintSetupBegin(const TraceEvent& event)
+void TimelineTraceEventProcessor::onUpdateLayerBegin(const TraceEvent& event)
 {
-    ASSERT(!m_paintSetupStart);
-    m_paintSetupStart = m_timeConverter.fromMonotonicallyIncreasingTime(event.timestamp());
+    unsigned long long layerTreeId = event.asUInt(InstrumentationEventArguments::LayerTreeId);
+    if (layerTreeId != m_layerTreeId)
+        return;
+    m_layerId = event.asUInt(InstrumentationEventArguments::LayerId);
+    // We don't know the node yet. For content layers, the node will be updated
+    // by paint. For others, let it remain 0 -- we just need the fact that
+    // the layer belongs to the page (see cookie check).
+    m_layerToNodeMap.add(m_layerId, 0);
 }
 
-void TimelineTraceEventProcessor::onPaintSetupEnd(const TraceEvent& event)
+void TimelineTraceEventProcessor::onUpdateLayerEnd(const TraceEvent& event)
 {
-    ASSERT(m_paintSetupStart);
-    m_paintSetupEnd = m_timeConverter.fromMonotonicallyIncreasingTime(event.timestamp());
+    m_layerId = 0;
 }
 
-void TimelineTraceEventProcessor::onPaintLayerBegin(const TraceEvent& event)
+void TimelineTraceEventProcessor::onPaintSetupBegin(const TraceEvent& event)
 {
-    m_layerId = event.asUInt(InstrumentationEventArguments::LayerId);
-    ASSERT(m_layerId);
+    ASSERT(!m_paintSetupStart);
+    m_paintSetupStart = m_timeConverter.fromMonotonicallyIncreasingTime(event.timestamp());
 }
 
-void TimelineTraceEventProcessor::onPaintLayerEnd(const TraceEvent&)
+void TimelineTraceEventProcessor::onPaintSetupEnd(const TraceEvent& event)
 {
-    m_layerId = 0;
+    ASSERT(m_paintSetupStart);
+    m_paintSetupEnd = m_timeConverter.fromMonotonicallyIncreasingTime(event.timestamp());
 }
 
 void TimelineTraceEventProcessor::onRasterTaskBegin(const TraceEvent& event)
@@ -329,11 +338,10 @@ void TimelineTraceEventProcessor::onPaint(const TraceEvent& event)
 {
     double paintSetupStart = m_paintSetupStart;
     m_paintSetupStart = 0;
-    if (!m_layerId)
-        return;
     unsigned long long pageId = event.asUInt(InstrumentationEventArguments::PageId);
     if (pageId != m_pageId)
         return;
+    ASSERT(m_layerId);
     long long nodeId = event.asInt(InstrumentationEventArguments::NodeId);
     ASSERT(nodeId);
     m_layerToNodeMap.set(m_layerId, nodeId);