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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 8980008: Integrate HTMLMediaElement with Web Audio API's MediaElementAudioSourceNode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 WebKit::WebPlugin** plugin) { 289 WebKit::WebPlugin** plugin) {
290 *plugin = CreatePlugin(render_view, frame, params); 290 *plugin = CreatePlugin(render_view, frame, params);
291 return true; 291 return true;
292 } 292 }
293 293
294 bool ChromeContentRendererClient::OverrideCreateWebMediaPlayer( 294 bool ChromeContentRendererClient::OverrideCreateWebMediaPlayer(
295 content::RenderView* render_view, 295 content::RenderView* render_view,
296 WebKit::WebMediaPlayerClient* client, 296 WebKit::WebMediaPlayerClient* client,
297 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, 297 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
298 media::FilterCollection* collection, 298 media::FilterCollection* collection,
299 WebKit::WebAudioSourceProvider* audio_source_provider,
299 media::MessageLoopFactory* message_loop_factory, 300 media::MessageLoopFactory* message_loop_factory,
300 webkit_media::MediaStreamClient* media_stream_client, 301 webkit_media::MediaStreamClient* media_stream_client,
301 media::MediaLog* media_log, 302 media::MediaLog* media_log,
302 webkit_media::WebMediaPlayerImpl** player) { 303 webkit_media::WebMediaPlayerImpl** player) {
303 if (!prerender::PrerenderHelper::IsPrerendering(render_view)) 304 if (!prerender::PrerenderHelper::IsPrerendering(render_view))
304 return false; 305 return false;
305 306
306 *player = new prerender::PrerenderWebMediaPlayer(render_view, client, 307 *player = new prerender::PrerenderWebMediaPlayer(render_view, client,
307 delegate, collection, message_loop_factory, media_stream_client, 308 delegate, collection, audio_source_provider, message_loop_factory,
308 media_log); 309 media_stream_client, media_log);
309 return true; 310 return true;
310 } 311 }
311 312
312 WebPlugin* ChromeContentRendererClient::CreatePlugin( 313 WebPlugin* ChromeContentRendererClient::CreatePlugin(
313 content::RenderView* render_view, 314 content::RenderView* render_view,
314 WebFrame* frame, 315 WebFrame* frame,
315 const WebPluginParams& original_params) { 316 const WebPluginParams& original_params) {
316 CommandLine* cmd = CommandLine::ForCurrentProcess(); 317 CommandLine* cmd = CommandLine::ForCurrentProcess();
317 GURL url(original_params.url); 318 GURL url(original_params.url);
318 std::string orig_mime_type = original_params.mimeType.utf8(); 319 std::string orig_mime_type = original_params.mimeType.utf8();
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 819 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
819 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 820 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
820 } 821 }
821 822
822 bool ChromeContentRendererClient::AllowSocketAPI(const GURL& url) { 823 bool ChromeContentRendererClient::AllowSocketAPI(const GURL& url) {
823 return allowed_socket_origins_.find(url.host()) != 824 return allowed_socket_origins_.find(url.host()) !=
824 allowed_socket_origins_.end(); 825 allowed_socket_origins_.end();
825 } 826 }
826 827
827 } // namespace chrome 828 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698