Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
| 3 * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved. | 3 * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 189 | 189 |
| 190 void WorkerGlobalScope::willStopActiveDOMObjects() | 190 void WorkerGlobalScope::willStopActiveDOMObjects() |
| 191 { | 191 { |
| 192 lifecycleNotifier().notifyWillStopActiveDOMObjects(); | 192 lifecycleNotifier().notifyWillStopActiveDOMObjects(); |
| 193 } | 193 } |
| 194 | 194 |
| 195 void WorkerGlobalScope::dispose() | 195 void WorkerGlobalScope::dispose() |
| 196 { | 196 { |
| 197 ASSERT(thread()->isCurrentThread()); | 197 ASSERT(thread()->isCurrentThread()); |
| 198 | 198 |
| 199 if (m_script) | |
| 200 m_script->dispose(); | |
| 201 lifecycleNotifier().notifyContextWillBeDestroyed(); | |
| 202 | |
| 199 clearScript(); | 203 clearScript(); |
|
haraken
2014/04/01 05:56:14
I'm afraid this is very hacky. This code is the wa
Mads Ager (chromium)
2014/04/01 11:38:38
This code is one big hair ball already where thing
| |
| 200 clearInspector(); | 204 clearInspector(); |
| 201 setClient(0); | 205 setClient(0); |
| 202 | 206 |
| 203 // We do not clear the thread field of the | 207 // We do not clear the thread field of the |
| 204 // WorkerGlobalScope. Other objects keep the worker global scope | 208 // WorkerGlobalScope. Other objects keep the worker global scope |
| 205 // alive because they need its thread field to check that work is | 209 // alive because they need its thread field to check that work is |
| 206 // being carried out on the right thread. We therefore cannot clear | 210 // being carried out on the right thread. We therefore cannot clear |
| 207 // the thread field before all references to the worker global | 211 // the thread field before all references to the worker global |
| 208 // scope are gone. | 212 // scope are gone. |
| 209 } | 213 } |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 303 { | 307 { |
| 304 visitor->trace(m_console); | 308 visitor->trace(m_console); |
| 305 visitor->trace(m_location); | 309 visitor->trace(m_location); |
| 306 visitor->trace(m_navigator); | 310 visitor->trace(m_navigator); |
| 307 #if ENABLE(OILPAN) | 311 #if ENABLE(OILPAN) |
| 308 HeapSupplementable<WorkerGlobalScope>::trace(visitor); | 312 HeapSupplementable<WorkerGlobalScope>::trace(visitor); |
| 309 #endif | 313 #endif |
| 310 } | 314 } |
| 311 | 315 |
| 312 } // namespace WebCore | 316 } // namespace WebCore |
| OLD | NEW |