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

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

Issue 10662030: WebMediaPlayerImpl needs to own the audio source provider. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Update from review 2 Created 8 years, 5 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 } 335 }
336 336
337 webkit_media::WebMediaPlayerImpl* 337 webkit_media::WebMediaPlayerImpl*
338 ChromeContentRendererClient::OverrideCreateWebMediaPlayer( 338 ChromeContentRendererClient::OverrideCreateWebMediaPlayer(
339 content::RenderView* render_view, 339 content::RenderView* render_view,
340 WebKit::WebFrame* frame, 340 WebKit::WebFrame* frame,
341 WebKit::WebMediaPlayerClient* client, 341 WebKit::WebMediaPlayerClient* client,
342 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, 342 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
343 media::FilterCollection* collection, 343 media::FilterCollection* collection,
344 WebKit::WebAudioSourceProvider* audio_source_provider, 344 WebKit::WebAudioSourceProvider* audio_source_provider,
345 media::AudioRendererSink* audio_renderer_sink,
345 media::MessageLoopFactory* message_loop_factory, 346 media::MessageLoopFactory* message_loop_factory,
346 webkit_media::MediaStreamClient* media_stream_client, 347 webkit_media::MediaStreamClient* media_stream_client,
347 media::MediaLog* media_log) { 348 media::MediaLog* media_log) {
348 if (!prerender::PrerenderHelper::IsPrerendering(render_view)) 349 if (!prerender::PrerenderHelper::IsPrerendering(render_view))
349 return NULL; 350 return NULL;
350 351
351 return new prerender::PrerenderWebMediaPlayer(render_view, frame, client, 352 return new prerender::PrerenderWebMediaPlayer(render_view, frame, client,
352 delegate, collection, audio_source_provider, message_loop_factory, 353 delegate, collection, audio_source_provider, audio_renderer_sink,
353 media_stream_client, media_log); 354 message_loop_factory, media_stream_client, media_log);
354 } 355 }
355 356
356 WebPlugin* ChromeContentRendererClient::CreatePlugin( 357 WebPlugin* ChromeContentRendererClient::CreatePlugin(
357 content::RenderView* render_view, 358 content::RenderView* render_view,
358 WebFrame* frame, 359 WebFrame* frame,
359 const WebPluginParams& original_params, 360 const WebPluginParams& original_params,
360 const ChromeViewHostMsg_GetPluginInfo_Status& status, 361 const ChromeViewHostMsg_GetPluginInfo_Status& status,
361 const webkit::WebPluginInfo& plugin, 362 const webkit::WebPluginInfo& plugin,
362 const std::string& actual_mime_type) { 363 const std::string& actual_mime_type) {
363 ChromeViewHostMsg_GetPluginInfo_Status::Value status_value = status.value; 364 ChromeViewHostMsg_GetPluginInfo_Status::Value status_value = status.value;
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
939 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { 940 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
940 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); 941 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
941 } 942 }
942 943
943 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 944 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
944 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 945 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
945 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 946 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
946 } 947 }
947 948
948 } // namespace chrome 949 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.h ('k') | chrome/renderer/prerender/prerender_webmediaplayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698