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

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

Issue 551373003: Removed unregisterTerminationObserver from DatabaseContext::contextDestroyed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « Source/core/workers/WorkerGlobalScope.h ('k') | Source/modules/webdatabase/DatabaseContext.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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 m_workerInspectorController.clear(); 196 m_workerInspectorController.clear();
197 } 197 }
198 198
199 void WorkerGlobalScope::registerTerminationObserver(TerminationObserver* observe r) 199 void WorkerGlobalScope::registerTerminationObserver(TerminationObserver* observe r)
200 { 200 {
201 ASSERT(!m_terminationObserver); 201 ASSERT(!m_terminationObserver);
202 ASSERT(observer); 202 ASSERT(observer);
203 m_terminationObserver = observer; 203 m_terminationObserver = observer;
204 } 204 }
205 205
206 void WorkerGlobalScope::unregisterTerminationObserver(TerminationObserver* obser ver)
207 {
208 ASSERT(observer);
209 ASSERT(m_terminationObserver == observer);
210 m_terminationObserver = 0;
211 }
212
213 void WorkerGlobalScope::wasRequestedToTerminate() 206 void WorkerGlobalScope::wasRequestedToTerminate()
214 { 207 {
215 if (m_terminationObserver) 208 if (m_terminationObserver)
216 m_terminationObserver->wasRequestedToTerminate(); 209 m_terminationObserver->wasRequestedToTerminate();
217 } 210 }
218 211
219 void WorkerGlobalScope::dispose() 212 void WorkerGlobalScope::dispose()
220 { 213 {
221 ASSERT(thread()->isCurrentThread()); 214 ASSERT(thread()->isCurrentThread());
222 215
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 visitor->trace(m_workerInspectorController); 346 visitor->trace(m_workerInspectorController);
354 visitor->trace(m_eventQueue); 347 visitor->trace(m_eventQueue);
355 visitor->trace(m_workerClients); 348 visitor->trace(m_workerClients);
356 visitor->trace(m_messageStorage); 349 visitor->trace(m_messageStorage);
357 WillBeHeapSupplementable<WorkerGlobalScope>::trace(visitor); 350 WillBeHeapSupplementable<WorkerGlobalScope>::trace(visitor);
358 ExecutionContext::trace(visitor); 351 ExecutionContext::trace(visitor);
359 EventTargetWithInlineData::trace(visitor); 352 EventTargetWithInlineData::trace(visitor);
360 } 353 }
361 354
362 } // namespace blink 355 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/workers/WorkerGlobalScope.h ('k') | Source/modules/webdatabase/DatabaseContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698