| 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) 2010-2011 Google Inc. All rights reserved. | 3 * Copyright (C) 2010-2011 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 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 633 } | 633 } |
| 634 } else { | 634 } else { |
| 635 *errorString = "Either call frame or function object must be specified"; | 635 *errorString = "Either call frame or function object must be specified"; |
| 636 return; | 636 return; |
| 637 } | 637 } |
| 638 String newValueString = newValue->toJSONString(); | 638 String newValueString = newValue->toJSONString(); |
| 639 | 639 |
| 640 injectedScript.setVariableValue(errorString, m_currentCallStack, callFrameId
, functionObjectId, scopeNumber, variableName, newValueString); | 640 injectedScript.setVariableValue(errorString, m_currentCallStack, callFrameId
, functionObjectId, scopeNumber, variableName, newValueString); |
| 641 } | 641 } |
| 642 | 642 |
| 643 void InspectorDebuggerAgent::updateCallFrameScopes(ErrorString* error, const WTF
::String& callFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Scope> >
& scopeChain) |
| 644 { |
| 645 InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForOb
jectId(callFrameId); |
| 646 if (injectedScript.hasNoValue()) { |
| 647 *error = "Inspected frame has gone"; |
| 648 return; |
| 649 } |
| 650 injectedScript.getCallFrameScopes(error, m_currentCallStack, callFrameId, &s
copeChain); |
| 651 } |
| 652 |
| 643 void InspectorDebuggerAgent::scriptExecutionBlockedByCSP(const String& directive
Text) | 653 void InspectorDebuggerAgent::scriptExecutionBlockedByCSP(const String& directive
Text) |
| 644 { | 654 { |
| 645 if (scriptDebugServer().pauseOnExceptionsState() != ScriptDebugServer::DontP
auseOnExceptions) { | 655 if (scriptDebugServer().pauseOnExceptionsState() != ScriptDebugServer::DontP
auseOnExceptions) { |
| 646 RefPtr<JSONObject> directive = JSONObject::create(); | 656 RefPtr<JSONObject> directive = JSONObject::create(); |
| 647 directive->setString("directiveText", directiveText); | 657 directive->setString("directiveText", directiveText); |
| 648 breakProgram(InspectorFrontend::Debugger::Reason::CSPViolation, directiv
e.release()); | 658 breakProgram(InspectorFrontend::Debugger::Reason::CSPViolation, directiv
e.release()); |
| 649 } | 659 } |
| 650 } | 660 } |
| 651 | 661 |
| 652 PassRefPtr<Array<TypeBuilder::Debugger::CallFrame> > InspectorDebuggerAgent::cur
rentCallFrames() | 662 PassRefPtr<Array<TypeBuilder::Debugger::CallFrame> > InspectorDebuggerAgent::cur
rentCallFrames() |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 853 void InspectorDebuggerAgent::reset() | 863 void InspectorDebuggerAgent::reset() |
| 854 { | 864 { |
| 855 m_scripts.clear(); | 865 m_scripts.clear(); |
| 856 m_breakpointIdToDebugServerBreakpointIds.clear(); | 866 m_breakpointIdToDebugServerBreakpointIds.clear(); |
| 857 if (m_frontend) | 867 if (m_frontend) |
| 858 m_frontend->globalObjectCleared(); | 868 m_frontend->globalObjectCleared(); |
| 859 } | 869 } |
| 860 | 870 |
| 861 } // namespace WebCore | 871 } // namespace WebCore |
| 862 | 872 |
| OLD | NEW |