summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolenetz@chromium.org <wolenetz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-03 19:43:59 +0000
committerwolenetz@chromium.org <wolenetz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-03 19:43:59 +0000
commit6dbbaa2bd49d9796faccb96f0d19424705f37048 (patch)
tree8358f295ff345c612b931541f0afd6de70e8c575
parent25563e2d835a044e21151b4db0fd41197a96b610 (diff)
downloadchromium_src-6dbbaa2bd49d9796faccb96f0d19424705f37048.zip
chromium_src-6dbbaa2bd49d9796faccb96f0d19424705f37048.tar.gz
chromium_src-6dbbaa2bd49d9796faccb96f0d19424705f37048.tar.bz2
Remove OVERRIDEs from WebSourceBufferImpl
Removes OVERRIDEs for this Chromium implementation of a Blink interface. Discussion revealed this is allowed (and preferred), to reduce cross-repo API change difficulties. Also removes TODOs related to some pending OVERRIDE additions (see the referenced bugs). Though the Blink changes have landed, OVERRIDE is undesired. R=acolwell@chromium.org BUG=166465,229408 Review URL: https://codereview.chromium.org/123483002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242912 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/renderer/media/websourcebuffer_impl.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/content/renderer/media/websourcebuffer_impl.h b/content/renderer/media/websourcebuffer_impl.h
index abfec40..2daf9c0 100644
--- a/content/renderer/media/websourcebuffer_impl.h
+++ b/content/renderer/media/websourcebuffer_impl.h
@@ -23,16 +23,14 @@ class WebSourceBufferImpl : public blink::WebSourceBuffer {
virtual ~WebSourceBufferImpl();
// blink::WebSourceBuffer implementation.
- virtual blink::WebTimeRanges buffered() OVERRIDE;
- virtual void append(const unsigned char* data, unsigned length) OVERRIDE;
- virtual void abort() OVERRIDE;
- // TODO(acolwell): Add OVERRIDE when Blink-side changes land.
+ virtual blink::WebTimeRanges buffered();
+ virtual void append(const unsigned char* data, unsigned length);
+ virtual void abort();
virtual void remove(double start, double end);
- virtual bool setTimestampOffset(double offset) OVERRIDE;
- // TODO(acolwell): Add OVERRIDE when Blink-side changes land.
+ virtual bool setTimestampOffset(double offset);
virtual void setAppendWindowStart(double start);
virtual void setAppendWindowEnd(double end);
- virtual void removedFromMediaSource() OVERRIDE;
+ virtual void removedFromMediaSource();
private:
std::string id_;