| Index: Source/bindings/core/dart/DartInspectorDebuggerAgent.cpp
|
| diff --git a/Source/bindings/core/dart/DartInspectorDebuggerAgent.cpp b/Source/bindings/core/dart/DartInspectorDebuggerAgent.cpp
|
| index 51f4522c3ef7a893cb506fa31b550e0f23a542f7..068625b7b55982d605e0d3db979ec93c65462689 100644
|
| --- a/Source/bindings/core/dart/DartInspectorDebuggerAgent.cpp
|
| +++ b/Source/bindings/core/dart/DartInspectorDebuggerAgent.cpp
|
| @@ -837,12 +837,12 @@ PassRefPtr<Array<CallFrame> > DartInspectorDebuggerAgent::currentCallFrames()
|
| return injectedScript->wrapCallFrames(m_currentCallStack, 0);
|
| }
|
|
|
| -String InspectorDebuggerAgent::sourceMapURLForScript(const Script& script, CompileResult compileResult)
|
| +String DartInspectorDebuggerAgent::sourceMapURLForScript(const Script& script, CompileResult compileResult)
|
| {
|
| bool hasSyntaxError = compileResult != CompileSuccess;
|
| if (!hasSyntaxError)
|
| - return script.sourceMappingURL();
|
| - return ContentSearchUtils::findSourceMapURL(script.source(), ContentSearchUtils::JavaScriptMagicComment);
|
| + return script.sourceMappingURL;
|
| + return ContentSearchUtils::findSourceMapURL(script.source, ContentSearchUtils::JavaScriptMagicComment);
|
| }
|
|
|
| // DartScriptDebugListener functions
|
| @@ -905,7 +905,7 @@ void DartInspectorDebuggerAgent::didParseSource(const String& scriptId, const Sc
|
| }
|
| }
|
|
|
| -DartScriptDebugListener::SkipPauseRequest DartInspectorDebuggerAgent::didPause(DartScriptState* scriptState, Dart_StackTrace callFrames, const ScriptValue& exception, const Vector<String>& hitBreakpoints)
|
| +DartScriptDebugListener::SkipPauseRequest DartInspectorDebuggerAgent::didPause(DartScriptState* scriptState, Dart_StackTrace callFrames, Dart_Handle exception, const Vector<String>& hitBreakpoints)
|
| {
|
| DartScriptDebugListener::SkipPauseRequest result;
|
| if (!callFrames)
|
| @@ -916,7 +916,7 @@ DartScriptDebugListener::SkipPauseRequest DartInspectorDebuggerAgent::didPause(D
|
| result = DartScriptDebugListener::Continue;
|
| else if (!hitBreakpoints.isEmpty())
|
| result = DartScriptDebugListener::NoSkip; // Don't skip explicit breakpoints even if set in frameworks.
|
| - else if (!exception.isEmpty())
|
| + else if (!exception)
|
| result = shouldSkipExceptionPause();
|
| else if (m_debuggerStepScheduled || m_pausingOnNativeEvent)
|
| result = shouldSkipStepPause();
|
| @@ -930,11 +930,11 @@ DartScriptDebugListener::SkipPauseRequest DartInspectorDebuggerAgent::didPause(D
|
| m_pausedScriptState = scriptState;
|
| m_currentCallStack = callFrames;
|
|
|
| - if (!exception.isEmpty()) {
|
| + if (exception) {
|
| DartInjectedScript* injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
|
| if (injectedScript) {
|
| m_breakReason = InspectorFrontend::Debugger::Reason::Exception;
|
| - m_breakAuxData = injectedScript->wrapObject(exception, DartInspectorDebuggerAgent::backtraceObjectGroup)->openAccessors();
|
| + m_breakAuxData = injectedScript->wrapDartObject(exception, DartInspectorDebuggerAgent::backtraceObjectGroup)->openAccessors();
|
| // m_breakAuxData might be null after this.
|
| }
|
| }
|
|
|