OLD | NEW |
---|---|
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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
174 | 174 |
175 setIndexedDBClientCreateFunction(IndexedDBClientImpl::create); | 175 setIndexedDBClientCreateFunction(IndexedDBClientImpl::create); |
176 | 176 |
177 MediaPlayer::setMediaEngineCreateFunction(WebMediaPlayerClientImpl::create); | 177 MediaPlayer::setMediaEngineCreateFunction(WebMediaPlayerClientImpl::create); |
178 } | 178 } |
179 | 179 |
180 void shutdown() | 180 void shutdown() |
181 { | 181 { |
182 // currentThread will always be non-null in production, but can be null in C hromium unit tests. | 182 // currentThread will always be non-null in production, but can be null in C hromium unit tests. |
183 if (Platform::current()->currentThread()) { | 183 if (Platform::current()->currentThread()) { |
184 ASSERT(s_endOfTaskRunner); | 184 ASSERT(s_endOfTaskRunner); |
jamesr
2014/09/25 06:52:16
this ASSERT() isn't needed any more. delete NULL
haraken
2014/09/25 06:53:23
Done.
| |
185 Platform::current()->currentThread()->removeTaskObserver(s_endOfTaskRunn er); | 185 // We don't need to (cannot) remove s_endOfTaskRunner from the current |
186 // message loop, because the message loop is already destructed before | |
187 // the shutdown() is called. | |
188 // Platform::current()->currentThread()->removeTaskObserver(s_endOfTaskR unner); | |
jamesr
2014/09/25 06:52:16
having commented out code is not useful - just del
haraken
2014/09/25 06:53:23
Done.
| |
186 delete s_endOfTaskRunner; | 189 delete s_endOfTaskRunner; |
187 s_endOfTaskRunner = 0; | 190 s_endOfTaskRunner = 0; |
188 } | 191 } |
189 | 192 |
190 ASSERT(s_isolateInterruptor); | 193 ASSERT(s_isolateInterruptor); |
191 ThreadState::current()->removeInterruptor(s_isolateInterruptor); | 194 ThreadState::current()->removeInterruptor(s_isolateInterruptor); |
192 | 195 |
193 // currentThread will always be non-null in production, but can be null in C hromium unit tests. | 196 // currentThread will always be non-null in production, but can be null in C hromium unit tests. |
194 if (Platform::current()->currentThread()) { | 197 if (Platform::current()->currentThread()) { |
195 ASSERT(s_pendingGCRunner); | 198 ASSERT(s_pendingGCRunner); |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
253 channel->state = WTFLogChannelOn; | 256 channel->state = WTFLogChannelOn; |
254 #endif // !LOG_DISABLED | 257 #endif // !LOG_DISABLED |
255 } | 258 } |
256 | 259 |
257 void resetPluginCache(bool reloadPages) | 260 void resetPluginCache(bool reloadPages) |
258 { | 261 { |
259 Page::refreshPlugins(reloadPages); | 262 Page::refreshPlugins(reloadPages); |
260 } | 263 } |
261 | 264 |
262 } // namespace blink | 265 } // namespace blink |
OLD | NEW |