Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/prerender/prerender_webmediaplayer.h" | 5 #include "chrome/renderer/prerender/prerender_webmediaplayer.h" |
| 6 | 6 |
| 7 #include "chrome/common/render_messages.h" | 7 #include "chrome/common/render_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_impl.h" | 11 #include "media/base/pipeline_impl.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::WebMediaPlayerClient* client, | 19 WebKit::WebMediaPlayerClient* client, |
| 20 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, | 20 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, |
| 21 media::FilterCollection* collection, | 21 media::FilterCollection* collection, |
| 22 media::MessageLoopFactory* message_loop_factory, | 22 media::MessageLoopFactory* message_loop_factory, |
| 23 webkit_media::MediaStreamClient* media_stream_client, | 23 webkit_media::MediaStreamClient* media_stream_client, |
| 24 media::MediaLog* media_log) | 24 media::MediaLog* media_log) |
| 25 : RenderViewObserver(render_view), | 25 : RenderViewObserver(render_view), |
| 26 WebMediaPlayerImpl(client, | 26 WebMediaPlayerImpl(client, |
| 27 delegate, | 27 delegate, |
| 28 collection, | 28 collection, |
| 29 NULL, // audio callback | |
|
tommi (sloooow) - chröme
2011/12/19 15:26:24
nit: two spaces before //
Chris Rogers
2011/12/19 21:40:35
Done.
| |
| 29 message_loop_factory, | 30 message_loop_factory, |
| 30 media_stream_client, | 31 media_stream_client, |
| 31 media_log), | 32 media_log), |
| 32 is_prerendering_(true), | 33 is_prerendering_(true), |
| 33 url_loaded_(false) { | 34 url_loaded_(false) { |
| 34 } | 35 } |
| 35 | 36 |
| 36 PrerenderWebMediaPlayer::~PrerenderWebMediaPlayer() {} | 37 PrerenderWebMediaPlayer::~PrerenderWebMediaPlayer() {} |
| 37 | 38 |
| 38 void PrerenderWebMediaPlayer::load(const WebKit::WebURL& url) { | 39 void PrerenderWebMediaPlayer::load(const WebKit::WebURL& url) { |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 67 // that enables prerendering. | 68 // that enables prerendering. |
| 68 DCHECK(!is_prerendering); | 69 DCHECK(!is_prerendering); |
| 69 if (is_prerendering_ && !is_prerendering) { | 70 if (is_prerendering_ && !is_prerendering) { |
| 70 is_prerendering_ = false; | 71 is_prerendering_ = false; |
| 71 if (url_to_load_.get()) | 72 if (url_to_load_.get()) |
| 72 load(*url_to_load_); | 73 load(*url_to_load_); |
| 73 } | 74 } |
| 74 } | 75 } |
| 75 | 76 |
| 76 } // namespace prerender | 77 } // namespace prerender |
| OLD | NEW |