Changeset 66956 in webkit


Ignore:
Timestamp:
Sep 8, 2010 1:32:11 AM (14 years ago)
Author:
vestbo@webkit.org
Message:

Implement MediaPlayerPrivate::platformMedia() for the Qt port

Reviewed by Andreas Kling.

​https://bugs.webkit.org/show_bug.cgi?id=45264

Location:
trunk/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r66955 r66956  
     12010-09-06  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        Implement MediaPlayerPrivate::platformMedia() for the Qt port
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=45264
     8
     9        * platform/graphics/MediaPlayer.h:
     10        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
     11        (WebCore::MediaPlayerPrivate::platformMedia):
     12        * platform/graphics/qt/MediaPlayerPrivateQt.h:
     13
    1142010-09-08  Zoltan Herczeg  <zherczeg@webkit.org>
    215

  • trunk/WebCore/platform/graphics/MediaPlayer.h

    r65077 r66956  
    7171        GStreamerGWorldType,
    7272        ChromiumMediaPlayerType,
     73        QtMediaPlayerType,
    7374    } type;
    7475
    … …  
    7980        GStreamerGWorld* gstreamerGWorld;
    8081        MediaPlayerPrivateInterface* chromiumMediaPlayer;
     82        MediaPlayerPrivateInterface* qtMediaPlayer;
    8183    } media;
    8284};

  • trunk/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp

    r65495 r66956  
    605605#endif
    606606
     607PlatformMedia MediaPlayerPrivate::platformMedia() const
     608{
     609    PlatformMedia pm;
     610    pm.type = PlatformMedia::QtMediaPlayerType;
     611    pm.media.qtMediaPlayer = const_cast<MediaPlayerPrivate*>(this);
     612    return pm;
     613}
     614
    607615} // namespace WebCore
    608616

  • trunk/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h

    r65495 r66956  
    100100#endif
    101101
     102    virtual PlatformMedia platformMedia() const;
    102103private slots:
    103104    void mediaStatusChanged(QMediaPlayer::MediaStatus);
Note: See TracChangeset for help on using the changeset viewer.