| 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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 clearScript(); | 208 clearScript(); |
| 209 clearInspector(); | 209 clearInspector(); |
| 210 // We do not clear the thread field of the | 210 // We do not clear the thread field of the |
| 211 // WorkerGlobalScope. Other objects keep the worker global scope | 211 // WorkerGlobalScope. Other objects keep the worker global scope |
| 212 // alive because they need its thread field to check that work is | 212 // alive because they need its thread field to check that work is |
| 213 // being carried out on the right thread. We therefore cannot clear | 213 // being carried out on the right thread. We therefore cannot clear |
| 214 // the thread field before all references to the worker global | 214 // the thread field before all references to the worker global |
| 215 // scope are gone. | 215 // scope are gone. |
| 216 } | 216 } |
| 217 | 217 |
| 218 void WorkerGlobalScope::didEvaluateWorkerScript() |
| 219 { |
| 220 } |
| 221 |
| 218 void WorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionState
& exceptionState) | 222 void WorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionState
& exceptionState) |
| 219 { | 223 { |
| 220 ASSERT(contentSecurityPolicy()); | 224 ASSERT(contentSecurityPolicy()); |
| 221 ASSERT(executionContext()); | 225 ASSERT(executionContext()); |
| 222 | 226 |
| 223 ExecutionContext& executionContext = *this->executionContext(); | 227 ExecutionContext& executionContext = *this->executionContext(); |
| 224 | 228 |
| 225 Vector<String>::const_iterator urlsEnd = urls.end(); | 229 Vector<String>::const_iterator urlsEnd = urls.end(); |
| 226 Vector<KURL> completedURLs; | 230 Vector<KURL> completedURLs; |
| 227 for (Vector<String>::const_iterator it = urls.begin(); it != urlsEnd; ++it)
{ | 231 for (Vector<String>::const_iterator it = urls.begin(); it != urlsEnd; ++it)
{ |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 visitor->trace(m_eventQueue); | 341 visitor->trace(m_eventQueue); |
| 338 visitor->trace(m_workerClients); | 342 visitor->trace(m_workerClients); |
| 339 visitor->trace(m_messageStorage); | 343 visitor->trace(m_messageStorage); |
| 340 HeapSupplementable<WorkerGlobalScope>::trace(visitor); | 344 HeapSupplementable<WorkerGlobalScope>::trace(visitor); |
| 341 #endif | 345 #endif |
| 342 ExecutionContext::trace(visitor); | 346 ExecutionContext::trace(visitor); |
| 343 EventTargetWithInlineData::trace(visitor); | 347 EventTargetWithInlineData::trace(visitor); |
| 344 } | 348 } |
| 345 | 349 |
| 346 } // namespace blink | 350 } // namespace blink |
| OLD | NEW |