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

Side by Side Diff: chrome/renderer/prerender/prerender_webmediaplayer.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/prerender/prerender_webmediaplayer.h" 5 #include "chrome/renderer/prerender/prerender_webmediaplayer.h"
6 6
7 #include "chrome/common/prerender_messages.h" 7 #include "chrome/common/prerender_messages.h"
8 #include "content/public/renderer/render_view.h" 8 #include "content/public/renderer/render_view.h"
9 #include "media/base/filter_collection.h" 9 #include "media/base/filter_collection.h"
10 #include "media/base/media_log.h" 10 #include "media/base/media_log.h"
11 #include "media/base/pipeline.h" 11 #include "media/base/pipeline.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" 12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
13 #include "webkit/media/webmediaplayer_delegate.h" 13 #include "webkit/media/webmediaplayer_delegate.h"
14 14
15 namespace prerender { 15 namespace prerender {
16 16
17 PrerenderWebMediaPlayer::PrerenderWebMediaPlayer( 17 PrerenderWebMediaPlayer::PrerenderWebMediaPlayer(
18 content::RenderView* render_view, 18 content::RenderView* render_view,
19 WebKit::WebFrame* frame, 19 WebKit::WebFrame* frame,
20 WebKit::WebMediaPlayerClient* client, 20 WebKit::WebMediaPlayerClient* client,
21 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, 21 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
22 media::FilterCollection* collection, 22 media::FilterCollection* collection,
23 WebKit::WebAudioSourceProvider* audio_source_provider, 23 WebKit::WebAudioSourceProvider* audio_source_provider,
24 media::AudioRendererSink* audio_renderer_sink,
24 media::MessageLoopFactory* message_loop_factory, 25 media::MessageLoopFactory* message_loop_factory,
25 webkit_media::MediaStreamClient* media_stream_client, 26 webkit_media::MediaStreamClient* media_stream_client,
26 media::MediaLog* media_log) 27 media::MediaLog* media_log)
27 : RenderViewObserver(render_view), 28 : RenderViewObserver(render_view),
28 WebMediaPlayerImpl(frame, 29 WebMediaPlayerImpl(frame,
29 client, 30 client,
30 delegate, 31 delegate,
31 collection, 32 collection,
32 audio_source_provider, 33 audio_source_provider,
34 audio_renderer_sink,
33 message_loop_factory, 35 message_loop_factory,
34 media_stream_client, 36 media_stream_client,
35 media_log), 37 media_log),
36 is_prerendering_(true), 38 is_prerendering_(true),
37 url_loaded_(false), 39 url_loaded_(false),
38 cors_mode_(CORSModeUnspecified) { 40 cors_mode_(CORSModeUnspecified) {
39 } 41 }
40 42
41 PrerenderWebMediaPlayer::~PrerenderWebMediaPlayer() {} 43 PrerenderWebMediaPlayer::~PrerenderWebMediaPlayer() {}
42 44
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 // that enables prerendering. 77 // that enables prerendering.
76 DCHECK(!is_prerendering); 78 DCHECK(!is_prerendering);
77 if (is_prerendering_ && !is_prerendering) { 79 if (is_prerendering_ && !is_prerendering) {
78 is_prerendering_ = false; 80 is_prerendering_ = false;
79 if (url_to_load_.get()) 81 if (url_to_load_.get())
80 load(*url_to_load_, cors_mode_); 82 load(*url_to_load_, cors_mode_);
81 } 83 }
82 } 84 }
83 85
84 } // namespace prerender 86 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/renderer/prerender/prerender_webmediaplayer.h ('k') | content/public/renderer/content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698