OSDN Git Service

Merge webkit.org at R49305 : MediaPlayerPrivate::maxTimeBuffered renamed to buffered.
authorSteve Block <steveblock@google.com>
Mon, 12 Oct 2009 12:15:31 +0000 (13:15 +0100)
committerSteve Block <steveblock@google.com>
Mon, 19 Oct 2009 23:45:07 +0000 (00:45 +0100)
commit10170b704c29772ec6c3fd4d7d19bdbae694dd4f
treea6404769a1419a150ae12219d266d408558a42df
parentbd6026bd45e3421253a3bcdbaf61a4f7c08476ea
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
WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp