Timeline: do not rely on UpdateLayer & PaintLayer trace events

Source/core/inspector/InspectorTimelineAgent.cpp

 /*
 * 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.
 *     * Redistributions in binary form must reproduce the above
@@ skipping 439 matching lines @@
     TimelineRecordFactory::appendStyleRecalcDetails(entry.data.get(), m_styleRecalcElementCounter);
     m_styleRecalcElementCounter = 0;
     didCompleteCurrentRecord(TimelineRecordType::RecalculateStyles);
 }
 
 void InspectorTimelineAgent::didRecalculateStyleForElement()
 {
     ++m_styleRecalcElementCounter;
 }
 
-void InspectorTimelineAgent::willPaint(RenderObject* renderer)
+void InspectorTimelineAgent::willPaint(RenderObject* renderer, const GraphicsLayer* graphicsLayer)
 {
     Frame* frame = renderer->frame();
-    TRACE_EVENT_INSTANT2(InternalEventCategory, InstrumentationEvents::Paint,
-        InstrumentationEventArguments::PageId, reinterpret_cast<unsigned long long>(frame->page()),
-        InstrumentationEventArguments::NodeId, nodeId(renderer));
-
+    m_nodeBeingPainted = nodeId(renderer);
+    m_layerBeingPainted = graphicsLayer ? graphicsLayer->platformLayer()->id() : 0;
+    TRACE_EVENT_INSTANT1(InternalEventCategory, InstrumentationEvents::Paint,
+        InstrumentationEventArguments::PageId, reinterpret_cast<unsigned long long>(frame->page()));
     pushCurrentRecord(JSONObject::create(), TimelineRecordType::Paint, true, frame, true);
 }
 
 void InspectorTimelineAgent::didPaint(RenderObject* renderer, const GraphicsLayer* graphicsLayer, GraphicsContext*, const LayoutRect& clipRect)
 {
     TimelineRecordEntry& entry = m_recordStack.last();
     ASSERT(entry.type == TimelineRecordType::Paint);
     FloatQuad quad;
     localToPageQuad(*renderer, clipRect, &quad);
     int graphicsLayerId = graphicsLayer ? graphicsLayer->platformLayer()->id() : 0;
     entry.data = TimelineRecordFactory::createPaintData(quad, nodeId(renderer), graphicsLayerId);
+    m_nodeBeingPainted = 0;
+    m_layerBeingPainted = 0;
     didCompleteCurrentRecord(TimelineRecordType::Paint);
 }
 
 void InspectorTimelineAgent::willPaintImage(RenderImage* renderImage)
 {
     ASSERT(!m_imageBeingPainted);
     m_imageBeingPainted = renderImage;
 }
 
 void InspectorTimelineAgent::didPaintImage()
@@ skipping 409 matching lines @@
     , m_frontend(0)
     , m_id(1)
     , m_maxCallStackDepth(5)
     , m_platformInstrumentationClientInstalledAtStackDepth(0)
     , m_inspectorType(type)
     , m_client(client)
     , m_weakFactory(this)
     , m_styleRecalcElementCounter(0)
     , m_layerTreeId(0)
     , m_imageBeingPainted(0)
+    , m_nodeBeingPainted(0)
+    , m_layerBeingPainted(0)
     , m_overlay(overlay)
 {
 }
 
 void InspectorTimelineAgent::appendRecord(PassRefPtr<JSONObject> data, const String& type, bool captureCallStack, Frame* frame)
 {
     pushGCEventRecords();
     RefPtr<JSONObject> record = TimelineRecordFactory::createGenericRecord(timestamp(), captureCallStack ? m_maxCallStackDepth : 0, type);
     record->setObject("data", data);
     setFrameIdentifier(record.get(), frame);
@@ skipping 75 matching lines @@
     return m_timeConverter.fromMonotonicallyIncreasingTime(WTF::monotonicallyIncreasingTime());
 }
 
 Page* InspectorTimelineAgent::page()
 {
     return m_pageAgent ? m_pageAgent->page() : 0;
 }
 
 } // namespace WebCore