| 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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 | 207 |
| 208 m_eventQueue->close(); | 208 m_eventQueue->close(); |
| 209 clearScript(); | 209 clearScript(); |
| 210 clearInspector(); | 210 clearInspector(); |
| 211 // We do not clear the thread field of the | 211 // We do not clear the thread field of the |
| 212 // WorkerGlobalScope. Other objects keep the worker global scope | 212 // WorkerGlobalScope. Other objects keep the worker global scope |
| 213 // alive because they need its thread field to check that work is | 213 // alive because they need its thread field to check that work is |
| 214 // being carried out on the right thread. We therefore cannot clear | 214 // being carried out on the right thread. We therefore cannot clear |
| 215 // the thread field before all references to the worker global | 215 // the thread field before all references to the worker global |
| 216 // scope are gone. | 216 // scope are gone. |
| 217 |
| 218 ExecutionContext::contextDestroyed(); |
| 217 } | 219 } |
| 218 | 220 |
| 219 void WorkerGlobalScope::didEvaluateWorkerScript() | 221 void WorkerGlobalScope::didEvaluateWorkerScript() |
| 220 { | 222 { |
| 221 } | 223 } |
| 222 | 224 |
| 223 void WorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionState
& exceptionState) | 225 void WorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionState
& exceptionState) |
| 224 { | 226 { |
| 225 ASSERT(contentSecurityPolicy()); | 227 ASSERT(contentSecurityPolicy()); |
| 226 ASSERT(executionContext()); | 228 ASSERT(executionContext()); |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 visitor->trace(m_workerClients); | 355 visitor->trace(m_workerClients); |
| 354 visitor->trace(m_messageStorage); | 356 visitor->trace(m_messageStorage); |
| 355 visitor->trace(m_pendingMessages); | 357 visitor->trace(m_pendingMessages); |
| 356 HeapSupplementable<WorkerGlobalScope>::trace(visitor); | 358 HeapSupplementable<WorkerGlobalScope>::trace(visitor); |
| 357 #endif | 359 #endif |
| 358 ExecutionContext::trace(visitor); | 360 ExecutionContext::trace(visitor); |
| 359 EventTargetWithInlineData::trace(visitor); | 361 EventTargetWithInlineData::trace(visitor); |
| 360 } | 362 } |
| 361 | 363 |
| 362 } // namespace blink | 364 } // namespace blink |
| OLD | NEW |