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

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

Issue 282373004: Remove by-reference implementations of blink::WebMediaPlayer::buffered() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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
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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 CORSMode cors_mode); 80 CORSMode cors_mode);
81 81
82 // Playback controls. 82 // Playback controls.
83 virtual void play(); 83 virtual void play();
84 virtual void pause(); 84 virtual void pause();
85 virtual bool supportsSave() const; 85 virtual bool supportsSave() const;
86 virtual void seek(double seconds); 86 virtual void seek(double seconds);
87 virtual void setRate(double rate); 87 virtual void setRate(double rate);
88 virtual void setVolume(double volume); 88 virtual void setVolume(double volume);
89 virtual void setPreload(blink::WebMediaPlayer::Preload preload); 89 virtual void setPreload(blink::WebMediaPlayer::Preload preload);
90 virtual const blink::WebTimeRanges& buffered();
91 virtual blink::WebTimeRanges buffered() const; 90 virtual blink::WebTimeRanges buffered() const;
92 virtual double maxTimeSeekable() const; 91 virtual double maxTimeSeekable() const;
93 92
94 // Methods for painting. 93 // Methods for painting.
95 virtual void paint(blink::WebCanvas* canvas, 94 virtual void paint(blink::WebCanvas* canvas,
96 const blink::WebRect& rect, 95 const blink::WebRect& rect,
97 unsigned char alpha); 96 unsigned char alpha);
98 97
99 // True if the loaded media has a playable video/audio track. 98 // True if the loaded media has a playable video/audio track.
100 virtual bool hasVideo() const; 99 virtual bool hasVideo() const;
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 // |data_source_| is used for regular resource loads. 319 // |data_source_| is used for regular resource loads.
321 // |chunk_demuxer_| is used for Media Source resource loads. 320 // |chunk_demuxer_| is used for Media Source resource loads.
322 // 321 //
323 // |demuxer_| will contain the appropriate demuxer based on which resource 322 // |demuxer_| will contain the appropriate demuxer based on which resource
324 // load strategy we're using. 323 // load strategy we're using.
325 scoped_ptr<BufferedDataSource> data_source_; 324 scoped_ptr<BufferedDataSource> data_source_;
326 scoped_ptr<media::Demuxer> demuxer_; 325 scoped_ptr<media::Demuxer> demuxer_;
327 media::ChunkDemuxer* chunk_demuxer_; 326 media::ChunkDemuxer* chunk_demuxer_;
328 327
329 BufferedDataSourceHostImpl buffered_data_source_host_; 328 BufferedDataSourceHostImpl buffered_data_source_host_;
330 // TODO(sandersd): Remove this cache. http://crbug.com/360254
331 blink::WebTimeRanges buffered_web_time_ranges_;
332 329
333 // Temporary for EME v0.1. In the future the init data type should be passed 330 // Temporary for EME v0.1. In the future the init data type should be passed
334 // through GenerateKeyRequest() directly from WebKit. 331 // through GenerateKeyRequest() directly from WebKit.
335 std::string init_data_type_; 332 std::string init_data_type_;
336 333
337 // Video rendering members. 334 // Video rendering members.
338 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; 335 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
339 VideoFrameCompositor* compositor_; // Deleted on |compositor_task_runner_|. 336 VideoFrameCompositor* compositor_; // Deleted on |compositor_task_runner_|.
340 media::SkCanvasVideoRenderer skcanvas_video_renderer_; 337 media::SkCanvasVideoRenderer skcanvas_video_renderer_;
341 338
(...skipping 12 matching lines...) Expand all
354 WebContentDecryptionModuleImpl* web_cdm_; 351 WebContentDecryptionModuleImpl* web_cdm_;
355 352
356 media::DecryptorReadyCB decryptor_ready_cb_; 353 media::DecryptorReadyCB decryptor_ready_cb_;
357 354
358 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 355 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
359 }; 356 };
360 357
361 } // namespace content 358 } // namespace content
362 359
363 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 360 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698