Changeset 87044 in webkit


Ignore:
Timestamp:
May 22, 2011 3:18:26 PM (13 years ago)
Author:
yi.4.shen@nokia.com
Message:

2011-05-22 Hui Huang <​hui.2.huang@nokia.com>, Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] Upstream Symbian platform plugin
​https://bugs.webkit.org/show_bug.cgi?id=58435

Upstream Symbian platform plugin with html5 video player.

  • symbian/platformplugin/HTML5VideoPlugin.cpp: Added. (HTML5FullScreenVideoHandler::HTML5FullScreenVideoHandler): (HTML5FullScreenVideoHandler::enterFullScreen): (HTML5FullScreenVideoHandler::exitFullScreen): (HTML5FullScreenVideoHandler::onPlayerError): (HTML5FullScreenVideoHandler::onPlayerStateChanged): (HTML5FullScreenVideoHandler::onMediaStatusChanged): (HTML5VideoPlugin::supportsExtension): (HTML5VideoPlugin::createExtension):
  • symbian/platformplugin/HTML5VideoPlugin.h: Added. (HTML5FullScreenVideoHandler::requiresFullScreenForVideoPlayback): (HTML5FullScreenVideoHandler::isFullScreen): (HTML5FullScreenVideoHandler::updateScreenRect):
  • symbian/platformplugin/HTML5VideoWidget.cpp: Added. (HTML5VideoWidget::HTML5VideoWidget): (HTML5VideoWidget::setDuration): (HTML5VideoWidget::mousePressEvent): (HTML5VideoWidget::onPlayerStopped): (HTML5VideoWidget::onPlayerError): (HTML5VideoWidget::onEndOfMedia): (HTML5VideoWidget::onBufferingMedia): (HTML5VideoWidget::onBufferedMedia): (HTML5VideoWidget::onControlClicked): (HTML5VideoWidget::onPositionChanged): (HTML5VideoWidget::onSliderMoved): (HTML5VideoWidget::onCloseClicked): (HTML5VideoWidget::showFullScreen): (HTML5VideoWidget::setVolume):
  • symbian/platformplugin/HTML5VideoWidget.h: Added.
  • symbian/platformplugin/OverlayWidget.cpp: Added. (OverlayWidget::OverlayWidget): (OverlayWidget::~OverlayWidget): (OverlayWidget::setDuration): (OverlayWidget::setPosition): (OverlayWidget::setVolume): (OverlayWidget::mousePressEvent): (OverlayWidget::onPlayerStopped): (OverlayWidget::onPlayerError): (OverlayWidget::onEndOfMedia): (OverlayWidget::onBufferingMedia): (OverlayWidget::onBufferedMedia): (OverlayWidget::timeToString): (OverlayWidget::applyStyleSheet): (OverlayWidget::onControlClicked): (OverlayWidget::onSliderMoved): (OverlayWidget::onSoundClicked): (OverlayWidget::onCloseClicked): (OverlayWidget::onVolumeSliderReleased): (OverlayWidget::onVolumeSliderMoved): (OverlayWidget::onTimerTimeout): (OverlayWidget::showFullScreen):
  • symbian/platformplugin/OverlayWidget.h: Added.
  • symbian/platformplugin/PlayerButton.cpp: Added. (PlayerButton::PlayerButton): (PlayerButton::event):
  • symbian/platformplugin/PlayerButton.h: Added.
  • symbian/platformplugin/PlayerLabel.cpp: Added. (PlayerLabel::PlayerLabel): (PlayerLabel::onPlayerError): (PlayerLabel::startBufferingAnimation): (PlayerLabel::stopBufferingAnimation): (PlayerLabel::onAnimationTimeout):
  • symbian/platformplugin/PlayerLabel.h: Added.
  • symbian/platformplugin/WebPlugin.cpp: (WebPlugin::createExtension):
  • symbian/platformplugin/images: Added.
  • symbian/platformplugin/images/button_cannotplay.png: Added.
  • symbian/platformplugin/images/button_close.png: Added.
  • symbian/platformplugin/images/button_pause.png: Added.
  • symbian/platformplugin/images/button_play.png: Added.
  • symbian/platformplugin/images/button_sound_off.png: Added.
  • symbian/platformplugin/images/button_sound_on.png: Added.
  • symbian/platformplugin/images/loading_buffering_1.png: Added.
  • symbian/platformplugin/images/loading_buffering_2.png: Added.
  • symbian/platformplugin/images/loading_buffering_3.png: Added.
  • symbian/platformplugin/images/loading_buffering_4.png: Added.
  • symbian/platformplugin/platformplugin.pro:
  • symbian/platformplugin/platformplugin.qrc: Added.
  • symbian/platformplugin/qss: Added.
  • symbian/platformplugin/qss/OverlayWidget.qss: Added.
Location:
trunk/Source/WebKit/qt
Files:
24 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/qt/ChangeLog

    r87043 r87044  
     12011-05-22  Hui Huang  <hui.2.huang@nokia.com>, Yi Shen  <yi.4.shen@nokia.com>
     2
     3        Reviewed by Laszlo Gombos.
     4
     5        [Qt] Upstream Symbian platform plugin
     6        https://bugs.webkit.org/show_bug.cgi?id=58435
     7
     8        Upstream Symbian platform plugin with html5 video player.
     9
     10        * symbian/platformplugin/HTML5VideoPlugin.cpp: Added.
     11        (HTML5FullScreenVideoHandler::HTML5FullScreenVideoHandler):
     12        (HTML5FullScreenVideoHandler::enterFullScreen):
     13        (HTML5FullScreenVideoHandler::exitFullScreen):
     14        (HTML5FullScreenVideoHandler::onPlayerError):
     15        (HTML5FullScreenVideoHandler::onPlayerStateChanged):
     16        (HTML5FullScreenVideoHandler::onMediaStatusChanged):
     17        (HTML5VideoPlugin::supportsExtension):
     18        (HTML5VideoPlugin::createExtension):
     19        * symbian/platformplugin/HTML5VideoPlugin.h: Added.
     20        (HTML5FullScreenVideoHandler::requiresFullScreenForVideoPlayback):
     21        (HTML5FullScreenVideoHandler::isFullScreen):
     22        (HTML5FullScreenVideoHandler::updateScreenRect):
     23        * symbian/platformplugin/HTML5VideoWidget.cpp: Added.
     24        (HTML5VideoWidget::HTML5VideoWidget):
     25        (HTML5VideoWidget::setDuration):
     26        (HTML5VideoWidget::mousePressEvent):
     27        (HTML5VideoWidget::onPlayerStopped):
     28        (HTML5VideoWidget::onPlayerError):
     29        (HTML5VideoWidget::onEndOfMedia):
     30        (HTML5VideoWidget::onBufferingMedia):
     31        (HTML5VideoWidget::onBufferedMedia):
     32        (HTML5VideoWidget::onControlClicked):
     33        (HTML5VideoWidget::onPositionChanged):
     34        (HTML5VideoWidget::onSliderMoved):
     35        (HTML5VideoWidget::onCloseClicked):
     36        (HTML5VideoWidget::showFullScreen):
     37        (HTML5VideoWidget::setVolume):
     38        * symbian/platformplugin/HTML5VideoWidget.h: Added.
     39        * symbian/platformplugin/OverlayWidget.cpp: Added.
     40        (OverlayWidget::OverlayWidget):
     41        (OverlayWidget::~OverlayWidget):
     42        (OverlayWidget::setDuration):
     43        (OverlayWidget::setPosition):
     44        (OverlayWidget::setVolume):
     45        (OverlayWidget::mousePressEvent):
     46        (OverlayWidget::onPlayerStopped):
     47        (OverlayWidget::onPlayerError):
     48        (OverlayWidget::onEndOfMedia):
     49        (OverlayWidget::onBufferingMedia):
     50        (OverlayWidget::onBufferedMedia):
     51        (OverlayWidget::timeToString):
     52        (OverlayWidget::applyStyleSheet):
     53        (OverlayWidget::onControlClicked):
     54        (OverlayWidget::onSliderMoved):
     55        (OverlayWidget::onSoundClicked):
     56        (OverlayWidget::onCloseClicked):
     57        (OverlayWidget::onVolumeSliderReleased):
     58        (OverlayWidget::onVolumeSliderMoved):
     59        (OverlayWidget::onTimerTimeout):
     60        (OverlayWidget::showFullScreen):
     61        * symbian/platformplugin/OverlayWidget.h: Added.
     62        * symbian/platformplugin/PlayerButton.cpp: Added.
     63        (PlayerButton::PlayerButton):
     64        (PlayerButton::event):
     65        * symbian/platformplugin/PlayerButton.h: Added.
     66        * symbian/platformplugin/PlayerLabel.cpp: Added.
     67        (PlayerLabel::PlayerLabel):
     68        (PlayerLabel::onPlayerError):
     69        (PlayerLabel::startBufferingAnimation):
     70        (PlayerLabel::stopBufferingAnimation):
     71        (PlayerLabel::onAnimationTimeout):
     72        * symbian/platformplugin/PlayerLabel.h: Added.
     73        * symbian/platformplugin/WebPlugin.cpp:
     74        (WebPlugin::createExtension):
     75        * symbian/platformplugin/images: Added.
     76        * symbian/platformplugin/images/button_cannotplay.png: Added.
     77        * symbian/platformplugin/images/button_close.png: Added.
     78        * symbian/platformplugin/images/button_pause.png: Added.
     79        * symbian/platformplugin/images/button_play.png: Added.
     80        * symbian/platformplugin/images/button_sound_off.png: Added.
     81        * symbian/platformplugin/images/button_sound_on.png: Added.
     82        * symbian/platformplugin/images/loading_buffering_1.png: Added.
     83        * symbian/platformplugin/images/loading_buffering_2.png: Added.
     84        * symbian/platformplugin/images/loading_buffering_3.png: Added.
     85        * symbian/platformplugin/images/loading_buffering_4.png: Added.
     86        * symbian/platformplugin/platformplugin.pro:
     87        * symbian/platformplugin/platformplugin.qrc: Added.
     88        * symbian/platformplugin/qss: Added.
     89        * symbian/platformplugin/qss/OverlayWidget.qss: Added.
     90
    1912011-05-22  Robert Hogan  <robert@webkit.org>
    292

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

    r85062 r87044  
    2020
    2121#include "WebPlugin.h"
     22
     23#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
     24#include "HTML5VideoPlugin.h"
     25#endif
    2226
    2327#include <QtGui>
    … …  
    248252    case Notifications:
    249253        return new WebNotificationPresenter();
     254#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
     255    case FullScreenVideoPlayer:
     256        return new HTML5FullScreenVideoHandler();
     257#endif
    250258    default:
    251259        return 0;

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

    r85062 r87044  
    1515
    1616isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../../..
     17
     18contains(MOBILITY_CONFIG, multimedia) {
     19 
     20    CONFIG += mobility
     21    MOBILITY += multimedia
     22    DEFINES += WTF_USE_QT_MULTIMEDIA=1
     23
     24    SOURCES += \
     25        HTML5VideoPlugin.cpp \
     26        HTML5VideoWidget.cpp \
     27        OverlayWidget.cpp \
     28        PlayerButton.cpp \
     29        PlayerLabel.cpp
     30
     31    HEADERS += \
     32        HTML5VideoPlugin.h \
     33        HTML5VideoWidget.h \
     34        OverlayWidget.h \
     35        PlayerButton.h \
     36        PlayerLabel.h
     37
     38    RESOURCES = platformplugin.qrc
     39}
    1740
    1841SOURCES += \
Note: See TracChangeset for help on using the changeset viewer.