| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Google Inc. All rights reserved. | 3 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1035 } | 1035 } |
| 1036 | 1036 |
| 1037 injectedScript.evaluateOnCallFrame(errorString, m_currentCallStack, asyncCal
lStacks, callFrameId, expression, objectGroup ? *objectGroup : "", asBool(includ
eCommandLineAPI), asBool(returnByValue), asBool(generatePreview), &result, wasTh
rown, &exceptionDetails); | 1037 injectedScript.evaluateOnCallFrame(errorString, m_currentCallStack, asyncCal
lStacks, callFrameId, expression, objectGroup ? *objectGroup : "", asBool(includ
eCommandLineAPI), asBool(returnByValue), asBool(generatePreview), &result, wasTh
rown, &exceptionDetails); |
| 1038 if (asBool(doNotPauseOnExceptionsAndMuteConsole)) { | 1038 if (asBool(doNotPauseOnExceptionsAndMuteConsole)) { |
| 1039 unmuteConsole(); | 1039 unmuteConsole(); |
| 1040 if (debugger().pauseOnExceptionsState() != previousPauseOnExceptionsStat
e) | 1040 if (debugger().pauseOnExceptionsState() != previousPauseOnExceptionsStat
e) |
| 1041 debugger().setPauseOnExceptionsState(previousPauseOnExceptionsState)
; | 1041 debugger().setPauseOnExceptionsState(previousPauseOnExceptionsState)
; |
| 1042 } | 1042 } |
| 1043 } | 1043 } |
| 1044 | 1044 |
| 1045 // CUSTOM METHODS FOR DART |
| 1046 void InspectorDebuggerAgent::getCompletionsOnCallFrame(ErrorString* errorString,
const String& callFrameId, const String& expression, RefPtr<TypeBuilder::Array<
String>>& result) |
| 1047 { |
| 1048 if (dartAgent() && DartInjectedScript::isDartObjectId(callFrameId)) { |
| 1049 dartAgent()->getCompletionsOnCallFrame(errorString, callFrameId, express
ion, result); |
| 1050 return; |
| 1051 } |
| 1052 *errorString = "This method is not supported for JavaScript"; |
| 1053 } |
| 1054 // END CUSTOM METHODS FOR DART |
| 1055 |
| 1045 void InspectorDebuggerAgent::compileScript(ErrorString* errorString, const Strin
g& expression, const String& sourceURL, bool persistScript, const int* execution
ContextId, TypeBuilder::OptOutput<ScriptId>* scriptId, RefPtr<ExceptionDetails>&
exceptionDetails) | 1056 void InspectorDebuggerAgent::compileScript(ErrorString* errorString, const Strin
g& expression, const String& sourceURL, bool persistScript, const int* execution
ContextId, TypeBuilder::OptOutput<ScriptId>* scriptId, RefPtr<ExceptionDetails>&
exceptionDetails) |
| 1046 { | 1057 { |
| 1047 // Intentionally not supported in Dart. | 1058 // Intentionally not supported in Dart. |
| 1048 if (!checkEnabled(errorString)) | 1059 if (!checkEnabled(errorString)) |
| 1049 return; | 1060 return; |
| 1050 InjectedScript injectedScript = injectedScriptForEval(errorString, execution
ContextId); | 1061 InjectedScript injectedScript = injectedScriptForEval(errorString, execution
ContextId); |
| 1051 if (injectedScript.isEmpty() || !injectedScript.scriptState()->contextIsVali
d()) { | 1062 if (injectedScript.isEmpty() || !injectedScript.scriptState()->contextIsVali
d()) { |
| 1052 *errorString = "Inspected frame has gone"; | 1063 *errorString = "Inspected frame has gone"; |
| 1053 return; | 1064 return; |
| 1054 } | 1065 } |
| (...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1874 RefPtr<ExceptionDetails> exceptionDetails = ExceptionDetails::create().setTe
xt(toCoreStringWithUndefinedOrNullCheck(message->Get())); | 1885 RefPtr<ExceptionDetails> exceptionDetails = ExceptionDetails::create().setTe
xt(toCoreStringWithUndefinedOrNullCheck(message->Get())); |
| 1875 exceptionDetails->setLine(message->GetLineNumber()); | 1886 exceptionDetails->setLine(message->GetLineNumber()); |
| 1876 exceptionDetails->setColumn(message->GetStartColumn()); | 1887 exceptionDetails->setColumn(message->GetStartColumn()); |
| 1877 v8::Local<v8::StackTrace> messageStackTrace = message->GetStackTrace(); | 1888 v8::Local<v8::StackTrace> messageStackTrace = message->GetStackTrace(); |
| 1878 if (!messageStackTrace.IsEmpty() && messageStackTrace->GetFrameCount() > 0) | 1889 if (!messageStackTrace.IsEmpty() && messageStackTrace->GetFrameCount() > 0) |
| 1879 exceptionDetails->setStackTrace(createScriptCallStack(isolate, messageSt
ackTrace, messageStackTrace->GetFrameCount())->buildInspectorArray()); | 1890 exceptionDetails->setStackTrace(createScriptCallStack(isolate, messageSt
ackTrace, messageStackTrace->GetFrameCount())->buildInspectorArray()); |
| 1880 return exceptionDetails.release(); | 1891 return exceptionDetails.release(); |
| 1881 } | 1892 } |
| 1882 | 1893 |
| 1883 } // namespace blink | 1894 } // namespace blink |
| OLD | NEW |