Changeset 83108 in webkit
- Timestamp:
- Apr 6, 2011 3:17:11 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r83105 r83108 1 2011-04-06 Alexis Menard <alexis.menard@openbossa.org> 2 3 Reviewed by Andreas Kling. 4 5 [Qt] We should use USE(QT_MULTIMEDIA) rather than ENABLE(QT_MULTIMEDIA). 6 https://bugs.webkit.org/show_bug.cgi?id=57974 7 8 We should use USE(QT_MULTIMEDIA) rather than ENABLE(QT_MULTIMEDIA). 9 10 No new tests needed, just a config flag rename. 11 12 * features.pri: 13 1 14 2011-04-06 Tyler Close <tjclose@chromium.org> 2 15 -
trunk/Source/WebCore/features.pri
r80720 r83108 164 164 DEFINES -= ENABLE_VIDEO=0 165 165 DEFINES += ENABLE_VIDEO=1 166 DEFINES -= ENABLE_QT_MULTIMEDIA=1167 DEFINES += ENABLE_QT_MULTIMEDIA=0166 DEFINES -= WTF_USE_QT_MULTIMEDIA=1 167 DEFINES += WTF_USE_QT_MULTIMEDIA=0 168 168 } else:contains(MOBILITY_CONFIG, multimedia) { 169 169 DEFINES -= ENABLE_VIDEO=0 170 170 DEFINES += ENABLE_VIDEO=1 171 DEFINES -= ENABLE_QT_MULTIMEDIA=0172 DEFINES += ENABLE_QT_MULTIMEDIA=1171 DEFINES -= WTF_USE_QT_MULTIMEDIA=0 172 DEFINES += WTF_USE_QT_MULTIMEDIA=1 173 173 } else:contains(QT_CONFIG, phonon) { 174 174 DEFINES -= ENABLE_VIDEO=0 175 175 DEFINES += ENABLE_VIDEO=1 176 DEFINES -= ENABLE_QT_MULTIMEDIA=1177 DEFINES += ENABLE_QT_MULTIMEDIA=0176 DEFINES -= WTF_USE_QT_MULTIMEDIA=1 177 DEFINES += WTF_USE_QT_MULTIMEDIA=0 178 178 } 179 179 } -
trunk/Source/WebKit/qt/Api/qwebkitplatformplugin.h
r82075 r83108 30 30 #include <QObject> 31 31 #include <QUrl> 32 #if defined( ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA32 #if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA 33 33 #include <QMediaPlayer> 34 34 #endif … … 124 124 }; 125 125 126 #if defined( ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA126 #if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA 127 127 class QWebFullScreenVideoHandler : public QObject { 128 128 Q_OBJECT -
trunk/Source/WebKit/qt/ChangeLog
r83078 r83108 1 2011-04-06 Alexis Menard <alexis.menard@openbossa.org> 2 3 Reviewed by Andreas Kling. 4 5 [Qt] We should use USE(QT_MULTIMEDIA) rather than ENABLE(QT_MULTIMEDIA). 6 https://bugs.webkit.org/show_bug.cgi?id=57974 7 8 We should use USE(QT_MULTIMEDIA) rather than ENABLE(QT_MULTIMEDIA). 9 10 No new tests needed, just a config flag rename. 11 12 * Api/qwebkitplatformplugin.h: 13 * WebCoreSupport/ChromeClientQt.cpp: 14 * WebCoreSupport/DumpRenderTreeSupportQt.cpp: 15 (DumpRenderTreeSupportQt::mediaContentUrlByElementId): 16 * WebCoreSupport/FullScreenVideoQt.cpp: 17 (WebCore::FullScreenVideoQt::FullScreenVideoQt): 18 (WebCore::FullScreenVideoQt::~FullScreenVideoQt): 19 (WebCore::FullScreenVideoQt::enterFullScreenForNode): 20 (WebCore::FullScreenVideoQt::exitFullScreenForNode): 21 (WebCore::FullScreenVideoQt::requiresFullScreenForVideoPlayback): 22 (WebCore::FullScreenVideoQt::isValid): 23 * WebCoreSupport/FullScreenVideoQt.h: 24 * WebCoreSupport/QtPlatformPlugin.cpp: 25 * WebCoreSupport/QtPlatformPlugin.h: 26 * examples/platformplugin/WebPlugin.cpp: 27 (WebPlugin::supportsExtension): 28 (WebPlugin::createExtension): 29 * examples/platformplugin/WebPlugin.h: 30 * examples/platformplugin/platformplugin.pro: 31 * examples/platformplugin/qwebkitplatformplugin.h: 32 * tests/qwebpage/tst_qwebpage.cpp: 33 (tst_QWebPage::loadHtml5Video): 34 * tests/tests.pri: 35 1 36 2011-04-06 Alexis Menard <alexis.menard@openbossa.org> 2 37 -
trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
r83078 r83108 81 81 #include "HTMLNames.h" 82 82 #include "HTMLVideoElement.h" 83 #if ENABLE(QT_MULTIMEDIA)83 #if USE(QT_MULTIMEDIA) 84 84 #include "MediaPlayerPrivateQt.h" 85 85 #endif -
trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
r82489 r83108 83 83 #include "qwebscriptworld.h" 84 84 85 #if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)85 #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA) 86 86 #include "HTMLVideoElement.h" 87 87 #include "MediaPlayerPrivateQt.h" … … 1015 1015 QUrl res; 1016 1016 1017 #if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)1017 #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA) 1018 1018 Frame* coreFrame = QWebFramePrivate::core(frame); 1019 1019 if (!coreFrame) -
trunk/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
r83078 r83108 23 23 24 24 #include "ChromeClientQt.h" 25 #if ENABLE(QT_MULTIMEDIA)25 #if USE(QT_MULTIMEDIA) 26 26 #include "FullScreenVideoWidget.h" 27 27 #include "MediaPlayerPrivateQt.h" … … 36 36 #endif 37 37 38 #if ENABLE(QT_MULTIMEDIA)38 #if USE(QT_MULTIMEDIA) 39 39 #include <QGraphicsVideoItem> 40 40 #include <QMediaPlayer> … … 87 87 #endif 88 88 89 #if ENABLE(QT_MULTIMEDIA)89 #if USE(QT_MULTIMEDIA) 90 90 bool DefaultFullScreenVideoHandler::s_shouldForceFullScreenVideoPlayback = false; 91 91 … … 136 136 Q_ASSERT(m_chromeClient); 137 137 138 #if ENABLE(QT_MULTIMEDIA)138 #if USE(QT_MULTIMEDIA) 139 139 m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler(); 140 140 if (!m_FullScreenVideoHandler) … … 152 152 FullScreenVideoQt::~FullScreenVideoQt() 153 153 { 154 #if ENABLE(QT_MULTIMEDIA)154 #if USE(QT_MULTIMEDIA) 155 155 delete m_FullScreenVideoHandler; 156 156 #endif … … 167 167 m_videoElement = static_cast<HTMLVideoElement*>(node); 168 168 169 #if ENABLE(QT_MULTIMEDIA)169 #if USE(QT_MULTIMEDIA) 170 170 HTMLVideoElement* videoElement = static_cast<HTMLVideoElement*>(node); 171 171 PlatformMedia platformMedia = videoElement->platformMedia(); … … 193 193 Q_ASSERT(node); 194 194 195 #if ENABLE(QT_MULTIMEDIA)195 #if USE(QT_MULTIMEDIA) 196 196 HTMLVideoElement* videoElement = static_cast<HTMLVideoElement*>(node); 197 197 PlatformMedia platformMedia = videoElement->platformMedia(); … … 221 221 } 222 222 223 #if ENABLE(QT_MULTIMEDIA)223 #if USE(QT_MULTIMEDIA) 224 224 MediaPlayerPrivateQt* FullScreenVideoQt::mediaPlayer() 225 225 { … … 232 232 bool FullScreenVideoQt::requiresFullScreenForVideoPlayback() 233 233 { 234 #if ENABLE(QT_MULTIMEDIA)234 #if USE(QT_MULTIMEDIA) 235 235 return m_FullScreenVideoHandler ? m_FullScreenVideoHandler->requiresFullScreenForVideoPlayback() : false; 236 236 #endif … … 242 242 bool FullScreenVideoQt::isValid() const 243 243 { 244 #if ENABLE(QT_MULTIMEDIA)244 #if USE(QT_MULTIMEDIA) 245 245 return m_FullScreenVideoHandler; 246 246 #endif -
trunk/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
r83078 r83108 36 36 class HTMLVideoElement; 37 37 class Node; 38 #if ENABLE(QT_MULTIMEDIA)38 #if USE(QT_MULTIMEDIA) 39 39 class MediaPlayerPrivateQt; 40 40 #endif … … 64 64 65 65 // We do not use ENABLE or USE because moc does not expand these macros. 66 #if defined( ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA66 #if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA 67 67 class DefaultFullScreenVideoHandler : public QWebFullScreenVideoHandler { 68 68 Q_OBJECT … … 94 94 95 95 private: 96 #if ENABLE(QT_MULTIMEDIA)96 #if USE(QT_MULTIMEDIA) 97 97 MediaPlayerPrivateQt* mediaPlayer(); 98 98 #endif … … 104 104 ChromeClientQt* m_chromeClient; 105 105 HTMLVideoElement* m_videoElement; 106 #if ENABLE(QT_MULTIMEDIA)106 #if USE(QT_MULTIMEDIA) 107 107 QWebFullScreenVideoHandler* m_FullScreenVideoHandler; 108 108 #endif -
trunk/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp
r75944 r83108 128 128 } 129 129 130 #if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)130 #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA) 131 131 QWebFullScreenVideoHandler* QtPlatformPlugin::createFullScreenVideoHandler() 132 132 { -
trunk/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h
r75944 r83108 30 30 class QWebSelectData; 31 31 class QWebTouchModifier; 32 #if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)32 #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA) 33 33 class QWebFullScreenVideoHandler; 34 34 #endif … … 45 45 QWebHapticFeedbackPlayer* createHapticFeedbackPlayer(); 46 46 QWebTouchModifier* createTouchModifier(); 47 #if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)47 #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA) 48 48 QWebFullScreenVideoHandler* createFullScreenVideoHandler(); 49 49 #endif -
trunk/Source/WebKit/qt/examples/platformplugin/WebPlugin.cpp
r75944 r83108 211 211 } 212 212 213 #if defined( ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA213 #if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA 214 214 FullScreenVideoWidget::FullScreenVideoWidget(QMediaPlayer* player) 215 215 : QVideoWidget() … … 287 287 case TouchInteraction: 288 288 return true; 289 #if defined( ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA289 #if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA 290 290 case FullScreenVideoPlayer: 291 291 return true; … … 307 307 case TouchInteraction: 308 308 return new TouchModifier(); 309 #if defined( ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA309 #if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA 310 310 case FullScreenVideoPlayer: 311 311 return new FullScreenVideoHandler(); -
trunk/Source/WebKit/qt/examples/platformplugin/WebPlugin.h
r75944 r83108 25 25 26 26 #include <QDialog> 27 #if defined( ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA27 #if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA 28 28 #include <QVideoWidget> 29 29 #endif … … 98 98 }; 99 99 100 #if defined( ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA100 #if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA 101 101 class FullScreenVideoWidget : public QVideoWidget { 102 102 Q_OBJECT -
trunk/Source/WebKit/qt/examples/platformplugin/platformplugin.pro
r75944 r83108 15 15 DEFINES -= ENABLE_VIDEO=0 16 16 DEFINES += ENABLE_VIDEO=1 17 DEFINES -= ENABLE_QT_MULTIMEDIA=018 DEFINES += ENABLE_QT_MULTIMEDIA=117 DEFINES -= WTF_USE_QT_MULTIMEDIA=0 18 DEFINES += WTF_USE_QT_MULTIMEDIA=1 19 19 } 20 20 } -
trunk/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h
r75944 r83108 29 29 #include <QObject> 30 30 #include <QUrl> 31 #if defined( ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA31 #if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA 32 32 #include <QMediaPlayer> 33 33 #endif … … 119 119 }; 120 120 121 #if defined( ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA121 #if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA 122 122 class QWebFullScreenVideoHandler : public QObject { 123 123 Q_OBJECT -
trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
r82238 r83108 435 435 void tst_QWebPage::loadHtml5Video() 436 436 { 437 #if defined( ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA437 #if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA 438 438 QByteArray url("http://does.not/exist?a=1%2Cb=2"); 439 439 m_view->setHtml("<p><video id ='video' src='" + url + "' autoplay/></p>"); -
trunk/Source/WebKit/qt/tests/tests.pri
r82125 r83108 11 11 contains(MOBILITY_CONFIG, multimedia) { 12 12 # This define is used by tests depending on Qt Multimedia 13 DEFINES -= ENABLE_QT_MULTIMEDIA=014 DEFINES += ENABLE_QT_MULTIMEDIA=113 DEFINES -= WTF_USE_QT_MULTIMEDIA=0 14 DEFINES += WTF_USE_QT_MULTIMEDIA=1 15 15 } 16 16
Note: See TracChangeset
for help on using the changeset viewer.