Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Side by Side Diff: Source/core/inspector/InspectorRuntimeAgent.cpp

Issue 473923002: DevTools: Prevent a debugger pause while executing js code in releaseObjectGroup (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address aandrey's comment Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/bindings/core/v8/ScriptDebugServer.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 if (!asBool(accessorPropertiesOnly)) 134 if (!asBool(accessorPropertiesOnly))
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 return;
146 bool pausingOnNextStatement = m_scriptDebugServer->pausingOnNextStatement();
147 if (pausingOnNextStatement)
148 m_scriptDebugServer->setPauseOnNextStatement(false);
149 injectedScript.releaseObject(objectId);
150 if (pausingOnNextStatement)
151 m_scriptDebugServer->setPauseOnNextStatement(true);
146 } 152 }
147 153
148 void InspectorRuntimeAgent::releaseObjectGroup(ErrorString*, const String& objec tGroup) 154 void InspectorRuntimeAgent::releaseObjectGroup(ErrorString*, const String& objec tGroup)
149 { 155 {
156 bool pausingOnNextStatement = m_scriptDebugServer->pausingOnNextStatement();
157 if (pausingOnNextStatement)
158 m_scriptDebugServer->setPauseOnNextStatement(false);
150 m_injectedScriptManager->releaseObjectGroup(objectGroup); 159 m_injectedScriptManager->releaseObjectGroup(objectGroup);
160 if (pausingOnNextStatement)
161 m_scriptDebugServer->setPauseOnNextStatement(true);
151 } 162 }
152 163
153 void InspectorRuntimeAgent::run(ErrorString*) 164 void InspectorRuntimeAgent::run(ErrorString*)
154 { 165 {
155 } 166 }
156 167
157 void InspectorRuntimeAgent::isRunRequired(ErrorString*, bool* out_result) 168 void InspectorRuntimeAgent::isRunRequired(ErrorString*, bool* out_result)
158 { 169 {
159 *out_result = false; 170 *out_result = false;
160 } 171 }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 m_frontend->executionContextCreated(ExecutionContextDescription::create() 218 m_frontend->executionContextCreated(ExecutionContextDescription::create()
208 .setId(executionContextId) 219 .setId(executionContextId)
209 .setIsPageContext(isPageContext) 220 .setIsPageContext(isPageContext)
210 .setName(name) 221 .setName(name)
211 .setFrameId(frameId) 222 .setFrameId(frameId)
212 .release()); 223 .release());
213 } 224 }
214 225
215 } // namespace blink 226 } // namespace blink
216 227
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/ScriptDebugServer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698