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

Side by Side Diff: Source/core/platform/audio/HRTFDatabaseLoader.cpp

Issue 13973026: remove memoryinstrumentation Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove the rest part of MemoryInstrumentation Created 7 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) 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 * 7 *
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 15 matching lines...) Expand all
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 30
31 #if ENABLE(WEB_AUDIO) 31 #if ENABLE(WEB_AUDIO)
32 32
33 #include "HRTFDatabaseLoader.h" 33 #include "HRTFDatabaseLoader.h"
34 34
35 #include "HRTFDatabase.h" 35 #include "HRTFDatabase.h"
36 #include "PlatformMemoryInstrumentation.h"
37 #include <wtf/MainThread.h> 36 #include <wtf/MainThread.h>
38 37
39 namespace WebCore { 38 namespace WebCore {
40 39
41 // Singleton 40 // Singleton
42 HRTFDatabaseLoader* HRTFDatabaseLoader::s_loader = 0; 41 HRTFDatabaseLoader* HRTFDatabaseLoader::s_loader = 0;
43 42
44 PassRefPtr<HRTFDatabaseLoader> HRTFDatabaseLoader::createAndLoadAsynchronouslyIf Necessary(float sampleRate) 43 PassRefPtr<HRTFDatabaseLoader> HRTFDatabaseLoader::createAndLoadAsynchronouslyIf Necessary(float sampleRate)
45 { 44 {
46 ASSERT(isMainThread()); 45 ASSERT(isMainThread());
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 } 124 }
126 125
127 HRTFDatabase* HRTFDatabaseLoader::defaultHRTFDatabase() 126 HRTFDatabase* HRTFDatabaseLoader::defaultHRTFDatabase()
128 { 127 {
129 if (!s_loader) 128 if (!s_loader)
130 return 0; 129 return 0;
131 130
132 return s_loader->database(); 131 return s_loader->database();
133 } 132 }
134 133
135 void HRTFDatabaseLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) c onst
136 {
137 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::AudioShare dData);
138 info.addMember(m_hrtfDatabase, "hrtfDatabase");
139 }
140
141 } // namespace WebCore 134 } // namespace WebCore
142 135
143 #endif // ENABLE(WEB_AUDIO) 136 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/core/platform/audio/HRTFDatabaseLoader.h ('k') | Source/core/platform/audio/HRTFElevation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698