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

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

Issue 1115923002: workers: Rename WorkerThread to WorkerScript. Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: . Created 5 years, 7 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
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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 // Shutdown V8-related background threads before V8 is ramped down. Note 224 // Shutdown V8-related background threads before V8 is ramped down. Note
225 // that this will wait the thread to stop its operations. 225 // that this will wait the thread to stop its operations.
226 ScriptStreamerThread::shutdown(); 226 ScriptStreamerThread::shutdown();
227 227
228 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate(); 228 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate();
229 V8PerIsolateData::willBeDestroyed(isolate); 229 V8PerIsolateData::willBeDestroyed(isolate);
230 230
231 // Make sure we stop WorkerThreads before the main thread's ThreadState 231 // Make sure we stop WorkerThreads before the main thread's ThreadState
232 // and later shutdown steps starts freeing up resources needed during 232 // and later shutdown steps starts freeing up resources needed during
233 // worker termination. 233 // worker termination.
234 WorkerThread::terminateAndWaitForAllWorkers(); 234 WorkerScript::terminateAndWaitForAllWorkers();
235 235
236 ModulesInitializer::terminateThreads(); 236 ModulesInitializer::terminateThreads();
237 237
238 // Detach the main thread before starting the shutdown sequence 238 // Detach the main thread before starting the shutdown sequence
239 // so that the main thread won't get involved in a GC during the shutdown. 239 // so that the main thread won't get involved in a GC during the shutdown.
240 ThreadState::detachMainThread(); 240 ThreadState::detachMainThread();
241 241
242 V8PerIsolateData::destroy(isolate); 242 V8PerIsolateData::destroy(isolate);
243 243
244 shutdownWithoutV8(); 244 shutdownWithoutV8();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 #endif // !LOG_DISABLED 283 #endif // !LOG_DISABLED
284 } 284 }
285 285
286 void resetPluginCache(bool reloadPages) 286 void resetPluginCache(bool reloadPages)
287 { 287 {
288 ASSERT(!reloadPages); 288 ASSERT(!reloadPages);
289 Page::refreshPlugins(); 289 Page::refreshPlugins();
290 } 290 }
291 291
292 } // namespace blink 292 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698