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

Side by Side Diff: Source/WebCore/inspector/WorkerInspectorController.cpp

Issue 11275274: Merge 133030 - Web Inspector: page crash when pausing in dedicated worker (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « LayoutTests/inspector-protocol/debugger-pause-dedicated-worker-expected.txt ('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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 #endif 107 #endif
108 m_timelineAgent = InspectorTimelineAgent::create(m_instrumentingAgents.get() , 0, m_state.get(), InspectorTimelineAgent::WorkerInspector, 0); 108 m_timelineAgent = InspectorTimelineAgent::create(m_instrumentingAgents.get() , 0, m_state.get(), InspectorTimelineAgent::WorkerInspector, 0);
109 109
110 m_injectedScriptManager->injectedScriptHost()->init(0 110 m_injectedScriptManager->injectedScriptHost()->init(0
111 , 0 111 , 0
112 #if ENABLE(SQL_DATABASE) 112 #if ENABLE(SQL_DATABASE)
113 , 0 113 , 0
114 #endif 114 #endif
115 , 0 115 , 0
116 , 0 116 , 0
117 , 0 117 #if ENABLE(JAVASCRIPT_DEBUGGER)
118 , m_debuggerAgent.get()
119 #endif
118 ); 120 );
119 121
120 #if ENABLE(JAVASCRIPT_DEBUGGER) 122 #if ENABLE(JAVASCRIPT_DEBUGGER)
121 m_runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer()); 123 m_runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
122 #endif 124 #endif
123 } 125 }
124 126
125 WorkerInspectorController::~WorkerInspectorController() 127 WorkerInspectorController::~WorkerInspectorController()
126 { 128 {
127 disconnectFrontend(); 129 disconnectFrontend();
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 void WorkerInspectorController::resume() 196 void WorkerInspectorController::resume()
195 { 197 {
196 ErrorString unused; 198 ErrorString unused;
197 m_runtimeAgent->run(&unused); 199 m_runtimeAgent->run(&unused);
198 } 200 }
199 #endif 201 #endif
200 202
201 } 203 }
202 204
203 #endif 205 #endif
OLDNEW
« no previous file with comments | « LayoutTests/inspector-protocol/debugger-pause-dedicated-worker-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698