diff options
| author | Steve Block <steveblock@google.com> | 2009-10-12 13:10:48 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:45:10 +0100 |
| commit | 52fc9e2feca3d1509acadbb04272896814078e22 (patch) | |
| tree | 08b5c3abf1dd0bbc14540e5df93a951c11aea6c3 | |
| parent | 6d0ea8657f54a650eefa9438bf9e2f4c0709b534 (diff) | |
| download | external_webkit-52fc9e2feca3d1509acadbb04272896814078e22.zip external_webkit-52fc9e2feca3d1509acadbb04272896814078e22.tar.gz external_webkit-52fc9e2feca3d1509acadbb04272896814078e22.tar.bz2 | |
Merge webkit.org at R49305 : Stubs out new MediaPlayerPrivate::hasAudio method.
See http://trac.webkit.org/changeset/47515
Change-Id: I18d3991e84c1a5760f736d04e16e1a195d5de283
| -rw-r--r-- | WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h | 1 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h b/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h index 7971fa6..fa33d09 100644 --- a/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h +++ b/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h @@ -48,6 +48,7 @@ public: virtual IntSize naturalSize() const; + virtual bool hasAudio() const; virtual bool hasVideo() const; virtual void setVisible(bool); diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp index 86d0e36..6c9ea49 100644 --- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp +++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp @@ -113,6 +113,12 @@ IntSize MediaPlayerPrivate::naturalSize() const return m_naturalSize; } +bool MediaPlayerPrivate::hasAudio() const +{ + // TODO + return false; +} + bool MediaPlayerPrivate::hasVideo() const { return false; |