Changeset 83108 in webkit


Ignore:
Timestamp:
Apr 6, 2011 3:17:11 PM (13 years ago)
Author:
alexis.menard@openbossa.org
Message:

2011-04-06 Alexis Menard <​alexis.menard@openbossa.org>

Reviewed by Andreas Kling.

[Qt] We should use USE(QT_MULTIMEDIA) rather than ENABLE(QT_MULTIMEDIA).
​https://bugs.webkit.org/show_bug.cgi?id=57974

We should use USE(QT_MULTIMEDIA) rather than ENABLE(QT_MULTIMEDIA).

No new tests needed, just a config flag rename.

  • features.pri:

2011-04-06 Alexis Menard <​alexis.menard@openbossa.org>

Reviewed by Andreas Kling.

[Qt] We should use USE(QT_MULTIMEDIA) rather than ENABLE(QT_MULTIMEDIA).
​https://bugs.webkit.org/show_bug.cgi?id=57974

We should use USE(QT_MULTIMEDIA) rather than ENABLE(QT_MULTIMEDIA).

No new tests needed, just a config flag rename.

  • Api/qwebkitplatformplugin.h:
  • WebCoreSupport/ChromeClientQt.cpp:
  • WebCoreSupport/DumpRenderTreeSupportQt.cpp: (DumpRenderTreeSupportQt::mediaContentUrlByElementId):
  • WebCoreSupport/FullScreenVideoQt.cpp: (WebCore::FullScreenVideoQt::FullScreenVideoQt): (WebCore::FullScreenVideoQt::~FullScreenVideoQt): (WebCore::FullScreenVideoQt::enterFullScreenForNode): (WebCore::FullScreenVideoQt::exitFullScreenForNode): (WebCore::FullScreenVideoQt::requiresFullScreenForVideoPlayback): (WebCore::FullScreenVideoQt::isValid):
  • WebCoreSupport/FullScreenVideoQt.h:
  • WebCoreSupport/QtPlatformPlugin.cpp:
  • WebCoreSupport/QtPlatformPlugin.h:
  • examples/platformplugin/WebPlugin.cpp: (WebPlugin::supportsExtension): (WebPlugin::createExtension):
  • examples/platformplugin/WebPlugin.h:
  • examples/platformplugin/platformplugin.pro:
  • examples/platformplugin/qwebkitplatformplugin.h:
  • tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::loadHtml5Video):
  • tests/tests.pri:
Location:
trunk/Source
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r83105 r83108  
     12011-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
    1142011-04-06  Tyler Close  <tjclose@chromium.org>
    215

  • trunk/Source/WebCore/features.pri

    r80720 r83108  
    164164        DEFINES -= ENABLE_VIDEO=0
    165165        DEFINES += ENABLE_VIDEO=1
    166         DEFINES -= ENABLE_QT_MULTIMEDIA=1
    167         DEFINES += ENABLE_QT_MULTIMEDIA=0
     166        DEFINES -= WTF_USE_QT_MULTIMEDIA=1
     167        DEFINES += WTF_USE_QT_MULTIMEDIA=0
    168168    } else:contains(MOBILITY_CONFIG, multimedia) {
    169169        DEFINES -= ENABLE_VIDEO=0
    170170        DEFINES += ENABLE_VIDEO=1
    171         DEFINES -= ENABLE_QT_MULTIMEDIA=0
    172         DEFINES += ENABLE_QT_MULTIMEDIA=1
     171        DEFINES -= WTF_USE_QT_MULTIMEDIA=0
     172        DEFINES += WTF_USE_QT_MULTIMEDIA=1
    173173    } else:contains(QT_CONFIG, phonon) {
    174174        DEFINES -= ENABLE_VIDEO=0
    175175        DEFINES += ENABLE_VIDEO=1
    176         DEFINES -= ENABLE_QT_MULTIMEDIA=1
    177         DEFINES += ENABLE_QT_MULTIMEDIA=0
     176        DEFINES -= WTF_USE_QT_MULTIMEDIA=1
     177        DEFINES += WTF_USE_QT_MULTIMEDIA=0
    178178    }
    179179}

  • trunk/Source/WebKit/qt/Api/qwebkitplatformplugin.h

    r82075 r83108  
    3030#include <QObject>
    3131#include <QUrl>
    32 #if defined(ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA
     32#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
    3333#include <QMediaPlayer>
    3434#endif
    … …  
    124124};
    125125
    126 #if defined(ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA
     126#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
    127127class QWebFullScreenVideoHandler : public QObject {
    128128    Q_OBJECT

  • trunk/Source/WebKit/qt/ChangeLog

    r83078 r83108  
     12011-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
    1362011-04-06  Alexis Menard  <alexis.menard@openbossa.org>
    237

  • trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

    r83078 r83108  
    8181#include "HTMLNames.h"
    8282#include "HTMLVideoElement.h"
    83 #if ENABLE(QT_MULTIMEDIA)
     83#if USE(QT_MULTIMEDIA)
    8484#include "MediaPlayerPrivateQt.h"
    8585#endif

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

    r82489 r83108  
    8383#include "qwebscriptworld.h"
    8484
    85 #if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)
     85#if ENABLE(VIDEO) && USE(QT_MULTIMEDIA)
    8686#include "HTMLVideoElement.h"
    8787#include "MediaPlayerPrivateQt.h"
    … …  
    10151015    QUrl res;
    10161016
    1017 #if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)
     1017#if ENABLE(VIDEO) && USE(QT_MULTIMEDIA)
    10181018    Frame* coreFrame = QWebFramePrivate::core(frame);
    10191019    if (!coreFrame)

  • trunk/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp

    r83078 r83108  
    2323
    2424#include "ChromeClientQt.h"
    25 #if ENABLE(QT_MULTIMEDIA)
     25#if USE(QT_MULTIMEDIA)
    2626#include "FullScreenVideoWidget.h"
    2727#include "MediaPlayerPrivateQt.h"
    … …  
    3636#endif
    3737
    38 #if ENABLE(QT_MULTIMEDIA)
     38#if USE(QT_MULTIMEDIA)
    3939#include <QGraphicsVideoItem>
    4040#include <QMediaPlayer>
    … …  
    8787#endif
    8888
    89 #if ENABLE(QT_MULTIMEDIA)
     89#if USE(QT_MULTIMEDIA)
    9090bool DefaultFullScreenVideoHandler::s_shouldForceFullScreenVideoPlayback = false;
    9191
    … …  
    136136    Q_ASSERT(m_chromeClient);
    137137
    138 #if ENABLE(QT_MULTIMEDIA)
     138#if USE(QT_MULTIMEDIA)
    139139    m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler();
    140140    if (!m_FullScreenVideoHandler)
    … …  
    152152FullScreenVideoQt::~FullScreenVideoQt()
    153153{
    154 #if ENABLE(QT_MULTIMEDIA)
     154#if USE(QT_MULTIMEDIA)
    155155    delete m_FullScreenVideoHandler;
    156156#endif
    … …  
    167167    m_videoElement = static_cast<HTMLVideoElement*>(node);
    168168
    169 #if ENABLE(QT_MULTIMEDIA)
     169#if USE(QT_MULTIMEDIA)
    170170    HTMLVideoElement* videoElement = static_cast<HTMLVideoElement*>(node);
    171171    PlatformMedia platformMedia = videoElement->platformMedia();
    … …  
    193193    Q_ASSERT(node);
    194194
    195 #if ENABLE(QT_MULTIMEDIA)
     195#if USE(QT_MULTIMEDIA)
    196196    HTMLVideoElement* videoElement = static_cast<HTMLVideoElement*>(node);
    197197    PlatformMedia platformMedia = videoElement->platformMedia();
    … …  
    221221}
    222222
    223 #if ENABLE(QT_MULTIMEDIA)
     223#if USE(QT_MULTIMEDIA)
    224224MediaPlayerPrivateQt* FullScreenVideoQt::mediaPlayer()
    225225{
    … …  
    232232bool FullScreenVideoQt::requiresFullScreenForVideoPlayback()
    233233{
    234 #if ENABLE(QT_MULTIMEDIA)
     234#if USE(QT_MULTIMEDIA)
    235235    return m_FullScreenVideoHandler ? m_FullScreenVideoHandler->requiresFullScreenForVideoPlayback() : false;
    236236#endif
    … …  
    242242bool FullScreenVideoQt::isValid() const
    243243{
    244 #if ENABLE(QT_MULTIMEDIA)
     244#if USE(QT_MULTIMEDIA)
    245245    return m_FullScreenVideoHandler;
    246246#endif

  • trunk/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h

    r83078 r83108  
    3636class HTMLVideoElement;
    3737class Node;
    38 #if ENABLE(QT_MULTIMEDIA)
     38#if USE(QT_MULTIMEDIA)
    3939class MediaPlayerPrivateQt;
    4040#endif
    … …  
    6464
    6565// We do not use ENABLE or USE because moc does not expand these macros.
    66 #if defined(ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA
     66#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
    6767class DefaultFullScreenVideoHandler : public QWebFullScreenVideoHandler {
    6868    Q_OBJECT
    … …  
    9494
    9595private:
    96 #if ENABLE(QT_MULTIMEDIA)
     96#if USE(QT_MULTIMEDIA)
    9797    MediaPlayerPrivateQt* mediaPlayer();
    9898#endif
    … …  
    104104    ChromeClientQt* m_chromeClient;
    105105    HTMLVideoElement* m_videoElement;
    106 #if ENABLE(QT_MULTIMEDIA)
     106#if USE(QT_MULTIMEDIA)
    107107    QWebFullScreenVideoHandler* m_FullScreenVideoHandler;
    108108#endif

  • trunk/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp

    r75944 r83108  
    128128}
    129129
    130 #if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)
     130#if ENABLE(VIDEO) && USE(QT_MULTIMEDIA)
    131131QWebFullScreenVideoHandler* QtPlatformPlugin::createFullScreenVideoHandler()
    132132{

  • trunk/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h

    r75944 r83108  
    3030class QWebSelectData;
    3131class QWebTouchModifier;
    32 #if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)
     32#if ENABLE(VIDEO) && USE(QT_MULTIMEDIA)
    3333class QWebFullScreenVideoHandler;
    3434#endif
    … …  
    4545    QWebHapticFeedbackPlayer* createHapticFeedbackPlayer();
    4646    QWebTouchModifier* createTouchModifier();
    47 #if ENABLE(VIDEO) && ENABLE(QT_MULTIMEDIA)
     47#if ENABLE(VIDEO) && USE(QT_MULTIMEDIA)
    4848    QWebFullScreenVideoHandler* createFullScreenVideoHandler();
    4949#endif

  • trunk/Source/WebKit/qt/examples/platformplugin/WebPlugin.cpp

    r75944 r83108  
    211211}
    212212
    213 #if defined(ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA
     213#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
    214214FullScreenVideoWidget::FullScreenVideoWidget(QMediaPlayer* player)
    215215    : QVideoWidget()
    … …  
    287287    case TouchInteraction:
    288288        return true;
    289 #if defined(ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA
     289#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
    290290    case FullScreenVideoPlayer:
    291291        return true;
    … …  
    307307    case TouchInteraction:
    308308        return new TouchModifier();
    309 #if defined(ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA
     309#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
    310310    case FullScreenVideoPlayer:
    311311        return new FullScreenVideoHandler();

  • trunk/Source/WebKit/qt/examples/platformplugin/WebPlugin.h

    r75944 r83108  
    2525
    2626#include <QDialog>
    27 #if defined(ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA
     27#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
    2828#include <QVideoWidget>
    2929#endif
    … …  
    9898};
    9999
    100 #if defined(ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA
     100#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
    101101class FullScreenVideoWidget : public QVideoWidget {
    102102    Q_OBJECT

  • trunk/Source/WebKit/qt/examples/platformplugin/platformplugin.pro

    r75944 r83108  
    1515        DEFINES -= ENABLE_VIDEO=0
    1616        DEFINES += ENABLE_VIDEO=1
    17         DEFINES -= ENABLE_QT_MULTIMEDIA=0
    18         DEFINES += ENABLE_QT_MULTIMEDIA=1
     17        DEFINES -= WTF_USE_QT_MULTIMEDIA=0
     18        DEFINES += WTF_USE_QT_MULTIMEDIA=1
    1919    }
    2020}

  • trunk/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h

    r75944 r83108  
    2929#include <QObject>
    3030#include <QUrl>
    31 #if defined(ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA
     31#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
    3232#include <QMediaPlayer>
    3333#endif
    … …  
    119119};
    120120
    121 #if defined(ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA
     121#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
    122122class QWebFullScreenVideoHandler : public QObject {
    123123    Q_OBJECT

  • trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

    r82238 r83108  
    435435void tst_QWebPage::loadHtml5Video()
    436436{
    437 #if defined(ENABLE_QT_MULTIMEDIA) && ENABLE_QT_MULTIMEDIA
     437#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
    438438    QByteArray url("http://does.not/exist?a=1%2Cb=2");
    439439    m_view->setHtml("<p><video id ='video' src='" + url + "' autoplay/></p>");

  • trunk/Source/WebKit/qt/tests/tests.pri

    r82125 r83108  
    1111contains(MOBILITY_CONFIG, multimedia) {
    1212    # This define is used by tests depending on Qt Multimedia
    13     DEFINES -= ENABLE_QT_MULTIMEDIA=0
    14     DEFINES += ENABLE_QT_MULTIMEDIA=1
     13    DEFINES -= WTF_USE_QT_MULTIMEDIA=0
     14    DEFINES += WTF_USE_QT_MULTIMEDIA=1
    1515}
    1616
Note: See TracChangeset for help on using the changeset viewer.