| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 m_v8DebuggerAgent->setBreakpointsActive(errorString, inActive); | 84 m_v8DebuggerAgent->setBreakpointsActive(errorString, inActive); |
| 85 } | 85 } |
| 86 | 86 |
| 87 void InspectorDebuggerAgent::setSkipAllPauses(ErrorString* errorString, bool inS
kipped) | 87 void InspectorDebuggerAgent::setSkipAllPauses(ErrorString* errorString, bool inS
kipped) |
| 88 { | 88 { |
| 89 m_v8DebuggerAgent->setSkipAllPauses(errorString, inSkipped); | 89 m_v8DebuggerAgent->setSkipAllPauses(errorString, inSkipped); |
| 90 } | 90 } |
| 91 | 91 |
| 92 void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString* errorString, | 92 void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString* errorString, |
| 93 int inLineNumber, | 93 int inLineNumber, |
| 94 const Maybe<String>& inUrl, | 94 const Maybe<String16>& inUrl, |
| 95 const Maybe<String>& inUrlRegex, | 95 const Maybe<String16>& inUrlRegex, |
| 96 const Maybe<int>& inColumnNumber, | 96 const Maybe<int>& inColumnNumber, |
| 97 const Maybe<String>& inCondition, | 97 const Maybe<String16>& inCondition, |
| 98 protocol::Debugger::BreakpointId* outBreakpointId, | 98 protocol::Debugger::BreakpointId* outBreakpointId, |
| 99 OwnPtr<Array<protocol::Debugger::Location>>* outLocations) | 99 OwnPtr<Array<protocol::Debugger::Location>>* outLocations) |
| 100 { | 100 { |
| 101 m_v8DebuggerAgent->setBreakpointByUrl(errorString, inLineNumber, inUrl, inUr
lRegex, inColumnNumber, inCondition, outBreakpointId, outLocations); | 101 m_v8DebuggerAgent->setBreakpointByUrl(errorString, inLineNumber, inUrl, inUr
lRegex, inColumnNumber, inCondition, outBreakpointId, outLocations); |
| 102 } | 102 } |
| 103 | 103 |
| 104 void InspectorDebuggerAgent::setBreakpoint(ErrorString* errorString, PassOwnPtr<
protocol::Debugger::Location> inLocation, | 104 void InspectorDebuggerAgent::setBreakpoint(ErrorString* errorString, PassOwnPtr<
protocol::Debugger::Location> inLocation, |
| 105 const Maybe<String>& inCondition, | 105 const Maybe<String16>& inCondition, |
| 106 protocol::Debugger::BreakpointId* outBreakpointId, | 106 protocol::Debugger::BreakpointId* outBreakpointId, |
| 107 OwnPtr<protocol::Debugger::Location>* outActualLocation) | 107 OwnPtr<protocol::Debugger::Location>* outActualLocation) |
| 108 { | 108 { |
| 109 m_v8DebuggerAgent->setBreakpoint(errorString, inLocation, inCondition, outBr
eakpointId, outActualLocation); | 109 m_v8DebuggerAgent->setBreakpoint(errorString, inLocation, inCondition, outBr
eakpointId, outActualLocation); |
| 110 } | 110 } |
| 111 | 111 |
| 112 void InspectorDebuggerAgent::removeBreakpoint(ErrorString* errorString, | 112 void InspectorDebuggerAgent::removeBreakpoint(ErrorString* errorString, |
| 113 const String& inBreakpointId) | 113 const String16& inBreakpointId) |
| 114 { | 114 { |
| 115 m_v8DebuggerAgent->removeBreakpoint(errorString, inBreakpointId); | 115 m_v8DebuggerAgent->removeBreakpoint(errorString, inBreakpointId); |
| 116 } | 116 } |
| 117 | 117 |
| 118 void InspectorDebuggerAgent::continueToLocation(ErrorString* errorString, | 118 void InspectorDebuggerAgent::continueToLocation(ErrorString* errorString, |
| 119 PassOwnPtr<protocol::Debugger::Location> inLocation, | 119 PassOwnPtr<protocol::Debugger::Location> inLocation, |
| 120 const Maybe<bool>& inInterstatementLocation) | 120 const Maybe<bool>& inInterstatementLocation) |
| 121 { | 121 { |
| 122 m_v8DebuggerAgent->continueToLocation(errorString, inLocation, inInterstatem
entLocation); | 122 m_v8DebuggerAgent->continueToLocation(errorString, inLocation, inInterstatem
entLocation); |
| 123 } | 123 } |
| (...skipping 22 matching lines...) Expand all Loading... |
| 146 { | 146 { |
| 147 m_v8DebuggerAgent->resume(errorString); | 147 m_v8DebuggerAgent->resume(errorString); |
| 148 } | 148 } |
| 149 | 149 |
| 150 void InspectorDebuggerAgent::stepIntoAsync(ErrorString* errorString) | 150 void InspectorDebuggerAgent::stepIntoAsync(ErrorString* errorString) |
| 151 { | 151 { |
| 152 m_v8DebuggerAgent->stepIntoAsync(errorString); | 152 m_v8DebuggerAgent->stepIntoAsync(errorString); |
| 153 } | 153 } |
| 154 | 154 |
| 155 void InspectorDebuggerAgent::searchInContent(ErrorString* errorString, | 155 void InspectorDebuggerAgent::searchInContent(ErrorString* errorString, |
| 156 const String& inScriptId, | 156 const String16& inScriptId, |
| 157 const String& inQuery, | 157 const String16& inQuery, |
| 158 const Maybe<bool>& inCaseSensitive, | 158 const Maybe<bool>& inCaseSensitive, |
| 159 const Maybe<bool>& inIsRegex, | 159 const Maybe<bool>& inIsRegex, |
| 160 OwnPtr<Array<protocol::Debugger::SearchMatch>>* outResult) | 160 OwnPtr<Array<protocol::Debugger::SearchMatch>>* outResult) |
| 161 { | 161 { |
| 162 m_v8DebuggerAgent->searchInContent(errorString, inScriptId, inQuery, inCaseS
ensitive, inIsRegex, outResult); | 162 m_v8DebuggerAgent->searchInContent(errorString, inScriptId, inQuery, inCaseS
ensitive, inIsRegex, outResult); |
| 163 } | 163 } |
| 164 | 164 |
| 165 void InspectorDebuggerAgent::canSetScriptSource(ErrorString* errorString, bool*
outResult) | 165 void InspectorDebuggerAgent::canSetScriptSource(ErrorString* errorString, bool*
outResult) |
| 166 { | 166 { |
| 167 m_v8DebuggerAgent->canSetScriptSource(errorString, outResult); | 167 m_v8DebuggerAgent->canSetScriptSource(errorString, outResult); |
| 168 } | 168 } |
| 169 | 169 |
| 170 void InspectorDebuggerAgent::setScriptSource(ErrorString* errorString, | 170 void InspectorDebuggerAgent::setScriptSource(ErrorString* errorString, |
| 171 const String& inScriptId, | 171 const String16& inScriptId, |
| 172 const String& inScriptSource, | 172 const String16& inScriptSource, |
| 173 const Maybe<bool>& inPreview, | 173 const Maybe<bool>& inPreview, |
| 174 Maybe<Array<protocol::Debugger::CallFrame>>* optOutCallFrames, | 174 Maybe<Array<protocol::Debugger::CallFrame>>* optOutCallFrames, |
| 175 Maybe<bool>* optOutStackChanged, | 175 Maybe<bool>* optOutStackChanged, |
| 176 Maybe<protocol::Runtime::StackTrace>* optOutAsyncStackTrace, | 176 Maybe<protocol::Runtime::StackTrace>* optOutAsyncStackTrace, |
| 177 Maybe<protocol::Debugger::SetScriptSourceError>* optOutCompileError) | 177 Maybe<protocol::Debugger::SetScriptSourceError>* optOutCompileError) |
| 178 { | 178 { |
| 179 m_v8DebuggerAgent->setScriptSource(errorString, inScriptId, inScriptSource,
inPreview, optOutCallFrames, optOutStackChanged, optOutAsyncStackTrace, optOutCo
mpileError); | 179 m_v8DebuggerAgent->setScriptSource(errorString, inScriptId, inScriptSource,
inPreview, optOutCallFrames, optOutStackChanged, optOutAsyncStackTrace, optOutCo
mpileError); |
| 180 } | 180 } |
| 181 | 181 |
| 182 void InspectorDebuggerAgent::restartFrame(ErrorString* errorString, | 182 void InspectorDebuggerAgent::restartFrame(ErrorString* errorString, |
| 183 const String& inCallFrameId, | 183 const String16& inCallFrameId, |
| 184 OwnPtr<Array<protocol::Debugger::CallFrame>>* outCallFrames, | 184 OwnPtr<Array<protocol::Debugger::CallFrame>>* outCallFrames, |
| 185 Maybe<protocol::Runtime::StackTrace>* optOutAsyncStackTrace) | 185 Maybe<protocol::Runtime::StackTrace>* optOutAsyncStackTrace) |
| 186 { | 186 { |
| 187 m_v8DebuggerAgent->restartFrame(errorString, inCallFrameId, outCallFrames, o
ptOutAsyncStackTrace); | 187 m_v8DebuggerAgent->restartFrame(errorString, inCallFrameId, outCallFrames, o
ptOutAsyncStackTrace); |
| 188 } | 188 } |
| 189 | 189 |
| 190 void InspectorDebuggerAgent::getScriptSource(ErrorString* errorString, | 190 void InspectorDebuggerAgent::getScriptSource(ErrorString* errorString, |
| 191 const String& inScriptId, | 191 const String16& inScriptId, |
| 192 String* outScriptSource) | 192 String16* outScriptSource) |
| 193 { | 193 { |
| 194 m_v8DebuggerAgent->getScriptSource(errorString, inScriptId, outScriptSource)
; | 194 m_v8DebuggerAgent->getScriptSource(errorString, inScriptId, outScriptSource)
; |
| 195 } | 195 } |
| 196 | 196 |
| 197 void InspectorDebuggerAgent::getFunctionDetails(ErrorString* errorString, | 197 void InspectorDebuggerAgent::getFunctionDetails(ErrorString* errorString, |
| 198 const String& inFunctionId, | 198 const String16& inFunctionId, |
| 199 OwnPtr<protocol::Debugger::FunctionDetails>* outDetails) | 199 OwnPtr<protocol::Debugger::FunctionDetails>* outDetails) |
| 200 { | 200 { |
| 201 m_v8DebuggerAgent->getFunctionDetails(errorString, inFunctionId, outDetails)
; | 201 m_v8DebuggerAgent->getFunctionDetails(errorString, inFunctionId, outDetails)
; |
| 202 } | 202 } |
| 203 | 203 |
| 204 void InspectorDebuggerAgent::getGeneratorObjectDetails(ErrorString* errorString, | 204 void InspectorDebuggerAgent::getGeneratorObjectDetails(ErrorString* errorString, |
| 205 const String& inObjectId, | 205 const String16& inObjectId, |
| 206 OwnPtr<protocol::Debugger::GeneratorObjectDetails>* outDetails) | 206 OwnPtr<protocol::Debugger::GeneratorObjectDetails>* outDetails) |
| 207 { | 207 { |
| 208 m_v8DebuggerAgent->getGeneratorObjectDetails(errorString, inObjectId, outDet
ails); | 208 m_v8DebuggerAgent->getGeneratorObjectDetails(errorString, inObjectId, outDet
ails); |
| 209 } | 209 } |
| 210 | 210 |
| 211 void InspectorDebuggerAgent::getCollectionEntries(ErrorString* errorString, | 211 void InspectorDebuggerAgent::getCollectionEntries(ErrorString* errorString, |
| 212 const String& inObjectId, | 212 const String16& inObjectId, |
| 213 OwnPtr<Array<protocol::Debugger::CollectionEntry>>* outEntries) | 213 OwnPtr<Array<protocol::Debugger::CollectionEntry>>* outEntries) |
| 214 { | 214 { |
| 215 m_v8DebuggerAgent->getCollectionEntries(errorString, inObjectId, outEntries)
; | 215 m_v8DebuggerAgent->getCollectionEntries(errorString, inObjectId, outEntries)
; |
| 216 } | 216 } |
| 217 | 217 |
| 218 void InspectorDebuggerAgent::setPauseOnExceptions(ErrorString* errorString, | 218 void InspectorDebuggerAgent::setPauseOnExceptions(ErrorString* errorString, |
| 219 const String& inState) | 219 const String16& inState) |
| 220 { | 220 { |
| 221 m_v8DebuggerAgent->setPauseOnExceptions(errorString, inState); | 221 m_v8DebuggerAgent->setPauseOnExceptions(errorString, inState); |
| 222 } | 222 } |
| 223 | 223 |
| 224 void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString* errorString, | 224 void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString* errorString, |
| 225 const String& inCallFrameId, | 225 const String16& inCallFrameId, |
| 226 const String& inExpression, | 226 const String16& inExpression, |
| 227 const Maybe<String>& inObjectGroup, | 227 const Maybe<String16>& inObjectGroup, |
| 228 const Maybe<bool>& inIncludeCommandLineAPI, | 228 const Maybe<bool>& inIncludeCommandLineAPI, |
| 229 const Maybe<bool>& inDoNotPauseOnExceptionsAndMuteConsole, | 229 const Maybe<bool>& inDoNotPauseOnExceptionsAndMuteConsole, |
| 230 const Maybe<bool>& inReturnByValue, | 230 const Maybe<bool>& inReturnByValue, |
| 231 const Maybe<bool>& inGeneratePreview, | 231 const Maybe<bool>& inGeneratePreview, |
| 232 OwnPtr<protocol::Runtime::RemoteObject>* outResult, | 232 OwnPtr<protocol::Runtime::RemoteObject>* outResult, |
| 233 Maybe<bool>* optOutWasThrown, | 233 Maybe<bool>* optOutWasThrown, |
| 234 Maybe<protocol::Runtime::ExceptionDetails>* optOutExceptionDetails) | 234 Maybe<protocol::Runtime::ExceptionDetails>* optOutExceptionDetails) |
| 235 { | 235 { |
| 236 MuteConsoleScope<InspectorDebuggerAgent> muteScope; | 236 MuteConsoleScope<InspectorDebuggerAgent> muteScope; |
| 237 if (inDoNotPauseOnExceptionsAndMuteConsole.fromMaybe(false)) | 237 if (inDoNotPauseOnExceptionsAndMuteConsole.fromMaybe(false)) |
| 238 muteScope.enter(this); | 238 muteScope.enter(this); |
| 239 m_v8DebuggerAgent->evaluateOnCallFrame(errorString, inCallFrameId, inExpress
ion, inObjectGroup, inIncludeCommandLineAPI, inDoNotPauseOnExceptionsAndMuteCons
ole, inReturnByValue, inGeneratePreview, outResult, optOutWasThrown, optOutExcep
tionDetails); | 239 m_v8DebuggerAgent->evaluateOnCallFrame(errorString, inCallFrameId, inExpress
ion, inObjectGroup, inIncludeCommandLineAPI, inDoNotPauseOnExceptionsAndMuteCons
ole, inReturnByValue, inGeneratePreview, outResult, optOutWasThrown, optOutExcep
tionDetails); |
| 240 } | 240 } |
| 241 | 241 |
| 242 void InspectorDebuggerAgent::setVariableValue(ErrorString* errorString, int inSc
opeNumber, | 242 void InspectorDebuggerAgent::setVariableValue(ErrorString* errorString, int inSc
opeNumber, |
| 243 const String& inVariableName, | 243 const String16& inVariableName, |
| 244 PassOwnPtr<protocol::Runtime::CallArgument> inNewValue, | 244 PassOwnPtr<protocol::Runtime::CallArgument> inNewValue, |
| 245 const Maybe<String>& inCallFrameId, | 245 const Maybe<String16>& inCallFrameId, |
| 246 const Maybe<String>& inFunctionObjectId) | 246 const Maybe<String16>& inFunctionObjectId) |
| 247 { | 247 { |
| 248 m_v8DebuggerAgent->setVariableValue(errorString, inScopeNumber, inVariableNa
me, inNewValue, inCallFrameId, inFunctionObjectId); | 248 m_v8DebuggerAgent->setVariableValue(errorString, inScopeNumber, inVariableNa
me, inNewValue, inCallFrameId, inFunctionObjectId); |
| 249 } | 249 } |
| 250 | 250 |
| 251 void InspectorDebuggerAgent::getStepInPositions(ErrorString* errorString, | 251 void InspectorDebuggerAgent::getStepInPositions(ErrorString* errorString, |
| 252 const String& inCallFrameId, | 252 const String16& inCallFrameId, |
| 253 Maybe<Array<protocol::Debugger::Location>>* optOutStepInPositions) | 253 Maybe<Array<protocol::Debugger::Location>>* optOutStepInPositions) |
| 254 { | 254 { |
| 255 m_v8DebuggerAgent->getStepInPositions(errorString, inCallFrameId, optOutStep
InPositions); | 255 m_v8DebuggerAgent->getStepInPositions(errorString, inCallFrameId, optOutStep
InPositions); |
| 256 } | 256 } |
| 257 | 257 |
| 258 void InspectorDebuggerAgent::getBacktrace(ErrorString* errorString, | 258 void InspectorDebuggerAgent::getBacktrace(ErrorString* errorString, |
| 259 OwnPtr<Array<protocol::Debugger::CallFrame>>* outCallFrames, | 259 OwnPtr<Array<protocol::Debugger::CallFrame>>* outCallFrames, |
| 260 Maybe<protocol::Runtime::StackTrace>* optOutAsyncStackTrace) | 260 Maybe<protocol::Runtime::StackTrace>* optOutAsyncStackTrace) |
| 261 { | 261 { |
| 262 m_v8DebuggerAgent->getBacktrace(errorString, outCallFrames, optOutAsyncStack
Trace); | 262 m_v8DebuggerAgent->getBacktrace(errorString, outCallFrames, optOutAsyncStack
Trace); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 275 } | 275 } |
| 276 | 276 |
| 277 void InspectorDebuggerAgent::disablePromiseTracker(ErrorString* errorString) | 277 void InspectorDebuggerAgent::disablePromiseTracker(ErrorString* errorString) |
| 278 { | 278 { |
| 279 m_v8DebuggerAgent->disablePromiseTracker(errorString); | 279 m_v8DebuggerAgent->disablePromiseTracker(errorString); |
| 280 } | 280 } |
| 281 | 281 |
| 282 void InspectorDebuggerAgent::getPromiseById( | 282 void InspectorDebuggerAgent::getPromiseById( |
| 283 ErrorString* errorString, | 283 ErrorString* errorString, |
| 284 int inPromiseId, | 284 int inPromiseId, |
| 285 const Maybe<String>& inObjectGroup, | 285 const Maybe<String16>& inObjectGroup, |
| 286 OwnPtr<protocol::Runtime::RemoteObject>* outPromise) | 286 OwnPtr<protocol::Runtime::RemoteObject>* outPromise) |
| 287 { | 287 { |
| 288 m_v8DebuggerAgent->getPromiseById(errorString, inPromiseId, inObjectGroup, o
utPromise); | 288 m_v8DebuggerAgent->getPromiseById(errorString, inPromiseId, inObjectGroup, o
utPromise); |
| 289 } | 289 } |
| 290 | 290 |
| 291 void InspectorDebuggerAgent::flushAsyncOperationEvents(ErrorString* errorString) | 291 void InspectorDebuggerAgent::flushAsyncOperationEvents(ErrorString* errorString) |
| 292 { | 292 { |
| 293 m_v8DebuggerAgent->flushAsyncOperationEvents(errorString); | 293 m_v8DebuggerAgent->flushAsyncOperationEvents(errorString); |
| 294 } | 294 } |
| 295 | 295 |
| 296 void InspectorDebuggerAgent::setAsyncOperationBreakpoint(ErrorString* errorStrin
g, int inOperationId) | 296 void InspectorDebuggerAgent::setAsyncOperationBreakpoint(ErrorString* errorStrin
g, int inOperationId) |
| 297 { | 297 { |
| 298 m_v8DebuggerAgent->setAsyncOperationBreakpoint(errorString, inOperationId); | 298 m_v8DebuggerAgent->setAsyncOperationBreakpoint(errorString, inOperationId); |
| 299 } | 299 } |
| 300 | 300 |
| 301 void InspectorDebuggerAgent::removeAsyncOperationBreakpoint(ErrorString* errorSt
ring, int inOperationId) | 301 void InspectorDebuggerAgent::removeAsyncOperationBreakpoint(ErrorString* errorSt
ring, int inOperationId) |
| 302 { | 302 { |
| 303 m_v8DebuggerAgent->removeAsyncOperationBreakpoint(errorString, inOperationId
); | 303 m_v8DebuggerAgent->removeAsyncOperationBreakpoint(errorString, inOperationId
); |
| 304 } | 304 } |
| 305 | 305 |
| 306 void InspectorDebuggerAgent::setBlackboxedRanges( | 306 void InspectorDebuggerAgent::setBlackboxedRanges( |
| 307 ErrorString* errorString, | 307 ErrorString* errorString, |
| 308 const String& inScriptId, | 308 const String16& inScriptId, |
| 309 PassOwnPtr<protocol::Array<protocol::Debugger::ScriptPosition>> inPositions) | 309 PassOwnPtr<protocol::Array<protocol::Debugger::ScriptPosition>> inPositions) |
| 310 { | 310 { |
| 311 m_v8DebuggerAgent->setBlackboxedRanges(errorString, inScriptId, inPositions)
; | 311 m_v8DebuggerAgent->setBlackboxedRanges(errorString, inScriptId, inPositions)
; |
| 312 } | 312 } |
| 313 | 313 |
| 314 bool InspectorDebuggerAgent::isPaused() | 314 bool InspectorDebuggerAgent::isPaused() |
| 315 { | 315 { |
| 316 return m_v8DebuggerAgent->isPaused(); | 316 return m_v8DebuggerAgent->isPaused(); |
| 317 } | 317 } |
| 318 | 318 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 } | 368 } |
| 369 | 369 |
| 370 void InspectorDebuggerAgent::setTrackingAsyncCalls(bool tracking) | 370 void InspectorDebuggerAgent::setTrackingAsyncCalls(bool tracking) |
| 371 { | 371 { |
| 372 m_asyncCallTracker->asyncCallTrackingStateChanged(tracking); | 372 m_asyncCallTracker->asyncCallTrackingStateChanged(tracking); |
| 373 if (!tracking) | 373 if (!tracking) |
| 374 m_asyncCallTracker->resetAsyncOperations(); | 374 m_asyncCallTracker->resetAsyncOperations(); |
| 375 } | 375 } |
| 376 | 376 |
| 377 } // namespace blink | 377 } // namespace blink |
| OLD | NEW |