summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorvrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-30 17:18:10 +0000
committervrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-30 17:18:10 +0000
commit3bf9dc8661c93154d61b9f8905d6df53e5c48768 (patch)
treebfd627ea25b1c705ed41ebf86abc689479145dcb /webkit
parent9fdc2fd095ab601356c6912b6b31e77ad7b5ce22 (diff)
downloadchromium_src-3bf9dc8661c93154d61b9f8905d6df53e5c48768.zip
chromium_src-3bf9dc8661c93154d61b9f8905d6df53e5c48768.tar.gz
chromium_src-3bf9dc8661c93154d61b9f8905d6df53e5c48768.tar.bz2
This is the last part of changing the buffered() function prototype: getting rid of the old, unused buffered() const prototype.
BUG=none TEST=media_unittests Review URL: http://codereview.chromium.org/2858022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webmediaplayer_impl.cc7
-rw-r--r--webkit/glue/webmediaplayer_impl.h4
2 files changed, 0 insertions, 11 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index 78a525c..51d67ab 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -436,13 +436,6 @@ int WebMediaPlayerImpl::dataRate() const {
return 0;
}
-// This will be deleted once the WebKit::WebMediaPlayer interface is updated.
-const WebKit::WebTimeRanges& WebMediaPlayerImpl::buffered() const {
- DCHECK(MessageLoop::current() == main_loop_);
-
- return buffered_;
-}
-
const WebKit::WebTimeRanges& WebMediaPlayerImpl::buffered() {
DCHECK(MessageLoop::current() == main_loop_);
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h
index f561866e..42844ea 100644
--- a/webkit/glue/webmediaplayer_impl.h
+++ b/webkit/glue/webmediaplayer_impl.h
@@ -190,10 +190,6 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,
virtual bool setAutoBuffer(bool autoBuffer);
virtual bool totalBytesKnown();
virtual const WebKit::WebTimeRanges& buffered();
- // This is the prototype for the function we are replacing with the
- // non-const version, but we keep it in so that we don't have to do a
- // two-sided commit.
- virtual const WebKit::WebTimeRanges& buffered() const;
virtual float maxTimeSeekable() const;
// Methods for painting.