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

Side by Side Diff: content/renderer/render_view_impl.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 according to review 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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 2363 matching lines...) Expand 10 before | Expand all | Expand 10 after
2374 collection->AddVideoDecoder(new media::GpuVideoDecoder( 2374 collection->AddVideoDecoder(new media::GpuVideoDecoder(
2375 message_loop_factory->GetMessageLoop("GpuVideoDecoder"), 2375 message_loop_factory->GetMessageLoop("GpuVideoDecoder"),
2376 factories_loop, 2376 factories_loop,
2377 new RendererGpuVideoDecoderFactories( 2377 new RendererGpuVideoDecoderFactories(
2378 gpu_channel_host, factories_loop, context3d))); 2378 gpu_channel_host, factories_loop, context3d)));
2379 } 2379 }
2380 2380
2381 WebMediaPlayer* media_player = 2381 WebMediaPlayer* media_player =
2382 content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( 2382 content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
2383 this, frame, client, AsWeakPtr(), collection, audio_source_provider, 2383 this, frame, client, AsWeakPtr(), collection, audio_source_provider,
2384 message_loop_factory, media_stream_impl_, render_media_log); 2384 audio_source_provider, message_loop_factory, media_stream_impl_,
2385 render_media_log);
2385 if (!media_player) { 2386 if (!media_player) {
2386 media_player = new webkit_media::WebMediaPlayerImpl( 2387 media_player = new webkit_media::WebMediaPlayerImpl(
2387 frame, client, AsWeakPtr(), collection, audio_source_provider, 2388 frame, client, AsWeakPtr(), collection, audio_source_provider,
2388 message_loop_factory, media_stream_impl_, render_media_log); 2389 audio_source_provider, message_loop_factory, media_stream_impl_,
2390 render_media_log);
2389 } 2391 }
2390 return media_player; 2392 return media_player;
2391 } 2393 }
2392 2394
2393 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost( 2395 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost(
2394 WebFrame* frame, WebApplicationCacheHostClient* client) { 2396 WebFrame* frame, WebApplicationCacheHostClient* client) {
2395 if (!frame || !frame->view()) 2397 if (!frame || !frame->view())
2396 return NULL; 2398 return NULL;
2397 return new RendererWebApplicationCacheHostImpl( 2399 return new RendererWebApplicationCacheHostImpl(
2398 FromWebView(frame->view()), client, 2400 FromWebView(frame->view()), client,
(...skipping 3271 matching lines...) Expand 10 before | Expand all | Expand 10 after
5670 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5672 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5671 return !!RenderThreadImpl::current()->compositor_thread(); 5673 return !!RenderThreadImpl::current()->compositor_thread();
5672 } 5674 }
5673 5675
5674 void RenderViewImpl::OnJavaBridgeInit() { 5676 void RenderViewImpl::OnJavaBridgeInit() {
5675 DCHECK(!java_bridge_dispatcher_); 5677 DCHECK(!java_bridge_dispatcher_);
5676 #if defined(ENABLE_JAVA_BRIDGE) 5678 #if defined(ENABLE_JAVA_BRIDGE)
5677 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); 5679 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
5678 #endif 5680 #endif
5679 } 5681 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698