Modified: trunk/Source/WebCore/ChangeLog (144745 => 144746)
--- trunk/Source/WebCore/ChangeLog 2013-03-05 10:38:48 UTC (rev 144745)
+++ trunk/Source/WebCore/ChangeLog 2013-03-05 10:53:38 UTC (rev 144746)
@@ -1,3 +1,20 @@
+2013-03-04 Andrey Kosyakov <ca...@chromium.org>
+
+ Web Inspector: use timestamps consistent with rest of Timeline in WebSocket events.
+ https://bugs.webkit.org/show_bug.cgi?id=111344
+
+ - create web socket related records in a manner consistent with the rest of timeline.
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didCreateWebSocket):
+ (WebCore::InspectorTimelineAgent::willSendWebSocketHandshakeRequest):
+ (WebCore::InspectorTimelineAgent::didReceiveWebSocketHandshakeResponse):
+ (WebCore::InspectorTimelineAgent::didDestroyWebSocket):
+ * inspector/InspectorTimelineAgent.h:
+ (InspectorTimelineAgent):
+
2013-03-05 Andrei Bucur <abu...@adobe.com>
[CSS Regions] Crash when MathML used in CSS Regions
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (144745 => 144746)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2013-03-05 10:38:48 UTC (rev 144745)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2013-03-05 10:53:38 UTC (rev 144746)
@@ -513,39 +513,22 @@
#if ENABLE(WEB_SOCKETS)
void InspectorTimelineAgent::didCreateWebSocket(unsigned long identifier, const KURL& url, const String& protocol, Frame* frame)
{
- pushGCEventRecords();
- RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(WTF::currentTimeMS(), m_maxCallStackDepth);
- record->setObject("data", TimelineRecordFactory::createWebSocketCreateData(identifier, url, protocol));
- String frameId;
- if (frame && m_pageAgent)
- frameId = m_pageAgent->frameId(frame);
- addRecordToTimeline(record.release(), TimelineRecordType::WebSocketCreate, frameId);
+ appendRecord(TimelineRecordFactory::createWebSocketCreateData(identifier, url, protocol), TimelineRecordType::WebSocketCreate, true, frame);
}
-void InspectorTimelineAgent::addWebSocketRecord(unsigned long identifier, Frame* frame, const String& type)
-{
- pushGCEventRecords();
- RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(WTF::currentTimeMS(), m_maxCallStackDepth);
- record->setObject("data", TimelineRecordFactory::createGenericWebSocketData(identifier));
- String frameId;
- if (frame && m_pageAgent)
- frameId = m_pageAgent->frameId(frame);
- addRecordToTimeline(record.release(), type, frameId);
-}
-
void InspectorTimelineAgent::willSendWebSocketHandshakeRequest(unsigned long identifier, Frame* frame)
{
- addWebSocketRecord(identifier, frame, TimelineRecordType::WebSocketSendHandshakeRequest);
+ appendRecord(TimelineRecordFactory::createGenericWebSocketData(identifier), TimelineRecordType::WebSocketSendHandshakeRequest, true, frame);
}
void InspectorTimelineAgent::didReceiveWebSocketHandshakeResponse(unsigned long identifier, Frame* frame)
{
- addWebSocketRecord(identifier, frame, TimelineRecordType::WebSocketReceiveHandshakeResponse);
+ appendRecord(TimelineRecordFactory::createGenericWebSocketData(identifier), TimelineRecordType::WebSocketReceiveHandshakeResponse, false, frame);
}
void InspectorTimelineAgent::didDestroyWebSocket(unsigned long identifier, Frame* frame)
{
- addWebSocketRecord(identifier, frame, TimelineRecordType::WebSocketDestroy);
+ appendRecord(TimelineRecordFactory::createGenericWebSocketData(identifier), TimelineRecordType::WebSocketDestroy, true, frame);
}
#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (144745 => 144746)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2013-03-05 10:38:48 UTC (rev 144745)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2013-03-05 10:53:38 UTC (rev 144746)
@@ -216,10 +216,6 @@
void innerAddRecordToTimeline(PassRefPtr<InspectorObject>, const String& type, const String& frameId);
void clearRecordStack();
-#if ENABLE(WEB_SOCKETS)
- void addWebSocketRecord(unsigned long, Frame*, const String&);
-#endif
-
double timestamp();
double timestampFromMicroseconds(double microseconds);
Page* page();
