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/front-end/TimelineAgent.js | |
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/front-end/TimelineAgent.js')
-rw-r--r-- | Source/WebCore/inspector/front-end/TimelineAgent.js | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/Source/WebCore/inspector/front-end/TimelineAgent.js b/Source/WebCore/inspector/front-end/TimelineAgent.js index 97b8e42..5c5ca41 100644 --- a/Source/WebCore/inspector/front-end/TimelineAgent.js +++ b/Source/WebCore/inspector/front-end/TimelineAgent.js @@ -34,25 +34,30 @@ WebInspector.TimelineAgent = function() { // Must be kept in sync with TimelineItem.h WebInspector.TimelineAgent.RecordType = { - EventDispatch : 0, - Layout : 1, - RecalculateStyles : 2, - Paint : 3, - ParseHTML : 4, - TimerInstall : 5, - TimerRemove : 6, - TimerFire : 7, - XHRReadyStateChange : 8, - XHRLoad : 9, - EvaluateScript : 10, - MarkTimeline : 11, - ResourceSendRequest : 12, - ResourceReceiveResponse : 13, - ResourceFinish : 14, - FunctionCall : 15, - ResourceReceiveData: 16, - GCEvent : 17, - MarkDOMContentEventType : 18, - MarkLoadEventType : 19, - ScheduleResourceRequest : 20 + EventDispatch: "EventDispatch", + Layout: "Layout", + RecalculateStyles: "RecalculateStyles", + Paint: "Paint", + ParseHTML: "ParseHTML", + + TimerInstall: "TimerInstall", + TimerRemove: "TimerRemove", + TimerFire: "TimerFire", + + XHRReadyStateChange: "XHRReadyStateChange", + XHRLoad: "XHRLoad", + EvaluateScript: "EvaluateScript", + + MarkTimeline: "MarkTimeline", + MarkLoad: "MarkLoad", + MarkDOMContent: "MarkDOMContent", + + ScheduleResourceRequest: "ScheduleResourceRequest", + ResourceSendRequest: "ResourceSendRequest", + ResourceReceiveResponse: "ResourceReceiveResponse", + ResourceReceivedData: "ResourceReceivedData", + ResourceFinish: "ResourceFinish", + + FunctionCall: "FunctionCall", + GCEvent: "GCEvent" }; |