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

Side by Side Diff: content/renderer/media/webmediaplayer_impl.h

Issue 443393002: Stop using WebMediaPlayerClient::preload() and volume() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
« no previous file with comments | « no previous file | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 // Returns the current video frame from |compositor_|. Blocks until the 232 // Returns the current video frame from |compositor_|. Blocks until the
233 // compositor can return the frame. 233 // compositor can return the frame.
234 scoped_refptr<media::VideoFrame> GetCurrentFrameFromCompositor(); 234 scoped_refptr<media::VideoFrame> GetCurrentFrameFromCompositor();
235 235
236 blink::WebLocalFrame* frame_; 236 blink::WebLocalFrame* frame_;
237 237
238 // TODO(hclam): get rid of these members and read from the pipeline directly. 238 // TODO(hclam): get rid of these members and read from the pipeline directly.
239 blink::WebMediaPlayer::NetworkState network_state_; 239 blink::WebMediaPlayer::NetworkState network_state_;
240 blink::WebMediaPlayer::ReadyState ready_state_; 240 blink::WebMediaPlayer::ReadyState ready_state_;
241 241
242 // Preload state for when |data_source_| is created after setPreload().
243 content::Preload preload_;
244
242 // Message loops for posting tasks on Chrome's main thread. Also used 245 // Message loops for posting tasks on Chrome's main thread. Also used
243 // for DCHECKs so methods calls won't execute in the wrong thread. 246 // for DCHECKs so methods calls won't execute in the wrong thread.
244 const scoped_refptr<base::MessageLoopProxy> main_loop_; 247 const scoped_refptr<base::MessageLoopProxy> main_loop_;
245 248
246 scoped_refptr<base::MessageLoopProxy> media_loop_; 249 scoped_refptr<base::MessageLoopProxy> media_loop_;
247 scoped_refptr<media::MediaLog> media_log_; 250 scoped_refptr<media::MediaLog> media_log_;
248 media::Pipeline pipeline_; 251 media::Pipeline pipeline_;
249 252
250 // The currently selected key system. Empty string means that no key system 253 // The currently selected key system. Empty string means that no key system
251 // has been selected. 254 // has been selected.
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 WebContentDecryptionModuleImpl* web_cdm_; 341 WebContentDecryptionModuleImpl* web_cdm_;
339 342
340 media::DecryptorReadyCB decryptor_ready_cb_; 343 media::DecryptorReadyCB decryptor_ready_cb_;
341 344
342 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 345 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
343 }; 346 };
344 347
345 } // namespace content 348 } // namespace content
346 349
347 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 350 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698