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

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

Issue 399383005: Scheduler: Don't shut down the scheduler too soon (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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 | « no previous file | 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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 // currentThread will always be non-null in production, but can be null in C hromium unit tests. 200 // currentThread will always be non-null in production, but can be null in C hromium unit tests.
201 if (Platform::current()->currentThread()) { 201 if (Platform::current()->currentThread()) {
202 ASSERT(s_endOfTaskRunner); 202 ASSERT(s_endOfTaskRunner);
203 Platform::current()->currentThread()->removeTaskObserver(s_endOfTaskRunn er); 203 Platform::current()->currentThread()->removeTaskObserver(s_endOfTaskRunn er);
204 delete s_endOfTaskRunner; 204 delete s_endOfTaskRunner;
205 s_endOfTaskRunner = 0; 205 s_endOfTaskRunner = 0;
206 } 206 }
207 207
208 ASSERT(s_isolateInterruptor); 208 ASSERT(s_isolateInterruptor);
209 blink::ThreadState::current()->removeInterruptor(s_isolateInterruptor); 209 blink::ThreadState::current()->removeInterruptor(s_isolateInterruptor);
210 blink::Scheduler::shutdown();
211 210
212 // currentThread will always be non-null in production, but can be null in C hromium unit tests. 211 // currentThread will always be non-null in production, but can be null in C hromium unit tests.
213 if (Platform::current()->currentThread()) { 212 if (Platform::current()->currentThread()) {
214 ASSERT(s_pendingGCRunner); 213 ASSERT(s_pendingGCRunner);
215 delete s_pendingGCRunner; 214 delete s_pendingGCRunner;
216 s_pendingGCRunner = 0; 215 s_pendingGCRunner = 0;
217 216
218 ASSERT(s_messageLoopInterruptor); 217 ASSERT(s_messageLoopInterruptor);
219 blink::ThreadState::current()->removeInterruptor(s_messageLoopInterrupto r); 218 blink::ThreadState::current()->removeInterruptor(s_messageLoopInterrupto r);
220 delete s_messageLoopInterruptor; 219 delete s_messageLoopInterruptor;
(...skipping 11 matching lines...) Expand all
232 231
233 shutdownWithoutV8(); 232 shutdownWithoutV8();
234 } 233 }
235 234
236 void shutdownWithoutV8() 235 void shutdownWithoutV8()
237 { 236 {
238 ASSERT(!s_endOfTaskRunner); 237 ASSERT(!s_endOfTaskRunner);
239 blink::CoreInitializer::shutdown(); 238 blink::CoreInitializer::shutdown();
240 blink::Heap::shutdown(); 239 blink::Heap::shutdown();
241 WTF::shutdown(); 240 WTF::shutdown();
241 blink::Scheduler::shutdown();
242 Platform::shutdown(); 242 Platform::shutdown();
243 WebPrerenderingSupport::shutdown(); 243 WebPrerenderingSupport::shutdown();
244 } 244 }
245 245
246 void setLayoutTestMode(bool value) 246 void setLayoutTestMode(bool value)
247 { 247 {
248 LayoutTestSupport::setIsRunningLayoutTest(value); 248 LayoutTestSupport::setIsRunningLayoutTest(value);
249 } 249 }
250 250
251 bool layoutTestMode() 251 bool layoutTestMode()
(...skipping 19 matching lines...) Expand all
271 channel->state = WTFLogChannelOn; 271 channel->state = WTFLogChannelOn;
272 #endif // !LOG_DISABLED 272 #endif // !LOG_DISABLED
273 } 273 }
274 274
275 void resetPluginCache(bool reloadPages) 275 void resetPluginCache(bool reloadPages)
276 { 276 {
277 blink::Page::refreshPlugins(reloadPages); 277 blink::Page::refreshPlugins(reloadPages);
278 } 278 }
279 279
280 } // namespace blink 280 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698