Adds AudioDevice factory for all audio clients in Chrome

content/renderer/renderer_webkitplatformsupport_impl.cc

 // Copyright (c) 2012 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 "content/renderer/renderer_webkitplatformsupport_impl.h"
 
+#include <algorithm>
+#include <vector>
+
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
 #include "base/platform_file.h"
 #include "base/shared_memory.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/database_util.h"
 #include "content/common/fileapi/webblobregistry_impl.h"
 #include "content/common/fileapi/webfilesystem_impl.h"
@@ skipping 319 matching lines @@
 WebIDBFactory* RendererWebKitPlatformSupportImpl::idbFactory() {
   if (!web_idb_factory_.get()) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
       web_idb_factory_.reset(WebIDBFactory::create());
     else
       web_idb_factory_.reset(new RendererWebIDBFactoryImpl());
   }
   return web_idb_factory_.get();
 }
 
-void RendererWebKitPlatformSupportImpl::createIDBKeysFromSerializedValuesAndKeyPath(
+void
+RendererWebKitPlatformSupportImpl::createIDBKeysFromSerializedValuesAndKeyPath(
     const WebVector<WebSerializedScriptValue>& values,
     const WebIDBKeyPath& keyPath,
     WebVector<WebIDBKey>& keys_out) {
   DCHECK(CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess));
   WebVector<WebIDBKey> keys(values.size());
   for (size_t i = 0; i < values.size(); ++i) {
     keys[i] = WebIDBKey::createFromValueAndKeyPath(
         values[i], keyPath);
   }
   keys_out.swap(keys);
@@ skipping 25 matching lines @@
   if (IsPluginProcess())
     return SimpleWebMimeRegistryImpl::mimeTypeForExtension(file_extension);
 
   // The sandbox restricts our access to the registry, so we need to proxy
   // these calls over to the browser process.
   std::string mime_type;
   RenderThreadImpl::current()->Send(
       new MimeRegistryMsg_GetMimeTypeFromExtension(
           webkit_glue::WebStringToFilePathString(file_extension), &mime_type));
   return ASCIIToUTF16(mime_type);
-
 }
 
 WebString RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeFromFile(
     const WebString& file_path) {
   if (IsPluginProcess())
     return SimpleWebMimeRegistryImpl::mimeTypeFromFile(file_path);
 
   // The sandbox restricts our access to the registry, so we need to proxy
   // these calls over to the browser process.
   std::string mime_type;
   RenderThreadImpl::current()->Send(new MimeRegistryMsg_GetMimeTypeFromFile(
       FilePath(webkit_glue::WebStringToFilePathString(file_path)),
       &mime_type));
   return ASCIIToUTF16(mime_type);
-
 }
 
 WebString
 RendererWebKitPlatformSupportImpl::MimeRegistry::preferredExtensionForMIMEType(
     const WebString& mime_type) {
   if (IsPluginProcess())
     return SimpleWebMimeRegistryImpl::preferredExtensionForMIMEType(mime_type);
 
   // The sandbox restricts our access to the registry, so we need to proxy
   // these calls over to the browser process.
@@ skipping 212 matching lines @@
       layout = CHANNEL_LAYOUT_7_1;
       break;
     default:
       layout = CHANNEL_LAYOUT_STEREO;
   }
 
   media::AudioParameters params(
       media::AudioParameters::AUDIO_PCM_LOW_LATENCY, layout,
       static_cast<int>(sampleRate), 16, bufferSize);
 
-  return new RendererWebAudioDeviceImpl(params, callback);
+  // Get access to the RenderView to be able to inject the audio-device
+  // factory.
+  WebFrame* web_frame = WebFrame::frameForCurrentContext();

[piman, 2012/06/14 17:00:50]

This sounds like this method needs to be a member of WebViewClient (or
WebFrameClient, as appropriate), and implemented by RenderViewImpl.

[henrika (OOO until Aug 14), 2012/06/14 17:18:29]

I can try to refactor if you think it is required. I have used the same approach
as already exists in other methods here.

[piman, 2012/06/14 17:29:32]

TBH I don't think the other uses in this file are valid either.
WebFrame::frameForCurrentContext finds the "current" frame based on the
JavaScript context that's highest on the stack. It's a very twisted way of
getting to the RenderView. Plus there's many cases where it's not the frame you
want (e.g. on frame scripts another frame from the same domain), and will lead
to problems later if the RenderView that originally called this goes away (but
the WebAudioDevice is attached to another one).

+  if (!web_frame)
+    return NULL;
+
+  RenderViewImpl* render_view = RenderViewImpl::FromWebView(web_frame->view());
+  if (!render_view)
+    return NULL;
+
+  return new RendererWebAudioDeviceImpl(
+      render_view->audio_device_factory(), params, callback);
 }
 
 //------------------------------------------------------------------------------
 
 WebKit::WebString
 RendererWebKitPlatformSupportImpl::signedPublicKeyAndChallengeString(
     unsigned key_size_index,
     const WebKit::WebString& challenge,
     const WebKit::WebURL& url) {
   std::string signed_public_key;
@@ skipping 18 matching lines @@
 //------------------------------------------------------------------------------
 
 void RendererWebKitPlatformSupportImpl::sampleGamepads(WebGamepads& gamepads) {
   if (!gamepad_shared_memory_reader_.get())
     gamepad_shared_memory_reader_.reset(new content::GamepadSharedMemoryReader);
   gamepad_shared_memory_reader_->SampleGamepads(gamepads);
 }
 
 WebKit::WebString RendererWebKitPlatformSupportImpl::userAgent(
     const WebKit::WebURL& url) {
- return WebKitPlatformSupportImpl::userAgent(url);
+  return WebKitPlatformSupportImpl::userAgent(url);
 }
 
 void RendererWebKitPlatformSupportImpl::GetPlugins(
     bool refresh, std::vector<webkit::WebPluginInfo>* plugins) {
   if (!RenderThreadImpl::current()->plugin_refresh_allowed())
     refresh = false;
   RenderThreadImpl::current()->Send(
       new ViewHostMsg_GetPlugins(refresh, plugins));
 }
 
@@ skipping 40 matching lines @@
     bool enable) {
   bool was_enabled = g_sandbox_enabled;
   g_sandbox_enabled = enable;
   return was_enabled;
 }
 
 GpuChannelHostFactory*
 RendererWebKitPlatformSupportImpl::GetGpuChannelHostFactory() {
   return RenderThreadImpl::current();
 }