diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2015-11-13 19:13:50 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2015-11-30 17:11:41 +0000 |
| commit | efdef9af5d93caaf1a3c370ced459fb915421b2c (patch) | |
| tree | 052d760615289964d5ddbb1a86bdc4cfc51cbf36 | |
| parent | 0be00760419a4eccdeea7828499d9fb47fc4bbad (diff) | |
| download | qtwebkit-efdef9af5d93caaf1a3c370ced459fb915421b2c.tar.gz | |
Fixed build with enabled --media-source.
This is enough to trick http://youtube/tv into loading (it blocks UAs
without MediaSource).
Change-Id: I7163c8ef65cbbe65c23deb84ad2e4d5300f41cf2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp | 2 | ||||
| -rw-r--r-- | Source/WebCore/WebCore.pri | 1 | ||||
| -rw-r--r-- | Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp | 9 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp b/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp index 1c6267467..45459df92 100644 --- a/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp +++ b/Source/WebCore/Modules/mediasource/MediaSourceRegistry.cpp @@ -72,7 +72,7 @@ void MediaSourceRegistry::unregisterMediaSourceURL(const KURL& url) MediaSource* MediaSourceRegistry::lookupMediaSource(const String& url) { ASSERT(isMainThread()); - return m_mediaSources.get(url).get(); + return m_mediaSources.get(url); } } // namespace WebCore diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index ffe389d46..a9b08d0b8 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -16,6 +16,7 @@ INCLUDEPATH += \ $$SOURCE_DIR/Modules/filesystem \ $$SOURCE_DIR/Modules/geolocation \ $$SOURCE_DIR/Modules/indexeddb \ + $$SOURCE_DIR/Modules/mediasource \ $$SOURCE_DIR/Modules/navigatorcontentutils \ $$SOURCE_DIR/Modules/notifications \ $$SOURCE_DIR/Modules/proximity \ diff --git a/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp b/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp index 8d167c7b5..aeff0c01d 100644 --- a/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp +++ b/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp @@ -29,6 +29,7 @@ #include "config.h" #include "MIMETypeRegistry.h" +#include "NotImplemented.h" #include <QMimeDatabase> #include <wtf/Assertions.h> #include <wtf/MainThread.h> @@ -143,4 +144,12 @@ bool MIMETypeRegistry::isApplicationPluginMIMEType(const String& mimeType) || mimeType.startsWith("application/x-qt-styled-widget", false); } +#if ENABLE(MEDIA_SOURCE) +bool MIMETypeRegistry::isSupportedMediaSourceMIMEType(const String&, const String&) +{ + notImplemented(); + return false; +} +#endif + } |