Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Side by Side Diff: Source/core/workers/WorkerGlobalScope.cpp

Issue 922023003: Revert of Add task location information to WorkerThread (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/workers/WorkerInspectorProxy.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 188
189 WorkerNavigator* WorkerGlobalScope::navigator() const 189 WorkerNavigator* WorkerGlobalScope::navigator() const
190 { 190 {
191 if (!m_navigator) 191 if (!m_navigator)
192 m_navigator = WorkerNavigator::create(m_userAgent); 192 m_navigator = WorkerNavigator::create(m_userAgent);
193 return m_navigator.get(); 193 return m_navigator.get();
194 } 194 }
195 195
196 void WorkerGlobalScope::postTask(const WebTraceLocation& location, PassOwnPtr<Ex ecutionContextTask> task) 196 void WorkerGlobalScope::postTask(const WebTraceLocation& location, PassOwnPtr<Ex ecutionContextTask> task)
197 { 197 {
198 thread()->postTask(location, task); 198 thread()->postTask(task);
199 } 199 }
200 200
201 // FIXME: Called twice, from WorkerThreadShutdownFinishTask and WorkerGlobalScop e::dispose. 201 // FIXME: Called twice, from WorkerThreadShutdownFinishTask and WorkerGlobalScop e::dispose.
202 void WorkerGlobalScope::clearInspector() 202 void WorkerGlobalScope::clearInspector()
203 { 203 {
204 if (!m_workerInspectorController) 204 if (!m_workerInspectorController)
205 return; 205 return;
206 thread()->setWorkerInspectorController(nullptr); 206 thread()->setWorkerInspectorController(nullptr);
207 m_workerInspectorController->dispose(); 207 m_workerInspectorController->dispose();
208 m_workerInspectorController.clear(); 208 m_workerInspectorController.clear();
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 visitor->trace(m_timers); 372 visitor->trace(m_timers);
373 visitor->trace(m_messageStorage); 373 visitor->trace(m_messageStorage);
374 visitor->trace(m_pendingMessages); 374 visitor->trace(m_pendingMessages);
375 HeapSupplementable<WorkerGlobalScope>::trace(visitor); 375 HeapSupplementable<WorkerGlobalScope>::trace(visitor);
376 #endif 376 #endif
377 ExecutionContext::trace(visitor); 377 ExecutionContext::trace(visitor);
378 EventTargetWithInlineData::trace(visitor); 378 EventTargetWithInlineData::trace(visitor);
379 } 379 }
380 380
381 } // namespace blink 381 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/workers/WorkerInspectorProxy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698