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

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: 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 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 2366 matching lines...) Expand 10 before | Expand all | Expand 10 after
2377 collection->AddVideoDecoder(new media::GpuVideoDecoder( 2377 collection->AddVideoDecoder(new media::GpuVideoDecoder(
2378 message_loop_factory->GetMessageLoop("GpuVideoDecoder"), 2378 message_loop_factory->GetMessageLoop("GpuVideoDecoder"),
2379 factories_loop, 2379 factories_loop,
2380 new RendererGpuVideoDecoderFactories( 2380 new RendererGpuVideoDecoderFactories(
2381 gpu_channel_host, factories_loop, context3d))); 2381 gpu_channel_host, factories_loop, context3d)));
2382 } 2382 }
2383 2383
2384 WebMediaPlayer* media_player = 2384 WebMediaPlayer* media_player =
2385 content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( 2385 content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
2386 this, frame, client, AsWeakPtr(), collection, audio_source_provider, 2386 this, frame, client, AsWeakPtr(), collection, audio_source_provider,
2387 message_loop_factory, media_stream_impl_, render_media_log); 2387 audio_source_provider, message_loop_factory, media_stream_impl_,
2388 render_media_log);
2388 if (!media_player) { 2389 if (!media_player) {
2389 media_player = new webkit_media::WebMediaPlayerImpl( 2390 media_player = new webkit_media::WebMediaPlayerImpl(
2390 frame, client, AsWeakPtr(), collection, audio_source_provider, 2391 frame, client, AsWeakPtr(), collection, audio_source_provider,
2391 message_loop_factory, media_stream_impl_, render_media_log); 2392 audio_source_provider, message_loop_factory, media_stream_impl_,
2393 render_media_log);
2392 } 2394 }
2393 return media_player; 2395 return media_player;
2394 } 2396 }
2395 2397
2396 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost( 2398 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost(
2397 WebFrame* frame, WebApplicationCacheHostClient* client) { 2399 WebFrame* frame, WebApplicationCacheHostClient* client) {
2398 if (!frame || !frame->view()) 2400 if (!frame || !frame->view())
2399 return NULL; 2401 return NULL;
2400 return new RendererWebApplicationCacheHostImpl( 2402 return new RendererWebApplicationCacheHostImpl(
2401 FromWebView(frame->view()), client, 2403 FromWebView(frame->view()), client,
(...skipping 3281 matching lines...) Expand 10 before | Expand all | Expand 10 after
5683 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5685 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5684 return !!RenderThreadImpl::current()->compositor_thread(); 5686 return !!RenderThreadImpl::current()->compositor_thread();
5685 } 5687 }
5686 5688
5687 void RenderViewImpl::OnJavaBridgeInit() { 5689 void RenderViewImpl::OnJavaBridgeInit() {
5688 DCHECK(!java_bridge_dispatcher_); 5690 DCHECK(!java_bridge_dispatcher_);
5689 #if defined(ENABLE_JAVA_BRIDGE) 5691 #if defined(ENABLE_JAVA_BRIDGE)
5690 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); 5692 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
5691 #endif 5693 #endif
5692 } 5694 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698