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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 | 190 |
191 WorkerNavigator* WorkerGlobalScope::navigator() const | 191 WorkerNavigator* WorkerGlobalScope::navigator() const |
192 { | 192 { |
193 if (!m_navigator) | 193 if (!m_navigator) |
194 m_navigator = WorkerNavigator::create(m_userAgent); | 194 m_navigator = WorkerNavigator::create(m_userAgent); |
195 return m_navigator.get(); | 195 return m_navigator.get(); |
196 } | 196 } |
197 | 197 |
198 void WorkerGlobalScope::postTask(const WebTraceLocation& location, PassOwnPtr<Ex
ecutionContextTask> task) | 198 void WorkerGlobalScope::postTask(const WebTraceLocation& location, PassOwnPtr<Ex
ecutionContextTask> task) |
199 { | 199 { |
200 thread()->postTask(task); | 200 thread()->postTask(location, task); |
201 } | 201 } |
202 | 202 |
203 // FIXME: Called twice, from WorkerThreadShutdownFinishTask and WorkerGlobalScop
e::dispose. | 203 // FIXME: Called twice, from WorkerThreadShutdownFinishTask and WorkerGlobalScop
e::dispose. |
204 void WorkerGlobalScope::clearInspector() | 204 void WorkerGlobalScope::clearInspector() |
205 { | 205 { |
206 if (!m_workerInspectorController) | 206 if (!m_workerInspectorController) |
207 return; | 207 return; |
208 thread()->setWorkerInspectorController(nullptr); | 208 thread()->setWorkerInspectorController(nullptr); |
209 m_workerInspectorController->dispose(); | 209 m_workerInspectorController->dispose(); |
210 m_workerInspectorController.clear(); | 210 m_workerInspectorController.clear(); |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 visitor->trace(m_timers); | 376 visitor->trace(m_timers); |
377 visitor->trace(m_messageStorage); | 377 visitor->trace(m_messageStorage); |
378 visitor->trace(m_pendingMessages); | 378 visitor->trace(m_pendingMessages); |
379 HeapSupplementable<WorkerGlobalScope>::trace(visitor); | 379 HeapSupplementable<WorkerGlobalScope>::trace(visitor); |
380 #endif | 380 #endif |
381 ExecutionContext::trace(visitor); | 381 ExecutionContext::trace(visitor); |
382 EventTargetWithInlineData::trace(visitor); | 382 EventTargetWithInlineData::trace(visitor); |
383 } | 383 } |
384 | 384 |
385 } // namespace blink | 385 } // namespace blink |
OLD | NEW |