| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 this.doEvalInCallFrame(selectedCallFrame, code, objectGroup, updatingCal
lbackWrapper); | 393 this.doEvalInCallFrame(selectedCallFrame, code, objectGroup, updatingCal
lbackWrapper); |
| 394 }, | 394 }, |
| 395 | 395 |
| 396 doEvalInCallFrame: function(callFrame, code, objectGroup, callback) | 396 doEvalInCallFrame: function(callFrame, code, objectGroup, callback) |
| 397 { | 397 { |
| 398 function evalCallback(result) | 398 function evalCallback(result) |
| 399 { | 399 { |
| 400 if (result) | 400 if (result) |
| 401 callback(result.value, result.isException); | 401 callback(result.value, result.isException); |
| 402 } | 402 } |
| 403 InjectedScriptAccess.evaluateInCallFrame(callFrame.id, code, objectGroup
, evalCallback); | 403 InjectedScriptAccess.get(callFrame.injectedScriptId).evaluateInCallFrame
(callFrame.id, code, objectGroup, evalCallback); |
| 404 }, | 404 }, |
| 405 | 405 |
| 406 debuggerPaused: function(callFrames) | 406 debuggerPaused: function(callFrames) |
| 407 { | 407 { |
| 408 this._paused = true; | 408 this._paused = true; |
| 409 this._waitingToPause = false; | 409 this._waitingToPause = false; |
| 410 this._stepping = false; | 410 this._stepping = false; |
| 411 | 411 |
| 412 this._updateDebuggerButtons(); | 412 this._updateDebuggerButtons(); |
| 413 | 413 |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 951 this._paused = false; | 951 this._paused = false; |
| 952 this._stepping = true; | 952 this._stepping = true; |
| 953 | 953 |
| 954 this._clearInterface(); | 954 this._clearInterface(); |
| 955 | 955 |
| 956 InspectorBackend.stepOutOfFunctionInDebugger(); | 956 InspectorBackend.stepOutOfFunctionInDebugger(); |
| 957 } | 957 } |
| 958 } | 958 } |
| 959 | 959 |
| 960 WebInspector.ScriptsPanel.prototype.__proto__ = WebInspector.Panel.prototype; | 960 WebInspector.ScriptsPanel.prototype.__proto__ = WebInspector.Panel.prototype; |
| OLD | NEW |