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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
343 } | 343 } |
344 | 344 |
345 void WorkerGlobalScope::exceptionThrown(ErrorEvent* event) { | 345 void WorkerGlobalScope::exceptionThrown(ErrorEvent* event) { |
346 int nextId = ++m_lastPendingErrorEventId; | 346 int nextId = ++m_lastPendingErrorEventId; |
347 m_pendingErrorEvents.set(nextId, event); | 347 m_pendingErrorEvents.set(nextId, event); |
348 thread()->workerReportingProxy().reportException( | 348 thread()->workerReportingProxy().reportException( |
349 event->messageForConsole(), event->location()->clone(), nextId); | 349 event->messageForConsole(), event->location()->clone(), nextId); |
350 } | 350 } |
351 | 351 |
352 void WorkerGlobalScope::removeURLFromMemoryCache(const KURL& url) { | 352 void WorkerGlobalScope::removeURLFromMemoryCache(const KURL& url) { |
353 m_thread->getParentFrameTaskRunners() | 353 FrameTaskRunnerHelper::get(TaskType::Networking, this) |
354 ->get(TaskType::Networking) | |
355 ->postTask(BLINK_FROM_HERE, | 354 ->postTask(BLINK_FROM_HERE, |
356 crossThreadBind(&removeURLFromMemoryCacheInternal, url)); | 355 crossThreadBind(&removeURLFromMemoryCacheInternal, url)); |
357 } | 356 } |
358 | 357 |
359 KURL WorkerGlobalScope::virtualCompleteURL(const String& url) const { | 358 KURL WorkerGlobalScope::virtualCompleteURL(const String& url) const { |
360 return completeURL(url); | 359 return completeURL(url); |
361 } | 360 } |
362 | 361 |
363 DEFINE_TRACE(WorkerGlobalScope) { | 362 DEFINE_TRACE(WorkerGlobalScope) { |
364 visitor->trace(m_location); | 363 visitor->trace(m_location); |
365 visitor->trace(m_navigator); | 364 visitor->trace(m_navigator); |
366 visitor->trace(m_scriptController); | 365 visitor->trace(m_scriptController); |
367 visitor->trace(m_eventQueue); | 366 visitor->trace(m_eventQueue); |
368 visitor->trace(m_timers); | 367 visitor->trace(m_timers); |
369 visitor->trace(m_eventListeners); | 368 visitor->trace(m_eventListeners); |
370 visitor->trace(m_pendingErrorEvents); | 369 visitor->trace(m_pendingErrorEvents); |
371 ExecutionContext::trace(visitor); | 370 ExecutionContext::trace(visitor); |
372 EventTargetWithInlineData::trace(visitor); | 371 EventTargetWithInlineData::trace(visitor); |
373 SecurityContext::trace(visitor); | 372 SecurityContext::trace(visitor); |
374 Supplementable<WorkerGlobalScope>::trace(visitor); | 373 Supplementable<WorkerGlobalScope>::trace(visitor); |
375 } | 374 } |
376 | 375 |
377 } // namespace blink | 376 } // namespace blink |
OLD | NEW |