Changeset 57387 in webkit

Timestamp:

Apr 9, 2010 5:41:37 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-09 Jaime Yap <​jaimeyap@google.com>

Reviewed by Pavel Feldman.

Web Inspector: Fixes "wrong parent" for GCEvents that come at the end of a
timeline record node.
​https://bugs.webkit.org/show_bug.cgi?id=37340

• inspector/InspectorTimelineAgent.cpp: (WebCore::InspectorTimelineAgent::didInstallTimer): (WebCore::InspectorTimelineAgent::didRemoveTimer): (WebCore::InspectorTimelineAgent::didMarkTimeline): (WebCore::InspectorTimelineAgent::didMarkDOMContentEvent): (WebCore::InspectorTimelineAgent::didMarkLoadEvent): (WebCore::InspectorTimelineAgent::addRecordToTimeline): (WebCore::InspectorTimelineAgent::didCompleteCurrentRecord):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorTimelineAgent.cpp (modified) (7 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-09  Jaime Yap  <jaimeyap@google.com>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Fixes "wrong parent" for GCEvents that come at the end of a
+        timeline record node.
+        https://bugs.webkit.org/show_bug.cgi?id=37340
+
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::didInstallTimer):
+        (WebCore::InspectorTimelineAgent::didRemoveTimer):
+        (WebCore::InspectorTimelineAgent::didMarkTimeline):
+        (WebCore::InspectorTimelineAgent::didMarkDOMContentEvent):
+        (WebCore::InspectorTimelineAgent::didMarkLoadEvent):
+        (WebCore::InspectorTimelineAgent::addRecordToTimeline):
+        (WebCore::InspectorTimelineAgent::didCompleteCurrentRecord):
+
 2010-04-09  Abhishek Arya  <inferno@chromium.org>
 

trunk/WebCore/inspector/InspectorTimelineAgent.cpp

@@ -145 +145 @@
 void InspectorTimelineAgent::didInstallTimer(int timerId, int timeout, bool singleShot)
 {
+    pushGCEventRecords();
     ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, WTF::currentTimeMS());
     record.set("data", TimelineRecordFactory::createTimerInstallData(m_frontend, timerId, timeout, singleShot));
@@ -152 +153 @@
 void InspectorTimelineAgent::didRemoveTimer(int timerId)
 {
+    pushGCEventRecords();
     ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, WTF::currentTimeMS());
     record.set("data", TimelineRecordFactory::createGenericTimerData(m_frontend, timerId));
@@ -240 +242 @@
 void InspectorTimelineAgent::didMarkTimeline(const String& message)
 {
+    pushGCEventRecords();
     ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, WTF::currentTimeMS());
     record.set("data", TimelineRecordFactory::createMarkTimelineData(m_frontend, message));
@@ -247 +250 @@
 void InspectorTimelineAgent::didMarkDOMContentEvent()
 {
+    pushGCEventRecords();
     ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, WTF::currentTimeMS());
     addRecordToTimeline(record, MarkDOMContentEventType);
@@ -253 +257 @@
 void InspectorTimelineAgent::didMarkLoadEvent()
 {
+    pushGCEventRecords();
     ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, WTF::currentTimeMS());
     addRecordToTimeline(record, MarkLoadEventType);
@@ -270 +275 @@
 
 void InspectorTimelineAgent::addRecordToTimeline(ScriptObject record, TimelineRecordType type)
-{  
-    if (type != GCEventTimelineRecordType)
-        pushGCEventRecords();
+{
     record.set("type", type);
     setHeapSizeStatistic(record);
@@ -297 +300 @@
     // an event.  Don't treat as an error.
     if (!m_recordStack.isEmpty()) {
+        pushGCEventRecords();
         TimelineRecordEntry entry = m_recordStack.last();
         m_recordStack.removeLast();