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

Side by Side Diff: chrome/renderer/prerender/prerender_webmediaplayer.cc

Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 1 month 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
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::AudioRendererSink* audio_renderer_sink,
25 media::MessageLoopFactory* message_loop_factory, 25 media::MessageLoopFactory* message_loop_factory,
26 webkit_media::MediaStreamClient* media_stream_client, 26 webkit_media::MediaStreamClient* media_stream_client,
27 bool encrypted_media_enabled,
27 media::MediaLog* media_log) 28 media::MediaLog* media_log)
28 : RenderViewObserver(render_view), 29 : RenderViewObserver(render_view),
29 WebMediaPlayerImpl(frame, 30 WebMediaPlayerImpl(frame,
30 client, 31 client,
31 delegate, 32 delegate,
32 collection, 33 collection,
33 audio_source_provider, 34 audio_source_provider,
34 audio_renderer_sink, 35 audio_renderer_sink,
35 message_loop_factory, 36 message_loop_factory,
36 media_stream_client, 37 media_stream_client,
38 encrypted_media_enabled,
37 media_log), 39 media_log),
38 is_prerendering_(true), 40 is_prerendering_(true),
39 url_loaded_(false), 41 url_loaded_(false),
40 cors_mode_(CORSModeUnspecified) { 42 cors_mode_(CORSModeUnspecified) {
41 } 43 }
42 44
43 PrerenderWebMediaPlayer::~PrerenderWebMediaPlayer() {} 45 PrerenderWebMediaPlayer::~PrerenderWebMediaPlayer() {}
44 46
45 void PrerenderWebMediaPlayer::load(const WebKit::WebURL& url, 47 void PrerenderWebMediaPlayer::load(const WebKit::WebURL& url,
46 CORSMode cors_mode) { 48 CORSMode cors_mode) {
(...skipping 30 matching lines...) Expand all
77 // that enables prerendering. 79 // that enables prerendering.
78 DCHECK(!is_prerendering); 80 DCHECK(!is_prerendering);
79 if (is_prerendering_ && !is_prerendering) { 81 if (is_prerendering_ && !is_prerendering) {
80 is_prerendering_ = false; 82 is_prerendering_ = false;
81 if (url_to_load_.get()) 83 if (url_to_load_.get())
82 load(*url_to_load_, cors_mode_); 84 load(*url_to_load_, cors_mode_);
83 } 85 }
84 } 86 }
85 87
86 } // namespace prerender 88 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698