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

Side by Side Diff: Source/core/frame/ConsoleBase.cpp

Issue 750983003: DevTools: remove Console.setTracingBasedTimeline call from startup. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: review comments addressed Created 6 years 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) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 InspectorInstrumentation::consoleTimeStamp(context(), title); 182 InspectorInstrumentation::consoleTimeStamp(context(), title);
183 } 183 }
184 184
185 static String formatTimelineTitle(const String& title) 185 static String formatTimelineTitle(const String& title)
186 { 186 {
187 return String::format("Timeline '%s'", title.utf8().data()); 187 return String::format("Timeline '%s'", title.utf8().data());
188 } 188 }
189 189
190 void ConsoleBase::timeline(ScriptState* scriptState, const String& title) 190 void ConsoleBase::timeline(ScriptState* scriptState, const String& title)
191 { 191 {
192 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli ne migrates to tracing.
193 InspectorInstrumentation::consoleTimeline(context(), title, scriptState);
194
195 TRACE_EVENT_COPY_ASYNC_BEGIN0("blink.console", formatTimelineTitle(title).ut f8().data(), this); 192 TRACE_EVENT_COPY_ASYNC_BEGIN0("blink.console", formatTimelineTitle(title).ut f8().data(), this);
196 } 193 }
197 194
198 void ConsoleBase::timelineEnd(ScriptState* scriptState, const String& title) 195 void ConsoleBase::timelineEnd(ScriptState* scriptState, const String& title)
199 { 196 {
200 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli ne migrates to tracing.
201 InspectorInstrumentation::consoleTimelineEnd(context(), title, scriptState);
202
203 TRACE_EVENT_COPY_ASYNC_END0("blink.console", formatTimelineTitle(title).utf8 ().data(), this); 197 TRACE_EVENT_COPY_ASYNC_END0("blink.console", formatTimelineTitle(title).utf8 ().data(), this);
204 } 198 }
205 199
206 void ConsoleBase::group(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptA rguments> arguments) 200 void ConsoleBase::group(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptA rguments> arguments)
207 { 201 {
208 internalAddMessage(StartGroupMessageType, LogMessageLevel, scriptState, argu ments, true); 202 internalAddMessage(StartGroupMessageType, LogMessageLevel, scriptState, argu ments, true);
209 } 203 }
210 204
211 void ConsoleBase::groupCollapsed(ScriptState* scriptState, PassRefPtrWillBeRawPt r<ScriptArguments> arguments) 205 void ConsoleBase::groupCollapsed(ScriptState* scriptState, PassRefPtrWillBeRawPt r<ScriptArguments> arguments)
212 { 206 {
(...skipping 18 matching lines...) Expand all
231 consoleMessage->setType(type); 225 consoleMessage->setType(type);
232 consoleMessage->setScriptState(scriptState); 226 consoleMessage->setScriptState(scriptState);
233 consoleMessage->setScriptArguments(arguments); 227 consoleMessage->setScriptArguments(arguments);
234 228
235 size_t stackSize = printTrace ? ScriptCallStack::maxCallStackSizeToCapture : 1; 229 size_t stackSize = printTrace ? ScriptCallStack::maxCallStackSizeToCapture : 1;
236 consoleMessage->setCallStack(createScriptCallStackForConsole(stackSize)); 230 consoleMessage->setCallStack(createScriptCallStackForConsole(stackSize));
237 reportMessageToConsole(consoleMessage.release()); 231 reportMessageToConsole(consoleMessage.release());
238 } 232 }
239 233
240 } // namespace blink 234 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/inspector/inspector-backend-commands-expected.txt ('k') | Source/core/inspector/InspectorConsoleAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698