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

Side by Side Diff: Source/core/Init.cpp

Issue 670683002: Terminate worker threads before detaching main thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | Source/web/WebKit.cpp » ('j') | 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 ScriptStreamerThread::init(); 116 ScriptStreamerThread::init();
117 } 117 }
118 118
119 void CoreInitializer::shutdown() 119 void CoreInitializer::shutdown()
120 { 120 {
121 // Make sure we stop the HTMLParserThread and ScriptStreamerThread before 121 // Make sure we stop the HTMLParserThread and ScriptStreamerThread before
122 // Platform::current() is cleared. 122 // Platform::current() is cleared.
123 ScriptStreamerThread::shutdown(); 123 ScriptStreamerThread::shutdown();
124 HTMLParserThread::shutdown(); 124 HTMLParserThread::shutdown();
125 125
126 // Make sure we stop WorkerThreads before Partition::shutdown() which frees ExecutionContext.
127 WorkerThread::terminateAndWaitForAllWorkers();
128
129 Partitions::shutdown(); 126 Partitions::shutdown();
130 } 127 }
131 128
132 } // namespace blink 129 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/web/WebKit.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698