| 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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 | 214 |
| 215 m_eventQueue->close(); | 215 m_eventQueue->close(); |
| 216 clearScript(); | 216 clearScript(); |
| 217 clearInspector(); | 217 clearInspector(); |
| 218 // We do not clear the thread field of the | 218 // We do not clear the thread field of the |
| 219 // WorkerGlobalScope. Other objects keep the worker global scope | 219 // WorkerGlobalScope. Other objects keep the worker global scope |
| 220 // alive because they need its thread field to check that work is | 220 // alive because they need its thread field to check that work is |
| 221 // being carried out on the right thread. We therefore cannot clear | 221 // being carried out on the right thread. We therefore cannot clear |
| 222 // the thread field before all references to the worker global | 222 // the thread field before all references to the worker global |
| 223 // scope are gone. | 223 // scope are gone. |
| 224 |
| 225 ExecutionContext::contextDestroyed(); |
| 224 } | 226 } |
| 225 | 227 |
| 226 void WorkerGlobalScope::didEvaluateWorkerScript() | 228 void WorkerGlobalScope::didEvaluateWorkerScript() |
| 227 { | 229 { |
| 228 } | 230 } |
| 229 | 231 |
| 230 void WorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionState
& exceptionState) | 232 void WorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionState
& exceptionState) |
| 231 { | 233 { |
| 232 ASSERT(contentSecurityPolicy()); | 234 ASSERT(contentSecurityPolicy()); |
| 233 ASSERT(executionContext()); | 235 ASSERT(executionContext()); |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 visitor->trace(m_workerClients); | 362 visitor->trace(m_workerClients); |
| 361 visitor->trace(m_messageStorage); | 363 visitor->trace(m_messageStorage); |
| 362 visitor->trace(m_pendingMessages); | 364 visitor->trace(m_pendingMessages); |
| 363 HeapSupplementable<WorkerGlobalScope>::trace(visitor); | 365 HeapSupplementable<WorkerGlobalScope>::trace(visitor); |
| 364 #endif | 366 #endif |
| 365 ExecutionContext::trace(visitor); | 367 ExecutionContext::trace(visitor); |
| 366 EventTargetWithInlineData::trace(visitor); | 368 EventTargetWithInlineData::trace(visitor); |
| 367 } | 369 } |
| 368 | 370 |
| 369 } // namespace blink | 371 } // namespace blink |
| OLD | NEW |