Emit CommitFrame and BeginFrame for impl-side frames

Source/core/inspector/InspectorTimelineAgent.h

 /*
 * Copyright (C) 2012 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 63 matching lines @@
 class RenderObject;
 class ResourceError;
 class ResourceLoader;
 class ResourceRequest;
 class ResourceResponse;
 class ScriptArguments;
 class ScriptCallStack;
 class TimelineRecordStack;
 class ExecutionContext;
 class ScriptState;
-class TimelineTraceEventProcessor;
 class WebSocketHandshakeRequest;
 class WebSocketHandshakeResponse;
 class XMLHttpRequest;
 
 typedef String ErrorString;
 
 namespace TimelineRecordType {
+extern const char ActivateLayerTree[];
+extern const char BeginFrame[];
 extern const char DecodeImage[];
+extern const char GPUTask[];
+extern const char PaintSetup[];
 extern const char Rasterize[];
-extern const char PaintSetup[];
-extern const char GPUTask[];
 };
 
 class TimelineTimeConverter {
 public:
     TimelineTimeConverter()
         : m_startOffset(0)
     {
     }
     double fromMonotonicallyIncreasingTime(double time) const  { return (time - m_startOffset) * 1000.0; }
     void reset();
@@ skipping 34 matching lines @@
     virtual void setFrontend(InspectorFrontend*);
     virtual void clearFrontend();
     virtual void restore();
 
     virtual void enable(ErrorString*);
     virtual void disable(ErrorString*);
     virtual void start(ErrorString*, const int* maxCallStackDepth, const bool* bufferEvents, const bool* includeDomCounters, const bool* includeGPUEvents);
     virtual void stop(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Timeline::TimelineEvent> >& events);
 
     void setLayerTreeId(int layerTreeId) { m_layerTreeId = layerTreeId; }
-    int layerTreeId() const { return m_layerTreeId; }
     int id() const { return m_id; }
 
     void didCommitLoad();
 
     // Methods called from WebCore.
     bool willCallFunction(ExecutionContext*, const String& scriptName, int scriptLine);
     void didCallFunction();
 
     bool willDispatchEvent(Document* document, const Event& event, DOMWindow* window, Node* node, const EventPath& eventPath);
     bool willDispatchEventOnWindow(const Event& event, DOMWindow* window);
@@ skipping 85 matching lines @@
     virtual void willResizeImage(bool shouldCache) OVERRIDE;
     virtual void didResizeImage() OVERRIDE;
 
 private:
 
     friend class TimelineRecordStack;
 
     InspectorTimelineAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorMemoryAgent*, InspectorDOMAgent*, InspectorOverlay*, InspectorCompositeState*, InspectorType, InspectorClient*);
 
     // Trace event handlers
+    void onBeginImplSideFrame(const TraceEventDispatcher::TraceEvent&);
     void onPaintSetupBegin(const TraceEventDispatcher::TraceEvent&);
     void onPaintSetupEnd(const TraceEventDispatcher::TraceEvent&);
     void onRasterTaskBegin(const TraceEventDispatcher::TraceEvent&);
     void onRasterTaskEnd(const TraceEventDispatcher::TraceEvent&);
     void onImageDecodeBegin(const TraceEventDispatcher::TraceEvent&);
     void onImageDecodeEnd(const TraceEventDispatcher::TraceEvent&);
     void onLayerDeleted(const TraceEventDispatcher::TraceEvent&);
     void onDrawLazyPixelRef(const TraceEventDispatcher::TraceEvent&);
     void onDecodeLazyPixelRefBegin(const TraceEventDispatcher::TraceEvent&);
     void onDecodeLazyPixelRefEnd(const TraceEventDispatcher::TraceEvent&);
+    void onActivateLayerTree(const TraceEventDispatcher::TraceEvent&);
     void onLazyPixelRefDeleted(const TraceEventDispatcher::TraceEvent&);
 
     void didFinishLoadingResource(unsigned long, bool didFail, double finishTime, Frame*);
 
     void sendEvent(PassRefPtr<JSONObject>);
     void appendRecord(PassRefPtr<JSONObject> data, const String& type, bool captureCallStack, Frame*);
     void pushCurrentRecord(PassRefPtr<JSONObject>, const String& type, bool captureCallStack, Frame*, bool hasLowLevelDetails = false);
     TimelineThreadState& threadState(ThreadIdentifier);
 
     void setDOMCounters(TypeBuilder::Timeline::TimelineEvent*);
     void setFrameIdentifier(JSONObject* record, Frame*);
     void populateImageDetails(JSONObject* data, const RenderImage&);
 
     void pushGCEventRecords();
 
     void didCompleteCurrentRecord(const String& type);
     void unwindRecordStack();
 
     void commitFrameRecord();
 
     void addRecordToTimeline(PassRefPtr<JSONObject>);
     void innerAddRecordToTimeline(PassRefPtr<JSONObject>);
     void clearRecordStack();
+    PassRefPtr<JSONObject> createRecordForEvent(const TraceEventDispatcher::TraceEvent&, const String& type, PassRefPtr<JSONObject> data = 0);
 
     void localToPageQuad(const RenderObject& renderer, const LayoutRect&, FloatQuad*);
     long long nodeId(Node*);
     long long nodeId(RenderObject*);
     void releaseNodeIds();
 
     double timestamp();
     Page* page();
 
     bool isStarted();
     void innerStart();
     void innerStop(bool fromConsole);
 
     InspectorPageAgent* m_pageAgent;
     InspectorMemoryAgent* m_memoryAgent;
     InspectorDOMAgent* m_domAgent;
     InspectorFrontend::Timeline* m_frontend;
     InspectorClient* m_client;
     InspectorOverlay* m_overlay;
     InspectorType m_inspectorType;
 
     int m_id;
-    int m_layerTreeId;
+    unsigned long long m_layerTreeId;
 
     TimelineTimeConverter m_timeConverter;
     int m_maxCallStackDepth;
 
     Vector<TimelineRecordEntry> m_recordStack;
     RefPtr<TypeBuilder::Array<TypeBuilder::Timeline::TimelineEvent> > m_bufferedEvents;
     Vector<String> m_consoleTimelines;
 
     typedef Vector<TimelineGCEvent> GCEvents;
     GCEvents m_gcEvents;
     unsigned m_platformInstrumentationClientInstalledAtStackDepth;
     RefPtr<JSONObject> m_pendingFrameRecord;
     RefPtr<JSONObject> m_pendingGPURecord;
     typedef HashMap<unsigned long long, TimelineImageInfo> PixelRefToImageInfoMap;
     PixelRefToImageInfoMap m_pixelRefToImageInfo;
     RenderImage* m_imageBeingPainted;
     HashMap<unsigned long long, long long> m_layerToNodeMap;
     double m_paintSetupStart;
     double m_paintSetupEnd;
     RefPtr<JSONObject> m_gpuTask;
     unsigned m_styleRecalcElementCounter;
     typedef HashMap<ThreadIdentifier, TimelineThreadState> ThreadStateMap;
     ThreadStateMap m_threadStates;
 };
 
 } // namespace WebCore
 
 #endif // !defined(InspectorTimelineAgent_h)