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

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

Issue 18344005: DevTools: expose setLayerTreeId() so we can relate events from LayerTreeHost (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed another regression Created 7 years, 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 , m_memoryAgent(memoryAgent) 739 , m_memoryAgent(memoryAgent)
740 , m_domAgent(domAgent) 740 , m_domAgent(domAgent)
741 , m_frontend(0) 741 , m_frontend(0)
742 , m_id(1) 742 , m_id(1)
743 , m_maxCallStackDepth(5) 743 , m_maxCallStackDepth(5)
744 , m_platformInstrumentationClientInstalledAtStackDepth(0) 744 , m_platformInstrumentationClientInstalledAtStackDepth(0)
745 , m_inspectorType(type) 745 , m_inspectorType(type)
746 , m_client(client) 746 , m_client(client)
747 , m_weakFactory(this) 747 , m_weakFactory(this)
748 , m_styleRecalcElementCounter(0) 748 , m_styleRecalcElementCounter(0)
749 , m_layerTreeId(0)
749 { 750 {
750 } 751 }
751 752
752 void InspectorTimelineAgent::appendRecord(PassRefPtr<JSONObject> data, const Str ing& type, bool captureCallStack, Frame* frame) 753 void InspectorTimelineAgent::appendRecord(PassRefPtr<JSONObject> data, const Str ing& type, bool captureCallStack, Frame* frame)
753 { 754 {
754 pushGCEventRecords(); 755 pushGCEventRecords();
755 RefPtr<JSONObject> record = TimelineRecordFactory::createGenericRecord(times tamp(), captureCallStack ? m_maxCallStackDepth : 0, type); 756 RefPtr<JSONObject> record = TimelineRecordFactory::createGenericRecord(times tamp(), captureCallStack ? m_maxCallStackDepth : 0, type);
756 record->setObject("data", data); 757 record->setObject("data", data);
757 setFrameIdentifier(record.get(), frame); 758 setFrameIdentifier(record.get(), frame);
758 addRecordToTimeline(record.release()); 759 addRecordToTimeline(record.release());
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 return m_timeConverter.fromMonotonicallyIncreasingTime(WTF::monotonicallyInc reasingTime()); 827 return m_timeConverter.fromMonotonicallyIncreasingTime(WTF::monotonicallyInc reasingTime());
827 } 828 }
828 829
829 Page* InspectorTimelineAgent::page() 830 Page* InspectorTimelineAgent::page()
830 { 831 {
831 return m_pageAgent ? m_pageAgent->page() : 0; 832 return m_pageAgent ? m_pageAgent->page() : 0;
832 } 833 }
833 834
834 } // namespace WebCore 835 } // namespace WebCore
835 836
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorTimelineAgent.h ('k') | Source/core/inspector/TimelineTraceEventProcessor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698