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

Side by Side Diff: Source/web/WebKit.cpp

Issue 429453010: Drop V8RecursionScope dependency on ExecutionContext (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reorder cleanup methods per haraken Created 6 years, 3 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/modules/indexeddb/InspectorIndexedDBAgent.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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 ASSERT(s_pendingGCRunner); 195 ASSERT(s_pendingGCRunner);
196 delete s_pendingGCRunner; 196 delete s_pendingGCRunner;
197 s_pendingGCRunner = 0; 197 s_pendingGCRunner = 0;
198 198
199 ASSERT(s_messageLoopInterruptor); 199 ASSERT(s_messageLoopInterruptor);
200 ThreadState::current()->removeInterruptor(s_messageLoopInterruptor); 200 ThreadState::current()->removeInterruptor(s_messageLoopInterruptor);
201 delete s_messageLoopInterruptor; 201 delete s_messageLoopInterruptor;
202 s_messageLoopInterruptor = 0; 202 s_messageLoopInterruptor = 0;
203 } 203 }
204 204
205 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate();
206 V8PerIsolateData::willBeDestroyed(isolate);
207
205 // Detach the main thread before starting the shutdown sequence 208 // Detach the main thread before starting the shutdown sequence
206 // so that the main thread won't get involved in a GC during the shutdown. 209 // so that the main thread won't get involved in a GC during the shutdown.
207 ThreadState::detachMainThread(); 210 ThreadState::detachMainThread();
208 211
209 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate(); 212 V8PerIsolateData::destroy(isolate);
210 V8PerIsolateData::dispose(isolate);
211 213
212 shutdownWithoutV8(); 214 shutdownWithoutV8();
213 } 215 }
214 216
215 void shutdownWithoutV8() 217 void shutdownWithoutV8()
216 { 218 {
217 ASSERT(!s_endOfTaskRunner); 219 ASSERT(!s_endOfTaskRunner);
218 CoreInitializer::shutdown(); 220 CoreInitializer::shutdown();
219 Scheduler::shutdown(); 221 Scheduler::shutdown();
220 Heap::shutdown(); 222 Heap::shutdown();
(...skipping 30 matching lines...) Expand all
251 channel->state = WTFLogChannelOn; 253 channel->state = WTFLogChannelOn;
252 #endif // !LOG_DISABLED 254 #endif // !LOG_DISABLED
253 } 255 }
254 256
255 void resetPluginCache(bool reloadPages) 257 void resetPluginCache(bool reloadPages)
256 { 258 {
257 Page::refreshPlugins(reloadPages); 259 Page::refreshPlugins(reloadPages);
258 } 260 }
259 261
260 } // namespace blink 262 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/indexeddb/InspectorIndexedDBAgent.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698