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

Unified Diff: content/renderer/renderer_webkitplatformsupport_impl.cc

Issue 10537121: Adds AudioDevice factory for all audio clients in Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved factory to content/renderer/media Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/test/webrtc_audio_device_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_webkitplatformsupport_impl.cc
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 32a708655c01c73b0daf9f4ae3a617b0d896f12e..d86886a227b197227724e93542bb431692b73583 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -4,6 +4,9 @@
#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"
@@ -343,7 +346,8 @@ WebIDBFactory* RendererWebKitPlatformSupportImpl::idbFactory() {
return web_idb_factory_.get();
}
-void RendererWebKitPlatformSupportImpl::createIDBKeysFromSerializedValuesAndKeyPath(
+void
+RendererWebKitPlatformSupportImpl::createIDBKeysFromSerializedValuesAndKeyPath(
const WebVector<WebSerializedScriptValue>& values,
const WebIDBKeyPath& keyPath,
WebVector<WebIDBKey>& keys_out) {
@@ -389,7 +393,6 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeForExtension(
new MimeRegistryMsg_GetMimeTypeFromExtension(
webkit_glue::WebStringToFilePathString(file_extension), &mime_type));
return ASCIIToUTF16(mime_type);
-
}
WebString RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeFromFile(
@@ -404,7 +407,6 @@ WebString RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeFromFile(
FilePath(webkit_glue::WebStringToFilePathString(file_path)),
&mime_type));
return ASCIIToUTF16(mime_type);
-
}
WebString
@@ -637,7 +639,18 @@ RendererWebKitPlatformSupportImpl::createAudioDevice(
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();
+ if (!web_frame)
+ return NULL;
jochen (gone - plz use gerrit) 2012/06/14 13:32:35 nit. indent
henrika (OOO until Aug 14) 2012/06/14 13:56:32 Done.
+ RenderViewImpl* render_view =
jochen (gone - plz use gerrit) 2012/06/14 13:32:35 nit. less indent
henrika (OOO until Aug 14) 2012/06/14 13:56:32 Done.
+ RenderViewImpl::FromWebView(web_frame->view());
+ if (!render_view)
+ return NULL;
+
+ return new RendererWebAudioDeviceImpl(
+ render_view->audio_device_factory(), params, callback);
}
//------------------------------------------------------------------------------
@@ -676,7 +689,7 @@ void RendererWebKitPlatformSupportImpl::sampleGamepads(WebGamepads& gamepads) {
WebKit::WebString RendererWebKitPlatformSupportImpl::userAgent(
const WebKit::WebURL& url) {
- return WebKitPlatformSupportImpl::userAgent(url);
+ return WebKitPlatformSupportImpl::userAgent(url);
}
void RendererWebKitPlatformSupportImpl::GetPlugins(
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/test/webrtc_audio_device_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698