Move some webkit_glue embedder functions into WebKitPlatformSupport virtual methods

webkit/glue/webkitplatformsupport_impl.cc

 // Copyright (c) 2011 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/webkitplatformsupport_impl.h"
 
 #if defined(OS_LINUX)
 #include <malloc.h>
 #endif
 
@@ skipping 205 matching lines @@
 }
 
 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() {
 }
 
 WebThemeEngine* WebKitPlatformSupportImpl::themeEngine() {
   return &theme_engine_;
 }
 
 WebURLLoader* WebKitPlatformSupportImpl::createURLLoader() {
-  return new WebURLLoaderImpl();
+  return new WebURLLoaderImpl(this);
 }
 
 WebSocketStreamHandle* WebKitPlatformSupportImpl::createSocketStreamHandle() {
-  return new WebSocketStreamHandleImpl();
+  return new WebSocketStreamHandleImpl(this);
 }
 
 WebString WebKitPlatformSupportImpl::userAgent(const WebURL& url) {
   return WebString::fromUTF8(webkit_glue::GetUserAgent(url));
 }
 
 void WebKitPlatformSupportImpl::getPluginList(bool refresh,
                                      WebPluginListBuilder* builder) {
   std::vector<webkit::WebPluginInfo> plugins;
   GetPlugins(refresh, &plugins);
@@ skipping 58 matching lines @@
   TRACE_EVENT_BEGIN_ETW(name, id, extra);
 }
 
 void WebKitPlatformSupportImpl::traceEventEnd(const char* name, void* id,
                                               const char* extra) {
   TRACE_EVENT_END_ETW(name, id, extra);
 }
 
 namespace {
 
-WebData loadAudioSpatializationResource(const char* name) {
+WebData loadAudioSpatializationResource(WebKitPlatformSupportImpl* platform,
+                                        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 =
@@ skipping 19 matching lines @@
   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);
+        platform->GetDataResource(kFirstAudioResourceIndex + resource_index);
     return WebData(resource.data(), resource.size());
   }
 #endif  // IDR_AUDIO_SPATIALIZATION_T000_P000
 
   NOTREACHED();
   return WebData();
 }
 
 struct DataResource {
   const char* name;
@@ skipping 67 matching lines @@
 
 WebData WebKitPlatformSupportImpl::loadResource(const char* name) {
   // Some clients will call into this method with an empty |name| when they have
   // optional resources.  For example, the PopupMenuChromium code can have icons
   // for some Autofill items but not for others.
   if (!strlen(name))
     return WebData();
 
   // Check the name prefix to see if it's an audio resource.
   if (StartsWithASCII(name, "IRC_Composite", true))
-    return loadAudioSpatializationResource(name);
+    return loadAudioSpatializationResource(this, name);
 
   for (size_t i = 0; i < arraysize(kDataResources); ++i) {
     if (!strcmp(name, kDataResources[i].name)) {
       base::StringPiece resource = GetDataResource(kDataResources[i].id);
       return WebData(resource.data(), resource.size());
     }
   }
 
   NOTREACHED() << "Unknown image resource " << name;
   return WebData();
@@ skipping 231 matching lines @@
 }
 
 // static
 void WebKitPlatformSupportImpl::DestroyCurrentThread(void* thread) {
   WebThreadImplForMessageLoop* impl =
       static_cast<WebThreadImplForMessageLoop*>(thread);
   delete impl;
 }
 
 }  // namespace webkit_glue