From 10170b704c29772ec6c3fd4d7d19bdbae694dd4f Mon Sep 17 00:00:00 2001 From: Steve Block Date: Mon, 12 Oct 2009 13:15:31 +0100 Subject: [PATCH] Merge webkit.org at R49305 : MediaPlayerPrivate::maxTimeBuffered renamed to buffered. See http://trac.webkit.org/changeset/48267 Change-Id: I29156a62ece53de135a730a21e0337e4e4b57bed --- WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h | 2 +- WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h b/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h index 812a33768..7971fa670 100644 --- a/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h +++ b/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h @@ -69,7 +69,7 @@ public: virtual MediaPlayer::ReadyState readyState() const; virtual float maxTimeSeekable() const; - virtual float maxTimeBuffered() const; + virtual PassRefPtr buffered() const; virtual int dataRate() const; diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp index 5ca6e83b2..86d0e36b0 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 MediaPlayerPrivate::buffered() const { - return 0; + return TimeRanges::create(); } int MediaPlayerPrivate::dataRate() const -- 2.11.0