| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2011 Google Inc. All rights reserved. | 2 * Copyright (c) 2011 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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 ScriptDebugServer::clearCompiledScripts(); | 177 ScriptDebugServer::clearCompiledScripts(); |
| 178 m_compiledScriptURLs.clear(); | 178 m_compiledScriptURLs.clear(); |
| 179 } | 179 } |
| 180 | 180 |
| 181 void PageScriptDebugServer::runScript(ScriptState* scriptState, const String& sc
riptId, ScriptValue* result, bool* wasThrown, String* exceptionDetailsText, int*
lineNumber, int* columnNumber, RefPtr<ScriptCallStack>* stackTrace) | 181 void PageScriptDebugServer::runScript(ScriptState* scriptState, const String& sc
riptId, ScriptValue* result, bool* wasThrown, String* exceptionDetailsText, int*
lineNumber, int* columnNumber, RefPtr<ScriptCallStack>* stackTrace) |
| 182 { | 182 { |
| 183 String sourceURL = m_compiledScriptURLs.take(scriptId); | 183 String sourceURL = m_compiledScriptURLs.take(scriptId); |
| 184 | 184 |
| 185 ExecutionContext* executionContext = scriptState->executionContext(); | 185 ExecutionContext* executionContext = scriptState->executionContext(); |
| 186 LocalFrame* frame = executionContext->executingWindow()->frame(); | 186 LocalFrame* frame = executionContext->executingWindow()->frame(); |
| 187 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "EvaluateScript
", "data", InspectorEvaluateScriptEvent::data(frame, sourceURL, TextPosition::mi
nimumPosition().m_line.oneBasedInt())); | 187 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "EvaluateScript
", "data", InspectorEvaluateScriptEvent::data(sourceURL, TextPosition::minimumPo
sition().m_line.oneBasedInt())); |
| 188 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "
CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::current
CallStack()); | 188 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "
CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::current
CallStack()); |
| 189 | 189 |
| 190 RefPtr<LocalFrame> protect = frame; | 190 RefPtr<LocalFrame> protect = frame; |
| 191 ScriptDebugServer::runScript(scriptState, scriptId, result, wasThrown, excep
tionDetailsText, lineNumber, columnNumber, stackTrace); | 191 ScriptDebugServer::runScript(scriptState, scriptId, result, wasThrown, excep
tionDetailsText, lineNumber, columnNumber, stackTrace); |
| 192 | 192 |
| 193 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update
Counters", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorUpdateCountersEvent::data
()); | 193 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update
Counters", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorUpdateCountersEvent::data
()); |
| 194 } | 194 } |
| 195 | 195 |
| 196 ScriptDebugListener* PageScriptDebugServer::getDebugListenerForContext(v8::Handl
e<v8::Context> context) | 196 ScriptDebugListener* PageScriptDebugServer::getDebugListenerForContext(v8::Handl
e<v8::Context> context) |
| 197 { | 197 { |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 return source; | 293 return source; |
| 294 | 294 |
| 295 return m_scriptPreprocessor->preprocessSourceCode(source, url, functionName)
; | 295 return m_scriptPreprocessor->preprocessSourceCode(source, url, functionName)
; |
| 296 } | 296 } |
| 297 | 297 |
| 298 void PageScriptDebugServer::clearPreprocessor() | 298 void PageScriptDebugServer::clearPreprocessor() |
| 299 { | 299 { |
| 300 m_scriptPreprocessor.clear(); | 300 m_scriptPreprocessor.clear(); |
| 301 } | 301 } |
| 302 | 302 |
| 303 void PageScriptDebugServer::muteWarningsAndDeprecations() | |
| 304 { | |
| 305 FrameConsole::mute(); | |
| 306 // Used to mute UseCounter too. | |
| 307 } | |
| 308 | |
| 309 void PageScriptDebugServer::unmuteWarningsAndDeprecations() | |
| 310 { | |
| 311 FrameConsole::unmute(); | |
| 312 // Used to unmute UseCounter too. | |
| 313 } | |
| 314 | |
| 315 } // namespace blink | 303 } // namespace blink |
| OLD | NEW |