Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: Source/WebCore/inspector/InspectorTimelineAgent.cpp

Issue 8021012: Merge 95410 - Web Inspector: didMarkDOMContentEvent() should send event of MarkDOMContent type. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/inspector/timeline/timeline-test.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 appendRecord(TimelineRecordFactory::createResourceFinishData(IdentifiersFact ory::requestId(identifier), didFail, finishTime * 1000), TimelineRecordType::Res ourceFinish); 324 appendRecord(TimelineRecordFactory::createResourceFinishData(IdentifiersFact ory::requestId(identifier), didFail, finishTime * 1000), TimelineRecordType::Res ourceFinish);
325 } 325 }
326 326
327 void InspectorTimelineAgent::didTimeStamp(const String& message) 327 void InspectorTimelineAgent::didTimeStamp(const String& message)
328 { 328 {
329 appendRecord(TimelineRecordFactory::createTimeStampData(message), TimelineRe cordType::TimeStamp); 329 appendRecord(TimelineRecordFactory::createTimeStampData(message), TimelineRe cordType::TimeStamp);
330 } 330 }
331 331
332 void InspectorTimelineAgent::didMarkDOMContentEvent() 332 void InspectorTimelineAgent::didMarkDOMContentEvent()
333 { 333 {
334 appendRecord(InspectorObject::create(), TimelineRecordType::TimeStamp); 334 appendRecord(InspectorObject::create(), TimelineRecordType::MarkDOMContent);
335 } 335 }
336 336
337 void InspectorTimelineAgent::didMarkLoadEvent() 337 void InspectorTimelineAgent::didMarkLoadEvent()
338 { 338 {
339 appendRecord(InspectorObject::create(), TimelineRecordType::MarkLoad); 339 appendRecord(InspectorObject::create(), TimelineRecordType::MarkLoad);
340 } 340 }
341 341
342 void InspectorTimelineAgent::didCommitLoad() 342 void InspectorTimelineAgent::didCommitLoad()
343 { 343 {
344 clearRecordStack(); 344 clearRecordStack();
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 410
411 void InspectorTimelineAgent::clearRecordStack() 411 void InspectorTimelineAgent::clearRecordStack()
412 { 412 {
413 m_recordStack.clear(); 413 m_recordStack.clear();
414 m_id++; 414 m_id++;
415 } 415 }
416 416
417 } // namespace WebCore 417 } // namespace WebCore
418 418
419 #endif // ENABLE(INSPECTOR) 419 #endif // ENABLE(INSPECTOR)
OLDNEW
« no previous file with comments | « LayoutTests/inspector/timeline/timeline-test.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698