Revert 72259 - Bundle audio spatialization resources for use by the web audio...

webkit/glue/webkitclient_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webkitclient_impl.h"
 
 #if defined(OS_LINUX)
 #include <malloc.h>
 #endif
 
 #include <math.h>
 
 #include <vector>
 
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/metrics/histogram.h"
 #include "base/process_util.h"
 #include "base/platform_file.h"
 #include "base/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "grit/webkit_chromium_resources.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_strings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCookie.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginListBuilder.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
@@ skipping 247 matching lines @@
 void WebKitClientImpl::traceEventBegin(const char* name, void* id,
                                        const char* extra) {
   TRACE_EVENT_BEGIN(name, id, extra);
 }
 
 void WebKitClientImpl::traceEventEnd(const char* name, void* id,
                                      const char* extra) {
   TRACE_EVENT_END(name, id, extra);
 }
 
-namespace {
-
-WebData loadAudioSpatializationResource(const char* name) {
-#ifdef IDR_AUDIO_SPATIALIZATION_T000_P000
-  const size_t kExpectedSpatializationNameLength = 31;
-  if (strlen(name) != kExpectedSpatializationNameLength) {
-    return WebData();
-  }
-
-  // Extract the azimuth and elevation from the resource name.
-  int azimuth = 0;
-  int elevation = 0;
-  int values_parsed =
-      sscanf(name, "IRC_Composite_C_R0195_T%3d_P%3d", &azimuth, &elevation);
-  if (values_parsed != 2) {
-    return WebData();
-  }
-
-  // The resource index values go through the elevations first, then azimuths.
-  const int kAngleSpacing = 15;
-
-  // 0 <= elevation <= 90 (or 315 <= elevation <= 345)
-  // in increments of 15 degrees.
-  int elevation_index =
-      elevation <= 90 ? elevation / kAngleSpacing :
-      7 + (elevation - 315) / kAngleSpacing;
-  bool is_elevation_index_good = 0 <= elevation_index && elevation_index < 10;
-
-  // 0 <= azimuth < 360 in increments of 15 degrees.
-  int azimuth_index = azimuth / kAngleSpacing;
-  bool is_azimuth_index_good = 0 <= azimuth_index && azimuth_index < 24;
-
-  const int kNumberOfElevations = 10;
-  const int kNumberOfAudioResources = 240;
-  int resource_index = kNumberOfElevations * azimuth_index + elevation_index;
-  bool is_resource_index_good = 0 <= resource_index &&
-      resource_index < kNumberOfAudioResources;
-
-  if (is_azimuth_index_good && is_elevation_index_good &&
-      is_resource_index_good) {
-    const int kFirstAudioResourceIndex = IDR_AUDIO_SPATIALIZATION_T000_P000;
-    base::StringPiece resource =
-        GetDataResource(kFirstAudioResourceIndex + resource_index);
-    return WebData(resource.data(), resource.size());
-  }
-#endif  // IDR_AUDIO_SPATIALIZATION_T000_P000
-
-  NOTREACHED();
-  return WebData();
-}
-
-}  // namespace
-
 WebData WebKitClientImpl::loadResource(const char* name) {
   struct {
     const char* name;
     int id;
   } resources[] = {
     { "missingImage", IDR_BROKENIMAGE },
     { "mediaPause", IDR_MEDIA_PAUSE_BUTTON },
     { "mediaPlay", IDR_MEDIA_PLAY_BUTTON },
     { "mediaPlayDisabled", IDR_MEDIA_PLAY_BUTTON_DISABLED },
     { "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED },
@@ skipping 31 matching lines @@
     { "linuxRadioDisabledOff", IDR_LINUX_RADIO_DISABLED_OFF },
     { "linuxRadioDisabledOn", IDR_LINUX_RADIO_DISABLED_ON },
     { "linuxRadioOff", IDR_LINUX_RADIO_OFF },
     { "linuxRadioOn", IDR_LINUX_RADIO_ON },
     { "linuxProgressBar", IDR_PROGRESS_BAR },
     { "linuxProgressBorderLeft", IDR_PROGRESS_BORDER_LEFT },
     { "linuxProgressBorderRight", IDR_PROGRESS_BORDER_RIGHT },
     { "linuxProgressValue", IDR_PROGRESS_VALUE },
 #endif
   };
-
-  // Check the name prefix to see if it's an audio resource.
-  if (StartsWithASCII(name, "IRC_Composite", true)) {
-    return loadAudioSpatializationResource(name);
-  } else {
-    for (size_t i = 0; i < ARRAYSIZE_UNSAFE(resources); ++i) {
-      if (!strcmp(name, resources[i].name)) {
-        base::StringPiece resource = GetDataResource(resources[i].id);
-        return WebData(resource.data(), resource.size());
-      }
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(resources); ++i) {
+    if (!strcmp(name, resources[i].name)) {
+      base::StringPiece resource = GetDataResource(resources[i].id);
+      return WebData(resource.data(), resource.size());
     }
   }
   // TODO(jhawkins): Restore this NOTREACHED once WK stops sending in empty
   // strings. http://crbug.com/50675.
   //NOTREACHED() << "Unknown image resource " << name;
   return WebData();
 }
 
 bool WebKitClientImpl::loadAudioResource(
     WebKit::WebAudioBus* destination_bus, const char* audio_file_data,
@@ skipping 180 matching lines @@
   ++shared_timer_suspended_;
 }
 
 void WebKitClientImpl::ResumeSharedTimer() {
   // The shared timer may have fired or been adjusted while we were suspended.
   if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
     setSharedTimerFireTime(shared_timer_fire_time_);
 }
 
 }  // namespace webkit_glue