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

Side by Side Diff: Source/WebCore/webaudio/AudioContext.h

Issue 7947001: Merge 94608 - MediaElementAudioSourceNode destruction triggers ASSERTS (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 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/WebCore/html/HTMLMediaElement.cpp ('k') | Source/WebCore/webaudio/AudioContext.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) 2010, Google Inc. All rights reserved. 2 * Copyright (C) 2010, Google 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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 224
225 static unsigned s_hardwareContextCount; 225 static unsigned s_hardwareContextCount;
226 226
227 private: 227 private:
228 AudioContext(Document*); 228 AudioContext(Document*);
229 AudioContext(Document*, unsigned numberOfChannels, size_t numberOfFrames, do uble sampleRate); 229 AudioContext(Document*, unsigned numberOfChannels, size_t numberOfFrames, do uble sampleRate);
230 void constructCommon(); 230 void constructCommon();
231 231
232 void lazyInitialize(); 232 void lazyInitialize();
233 void uninitialize(); 233 void uninitialize();
234 static void uninitializeDispatch(void* userData);
234 235
235 void scheduleNodeDeletion(); 236 void scheduleNodeDeletion();
236 static void deleteMarkedNodesDispatch(void* userData); 237 static void deleteMarkedNodesDispatch(void* userData);
237 238
238 bool m_isInitialized; 239 bool m_isInitialized;
239 bool m_isAudioThreadFinished; 240 bool m_isAudioThreadFinished;
240 bool m_isAudioThreadShutdown; 241 bool m_isAudioThreadShutdown;
241 242
242 Document* m_document; 243 Document* m_document;
243 244
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 RefPtr<AudioBuffer> m_renderTarget; 313 RefPtr<AudioBuffer> m_renderTarget;
313 314
314 bool m_isOfflineContext; 315 bool m_isOfflineContext;
315 316
316 AsyncAudioDecoder m_audioDecoder; 317 AsyncAudioDecoder m_audioDecoder;
317 }; 318 };
318 319
319 } // WebCore 320 } // WebCore
320 321
321 #endif // AudioContext_h 322 #endif // AudioContext_h
OLDNEW
« no previous file with comments | « Source/WebCore/html/HTMLMediaElement.cpp ('k') | Source/WebCore/webaudio/AudioContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698