diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/inspector/InspectorTimelineAgent.h | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/inspector/InspectorTimelineAgent.h')
-rw-r--r-- | Source/WebCore/inspector/InspectorTimelineAgent.h | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/Source/WebCore/inspector/InspectorTimelineAgent.h b/Source/WebCore/inspector/InspectorTimelineAgent.h index c4c0f3b..3d8e973 100644 --- a/Source/WebCore/inspector/InspectorTimelineAgent.h +++ b/Source/WebCore/inspector/InspectorTimelineAgent.h @@ -51,31 +51,6 @@ class ResourceResponse; typedef String ErrorString; -// Must be kept in sync with TimelineAgent.js -enum TimelineRecordType { - EventDispatchTimelineRecordType = 0, - LayoutTimelineRecordType = 1, - RecalculateStylesTimelineRecordType = 2, - PaintTimelineRecordType = 3, - ParseHTMLTimelineRecordType = 4, - TimerInstallTimelineRecordType = 5, - TimerRemoveTimelineRecordType = 6, - TimerFireTimelineRecordType = 7, - XHRReadyStateChangeRecordType = 8, - XHRLoadRecordType = 9, - EvaluateScriptTimelineRecordType = 10, - MarkTimelineRecordType = 11, - ResourceSendRequestTimelineRecordType = 12, - ResourceReceiveResponseTimelineRecordType = 13, - ResourceFinishTimelineRecordType = 14, - FunctionCallTimelineRecordType = 15, - ReceiveResourceDataTimelineRecordType = 16, - GCEventTimelineRecordType = 17, - MarkDOMContentEventType = 18, - MarkLoadEventType = 19, - ScheduleResourceRequestTimelineRecordType = 20 -}; - class InspectorTimelineAgent : ScriptGCEventListener { WTF_MAKE_NONCOPYABLE(InspectorTimelineAgent); public: @@ -148,24 +123,24 @@ public: private: struct TimelineRecordEntry { - TimelineRecordEntry(PassRefPtr<InspectorObject> record, PassRefPtr<InspectorObject> data, PassRefPtr<InspectorArray> children, TimelineRecordType type) + TimelineRecordEntry(PassRefPtr<InspectorObject> record, PassRefPtr<InspectorObject> data, PassRefPtr<InspectorArray> children, const String& type) : record(record), data(data), children(children), type(type) { } RefPtr<InspectorObject> record; RefPtr<InspectorObject> data; RefPtr<InspectorArray> children; - TimelineRecordType type; + String type; }; InspectorTimelineAgent(InstrumentingAgents*, InspectorState*); - void pushCurrentRecord(PassRefPtr<InspectorObject>, TimelineRecordType); + void pushCurrentRecord(PassRefPtr<InspectorObject>, const String& type); void setHeapSizeStatistic(InspectorObject* record); - void didCompleteCurrentRecord(TimelineRecordType); + void didCompleteCurrentRecord(const String& type); - void addRecordToTimeline(PassRefPtr<InspectorObject>, TimelineRecordType); + void addRecordToTimeline(PassRefPtr<InspectorObject>, const String& type); void pushGCEventRecords(); void clearRecordStack(); |