diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 16:28:55 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 10:37:19 +0100 |
| commit | 7f5ad71c769697c27d049e0006e5086d5461ea54 (patch) | |
| tree | 94081a7732159d8e1e43e8ff74aa44c71fdf41c9 /Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | |
| parent | d591474a98e82c78f1c85464d9c77b67cfa7d059 (diff) | |
| download | external_webkit-7f5ad71c769697c27d049e0006e5086d5461ea54.zip external_webkit-7f5ad71c769697c27d049e0006e5086d5461ea54.tar.gz external_webkit-7f5ad71c769697c27d049e0006e5086d5461ea54.tar.bz2 | |
Merge WebKit at r80534: Fix MediaPlayerPrivateAndroid.cpp
Update for MedaEngineRegistrar change.
See http://trac.webkit.org/changeset/80473
Change-Id: I3931805339b8b66b371db01f3823daba2cedf56f
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp index 0a4acad..1e51989 100644 --- a/Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp +++ b/Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp @@ -88,7 +88,7 @@ MediaPlayerPrivate::~MediaPlayerPrivate() void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar) { - registrar(create, getSupportedTypes, supportsType); + registrar(create, getSupportedTypes, supportsType, 0, 0, 0); } MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String& type, const String& codecs) |