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

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

Issue 248523003: Remove ActiveDOMObject::willStop, and introduce WorkerGlobalScope::TerminationObserver. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 // Mutex protection is necessary because stop() can be called before the con text is fully created. 225 // Mutex protection is necessary because stop() can be called before the con text is fully created.
226 MutexLocker lock(m_threadCreationMutex); 226 MutexLocker lock(m_threadCreationMutex);
227 227
228 // Signal the thread to notify that the thread's stopping. 228 // Signal the thread to notify that the thread's stopping.
229 if (m_shutdownEvent) 229 if (m_shutdownEvent)
230 m_shutdownEvent->signal(); 230 m_shutdownEvent->signal();
231 231
232 // Ensure that tasks are being handled by thread event loop. If script execu tion weren't forbidden, a while(1) loop in JS could keep the thread alive foreve r. 232 // Ensure that tasks are being handled by thread event loop. If script execu tion weren't forbidden, a while(1) loop in JS could keep the thread alive foreve r.
233 if (m_workerGlobalScope) { 233 if (m_workerGlobalScope) {
234 m_workerGlobalScope->script()->scheduleExecutionTermination(); 234 m_workerGlobalScope->script()->scheduleExecutionTermination();
235 m_workerGlobalScope->willStopActiveDOMObjects(); 235 m_workerGlobalScope->wasRequestedToTerminate();
236 m_runLoop.postTaskAndTerminate(WorkerThreadShutdownStartTask::create()); 236 m_runLoop.postTaskAndTerminate(WorkerThreadShutdownStartTask::create());
237 return; 237 return;
238 } 238 }
239 m_runLoop.terminate(); 239 m_runLoop.terminate();
240 } 240 }
241 241
242 bool WorkerThread::isCurrentThread() const 242 bool WorkerThread::isCurrentThread() const
243 { 243 {
244 return m_threadID == currentThread(); 244 return m_threadID == currentThread();
245 } 245 }
246 246
247 class ReleaseFastMallocFreeMemoryTask : public ExecutionContextTask { 247 class ReleaseFastMallocFreeMemoryTask : public ExecutionContextTask {
248 virtual void performTask(ExecutionContext*) OVERRIDE { WTF::releaseFastMallo cFreeMemory(); } 248 virtual void performTask(ExecutionContext*) OVERRIDE { WTF::releaseFastMallo cFreeMemory(); }
249 }; 249 };
250 250
251 } // namespace WebCore 251 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698