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

Side by Side Diff: webkit/glue/media/buffered_data_source.h

Issue 8539047: Add OVERRIDE to webkit/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 9 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 | Annotate | Revision Log
« no previous file with comments | « webkit/fileapi/sandbox_mount_point_provider.h ('k') | webkit/glue/media/simple_data_source.h » ('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 (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 #ifndef WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_ 5 #ifndef WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_
6 #define WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_ 6 #define WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 20 matching lines...) Expand all
31 media::MediaLog* media_log, 31 media::MediaLog* media_log,
32 const WebDataSourceBuildObserverHack& build_observer); 32 const WebDataSourceBuildObserverHack& build_observer);
33 33
34 BufferedDataSource(MessageLoop* render_loop, 34 BufferedDataSource(MessageLoop* render_loop,
35 WebKit::WebFrame* frame, 35 WebKit::WebFrame* frame,
36 media::MediaLog* media_log); 36 media::MediaLog* media_log);
37 37
38 virtual ~BufferedDataSource(); 38 virtual ~BufferedDataSource();
39 39
40 // media::Filter implementation. 40 // media::Filter implementation.
41 virtual void set_host(media::FilterHost* host); 41 virtual void set_host(media::FilterHost* host) OVERRIDE;
42 virtual void Stop(const base::Closure& callback); 42 virtual void Stop(const base::Closure& callback) OVERRIDE;
43 virtual void SetPlaybackRate(float playback_rate); 43 virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
44 44
45 // media::DataSource implementation. 45 // media::DataSource implementation.
46 // Called from demuxer thread. 46 // Called from demuxer thread.
47 virtual void Read(int64 position, size_t size, 47 virtual void Read(
48 uint8* data, 48 int64 position,
49 const media::DataSource::ReadCallback& read_callback); 49 size_t size,
50 virtual bool GetSize(int64* size_out); 50 uint8* data,
51 virtual bool IsStreaming(); 51 const media::DataSource::ReadCallback& read_callback) OVERRIDE;
52 virtual void SetPreload(media::Preload preload); 52 virtual bool GetSize(int64* size_out) OVERRIDE;
53 virtual void SetBitrate(int bitrate); 53 virtual bool IsStreaming() OVERRIDE;
54 virtual void SetPreload(media::Preload preload) OVERRIDE;
55 virtual void SetBitrate(int bitrate) OVERRIDE;
54 56
55 // webkit_glue::WebDataSource implementation. 57 // webkit_glue::WebDataSource implementation.
56 virtual void Initialize(const std::string& url, 58 virtual void Initialize(const std::string& url,
57 const media::PipelineStatusCB& callback); 59 const media::PipelineStatusCB& callback) OVERRIDE;
58 virtual void CancelInitialize(); 60 virtual void CancelInitialize() OVERRIDE;
59 virtual bool HasSingleOrigin(); 61 virtual bool HasSingleOrigin() OVERRIDE;
60 virtual void Abort(); 62 virtual void Abort() OVERRIDE;
61 63
62 protected: 64 protected:
63 // A factory method to create a BufferedResourceLoader based on the read 65 // A factory method to create a BufferedResourceLoader based on the read
64 // parameters. We can override this file to object a mock 66 // parameters. We can override this file to object a mock
65 // BufferedResourceLoader for testing. 67 // BufferedResourceLoader for testing.
66 virtual BufferedResourceLoader* CreateResourceLoader( 68 virtual BufferedResourceLoader* CreateResourceLoader(
67 int64 first_byte_position, int64 last_byte_position); 69 int64 first_byte_position, int64 last_byte_position);
68 70
69 private: 71 private:
70 friend class BufferedDataSourceTest2; 72 friend class BufferedDataSourceTest2;
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 float playback_rate_; 226 float playback_rate_;
225 227
226 scoped_refptr<media::MediaLog> media_log_; 228 scoped_refptr<media::MediaLog> media_log_;
227 229
228 DISALLOW_COPY_AND_ASSIGN(BufferedDataSource); 230 DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
229 }; 231 };
230 232
231 } // namespace webkit_glue 233 } // namespace webkit_glue
232 234
233 #endif // WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_ 235 #endif // WEBKIT_GLUE_MEDIA_BUFFERED_DATA_SOURCE_H_
OLDNEW
« no previous file with comments | « webkit/fileapi/sandbox_mount_point_provider.h ('k') | webkit/glue/media/simple_data_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698