Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 135 injectedScript.getInternalProperties(errorString, objectId, &internalPro perties); | 135 injectedScript.getInternalProperties(errorString, objectId, &internalPro perties); |
| 136 | 136 |
| 137 unmuteConsole(); | 137 unmuteConsole(); |
| 138 setPauseOnExceptionsState(m_scriptDebugServer, previousPauseOnExceptionsStat e); | 138 setPauseOnExceptionsState(m_scriptDebugServer, previousPauseOnExceptionsStat e); |
| 139 } | 139 } |
| 140 | 140 |
| 141 void InspectorRuntimeAgent::releaseObject(ErrorString*, const String& objectId) | 141 void InspectorRuntimeAgent::releaseObject(ErrorString*, const String& objectId) |
| 142 { | 142 { |
| 143 InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForOb jectId(objectId); | 143 InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForOb jectId(objectId); |
| 144 if (!injectedScript.isEmpty()) | 144 if (!injectedScript.isEmpty()) |
| 145 injectedScript.releaseObject(objectId); | 145 injectedScript.releaseObject(objectId); |
|
aandrey
2014/08/17 17:40:41
I think this should be also wrapped for consistenc
sergeyv
2014/08/25 11:37:31
Done.
| |
| 146 } | 146 } |
| 147 | 147 |
| 148 void InspectorRuntimeAgent::releaseObjectGroup(ErrorString*, const String& objec tGroup) | 148 void InspectorRuntimeAgent::releaseObjectGroup(ErrorString*, const String& objec tGroup) |
| 149 { | 149 { |
| 150 bool pausingOnNextStatement = m_scriptDebugServer->pausingOnNextStatement(); | |
| 151 if (pausingOnNextStatement) | |
| 152 m_scriptDebugServer->setPauseOnNextStatement(false); | |
| 150 m_injectedScriptManager->releaseObjectGroup(objectGroup); | 153 m_injectedScriptManager->releaseObjectGroup(objectGroup); |
| 154 if (pausingOnNextStatement) | |
| 155 m_scriptDebugServer->setPauseOnNextStatement(true); | |
| 151 } | 156 } |
| 152 | 157 |
| 153 void InspectorRuntimeAgent::run(ErrorString*) | 158 void InspectorRuntimeAgent::run(ErrorString*) |
| 154 { | 159 { |
| 155 } | 160 } |
| 156 | 161 |
| 157 void InspectorRuntimeAgent::isRunRequired(ErrorString*, bool* out_result) | 162 void InspectorRuntimeAgent::isRunRequired(ErrorString*, bool* out_result) |
| 158 { | 163 { |
| 159 *out_result = false; | 164 *out_result = false; |
| 160 } | 165 } |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 207 m_frontend->executionContextCreated(ExecutionContextDescription::create() | 212 m_frontend->executionContextCreated(ExecutionContextDescription::create() |
| 208 .setId(executionContextId) | 213 .setId(executionContextId) |
| 209 .setIsPageContext(isPageContext) | 214 .setIsPageContext(isPageContext) |
| 210 .setName(name) | 215 .setName(name) |
| 211 .setFrameId(frameId) | 216 .setFrameId(frameId) |
| 212 .release()); | 217 .release()); |
| 213 } | 218 } |
| 214 | 219 |
| 215 } // namespace blink | 220 } // namespace blink |
| 216 | 221 |
| OLD | NEW |