Support concatenated spatialization data

webkit/glue/webkitplatformsupport_impl.cc

Index: webkit/glue/webkitplatformsupport_impl.cc
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index 445fc2552036dfc4dd3a5d200d46b531ae8e40c5..2964eaae2356880ce9a4b7042b4b3d8f00ba7e59 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -494,6 +494,15 @@ namespace {
 
 WebData loadAudioSpatializationResource(WebKitPlatformSupportImpl* platform,
                                         const char* name) {
+#ifdef IDR_AUDIO_SPATIALIZATION_COMPOSITE
+  if (strcmp(name, "Composite") == 0) {

[Chris Rogers, 2013/04/17 22:33:31]

use !strcmp()

+    base::StringPiece resource =
+        platform->GetDataResource(IDR_AUDIO_SPATIALIZATION_COMPOSITE,
+                                  ui::SCALE_FACTOR_NONE);
+    return WebData(resource.data(), resource.size());
+  }
+#endif
+
 #ifdef IDR_AUDIO_SPATIALIZATION_T000_P000

[Chris Rogers, 2013/04/17 22:33:31]

I assume that once you switch Blink over to using the single "composite"
resource and delete the 240 individual resources from the .grd file that you'll
remove the #ifdef IDR_AUDIO_SPATIALIZATION_T000_P000 case??

[Raymond Toy (Google), 2013/04/17 23:32:15]

Yes, I will remove that, along with the 240 individual resources in the .grd
file.  But the actual 240 wav files will remain.

   const size_t kExpectedSpatializationNameLength = 31;
   if (strlen(name) != kExpectedSpatializationNameLength) {
@@ -661,7 +670,8 @@ WebData WebKitPlatformSupportImpl::loadResource(const char* name) {
     return WebData();
 
   // Check the name prefix to see if it's an audio resource.
-  if (StartsWithASCII(name, "IRC_Composite", true))
+  if (StartsWithASCII(name, "IRC_Composite", true) ||
+      StartsWithASCII(name, "Composite", true))

[Chris Rogers, 2013/04/17 22:33:31]

I assume once Blink switches to the single file that this can check just for
"Composite"

[Raymond Toy (Google), 2013/04/17 23:32:15]

Yes

     return loadAudioSpatializationResource(this, name);
 
   // TODO(flackr): We should use a better than linear search here, a trie would