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..31d76ea3aac461c76d31c9a8b53dd926894a25c5 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(); |
piman
2012/06/14 17:00:50
This sounds like this method needs to be a member
henrika (OOO until Aug 14)
2012/06/14 17:18:29
I can try to refactor if you think it is required.
piman
2012/06/14 17:29:32
TBH I don't think the other uses in this file are
|
+ 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); |
} |
//------------------------------------------------------------------------------ |
@@ -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( |