diff options
| author | Steve Block <steveblock@google.com> | 2009-10-12 13:15:31 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:45:07 +0100 |
| commit | 10170b704c29772ec6c3fd4d7d19bdbae694dd4f (patch) | |
| tree | a6404769a1419a150ae12219d266d408558a42df /WebKit/android | |
| parent | bd6026bd45e3421253a3bcdbaf61a4f7c08476ea (diff) | |
| download | external_webkit-10170b704c29772ec6c3fd4d7d19bdbae694dd4f.zip external_webkit-10170b704c29772ec6c3fd4d7d19bdbae694dd4f.tar.gz external_webkit-10170b704c29772ec6c3fd4d7d19bdbae694dd4f.tar.bz2 | |
Merge webkit.org at R49305 : MediaPlayerPrivate::maxTimeBuffered renamed to buffered.
See http://trac.webkit.org/changeset/48267
Change-Id: I29156a62ece53de135a730a21e0337e4e4b57bed
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp index 5ca6e83..86d0e36 100644 --- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp +++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp @@ -30,6 +30,7 @@ #include "GraphicsContext.h" #include "MediaPlayerPrivateAndroid.h" #include "SkiaUtils.h" +#include "TimeRanges.h" #include "WebCoreJni.h" #include "WebViewCore.h" #include "jni_utility.h" @@ -182,9 +183,9 @@ float MediaPlayerPrivate::maxTimeSeekable() const return 0; } -float MediaPlayerPrivate::maxTimeBuffered() const +PassRefPtr<TimeRanges> MediaPlayerPrivate::buffered() const { - return 0; + return TimeRanges::create(); } int MediaPlayerPrivate::dataRate() const |