[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
commit-queue at webkit.org
commit-queue at webkit.org
Sun Feb 20 23:03:35 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 4eaf4f32e306ef32ee353f7c407c338bf829e27f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 15 23:41:48 2011 +0000
2011-01-15 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r75708.
http://trac.webkit.org/changeset/75708
https://bugs.webkit.org/show_bug.cgi?id=52521
Breaks Qt build if mobility is not installed. (Requested by
benjaminp on #webkit).
* WebCore.pro:
* platform/graphics/qt/MediaPlayerPrivateQt.cpp:
(WebCore::MediaPlayerPrivateQt::MediaPlayerPrivateQt):
* platform/graphics/qt/MediaPlayerPrivateQt.h:
(WebCore::MediaPlayerPrivateQt::supportsFullscreen):
2011-01-15 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r75708.
http://trac.webkit.org/changeset/75708
https://bugs.webkit.org/show_bug.cgi?id=52521
Breaks Qt build if mobility is not installed. (Requested by
benjaminp on #webkit).
* Api/qwebkitplatformplugin.h:
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::ChromeClientQt):
(WebCore::ChromeClientQt::~ChromeClientQt):
* WebCoreSupport/ChromeClientQt.h:
* WebCoreSupport/FullScreenVideoQt.cpp: Removed.
* WebCoreSupport/FullScreenVideoQt.h: Removed.
* 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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75885 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e504225..c0428a4 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-15 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r75708.
+ http://trac.webkit.org/changeset/75708
+ https://bugs.webkit.org/show_bug.cgi?id=52521
+
+ Breaks Qt build if mobility is not installed. (Requested by
+ benjaminp on #webkit).
+
+ * WebCore.pro:
+ * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+ (WebCore::MediaPlayerPrivateQt::MediaPlayerPrivateQt):
+ * platform/graphics/qt/MediaPlayerPrivateQt.h:
+ (WebCore::MediaPlayerPrivateQt::supportsFullscreen):
+
2011-01-15 David Kilzer <ddkilzer at apple.com>
<http://webkit.org/b/52512> REGRESSION(r73818): range.cloneContents() ignores end offset
diff --git a/Source/WebCore/WebCore.pro b/Source/WebCore/WebCore.pro
index e38e693..535a7ca 100644
--- a/Source/WebCore/WebCore.pro
+++ b/Source/WebCore/WebCore.pro
@@ -3257,13 +3257,8 @@ contains(DEFINES, ENABLE_VIDEO=1) {
PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
} else:contains(MOBILITY_CONFIG, multimedia) {
- HEADERS += \
- platform/graphics/qt/MediaPlayerPrivateQt.h \
- $$PWD/../../WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
-
- SOURCES += \
- platform/graphics/qt/MediaPlayerPrivateQt.cpp \
- $$PWD/../../WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
+ HEADERS += platform/graphics/qt/MediaPlayerPrivateQt.h
+ SOURCES += platform/graphics/qt/MediaPlayerPrivateQt.cpp
CONFIG *= mobility
MOBILITY += multimedia
diff --git a/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
index be6f732..dd4b6e6 100644
--- a/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
@@ -108,7 +108,7 @@ MediaPlayerPrivateQt::MediaPlayerPrivateQt(MediaPlayer* player)
, m_queuedSeek(-1)
, m_preload(MediaPlayer::Auto)
{
- m_mediaPlayer->setVideoOutput(m_videoItem);
+ m_mediaPlayer->bind(m_videoItem);
m_videoScene->addItem(m_videoItem);
// Signal Handlers
@@ -587,22 +587,6 @@ IntSize MediaPlayerPrivateQt::naturalSize() const
return m_naturalSize;
}
-void MediaPlayerPrivateQt::removeVideoItem()
-{
- m_oldNaturalSize = m_naturalSize;
- m_mediaPlayer->setVideoOutput(static_cast<QGraphicsVideoItem*>(0));
- m_videoScene->removeItem(m_videoItem);
-}
-
-void MediaPlayerPrivateQt::restoreVideoItem()
-{
- m_mediaPlayer->setVideoOutput(m_videoItem);
- m_videoScene->addItem(m_videoItem);
- // FIXME: a qtmobility bug, need to reset the size when restore the videoitem, otherwise the size is 0
- // http://bugreports.qt.nokia.com/browse/QTMOBILITY-971
- nativeSizeChanged(QSize(m_oldNaturalSize));
-}
-
void MediaPlayerPrivateQt::paint(GraphicsContext* context, const IntRect& rect)
{
#if USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h b/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
index 2621432..93c9d1c 100644
--- a/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
+++ b/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.h
@@ -90,7 +90,7 @@ public:
void paint(GraphicsContext*, const IntRect&);
- bool supportsFullscreen() const { return true; }
+ bool supportsFullscreen() const { return false; }
#if USE(ACCELERATED_COMPOSITING)
#if USE(TEXTURE_MAPPER)
@@ -108,11 +108,6 @@ public:
#endif
virtual PlatformMedia platformMedia() const;
-
- QMediaPlayer* mediaPlayer() const { return m_mediaPlayer; }
- void removeVideoItem();
- void restoreVideoItem();
-
private slots:
void mediaStatusChanged(QMediaPlayer::MediaStatus);
void handleError(QMediaPlayer::Error);
@@ -147,7 +142,6 @@ private:
IntSize m_currentSize;
IntSize m_naturalSize;
- IntSize m_oldNaturalSize;
bool m_isVisible;
bool m_isSeeking;
bool m_composited;
diff --git a/WebKit/qt/Api/qwebkitplatformplugin.h b/WebKit/qt/Api/qwebkitplatformplugin.h
index 01c53fb..b8cc984 100644
--- a/WebKit/qt/Api/qwebkitplatformplugin.h
+++ b/WebKit/qt/Api/qwebkitplatformplugin.h
@@ -28,9 +28,6 @@
#include <QObject>
#include <QUrl>
-#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
-#include <QMediaPlayer>
-#endif
class QWebSelectData
{
@@ -118,23 +115,6 @@ public:
virtual unsigned hitTestPaddingForTouch(const PaddingDirection) const = 0;
};
-#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
-class QWebFullScreenVideoHandler : public QObject {
- Q_OBJECT
-public:
- QWebFullScreenVideoHandler() {}
- virtual ~QWebFullScreenVideoHandler() {}
- virtual bool requiresFullScreenForVideoPlayback() const = 0;
-
-Q_SIGNALS:
- void fullScreenClosed();
-
-public Q_SLOTS:
- virtual void enterFullScreen(QMediaPlayer*) = 0;
- virtual void exitFullScreen() = 0;
-};
-#endif
-
class QWebKitPlatformPlugin
{
public:
@@ -144,8 +124,7 @@ public:
MultipleSelections,
Notifications,
Haptics,
- TouchInteraction,
- FullScreenVideoPlayer
+ TouchInteraction
};
virtual bool supportsExtension(Extension extension) const = 0;
@@ -153,7 +132,7 @@ public:
};
QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.7");
+Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.6");
QT_END_NAMESPACE
#endif // QWEBKITPLATFORMPLUGIN_H
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 9264a70..09cdb4a 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,28 @@
+2011-01-15 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r75708.
+ http://trac.webkit.org/changeset/75708
+ https://bugs.webkit.org/show_bug.cgi?id=52521
+
+ Breaks Qt build if mobility is not installed. (Requested by
+ benjaminp on #webkit).
+
+ * Api/qwebkitplatformplugin.h:
+ * WebCoreSupport/ChromeClientQt.cpp:
+ (WebCore::ChromeClientQt::ChromeClientQt):
+ (WebCore::ChromeClientQt::~ChromeClientQt):
+ * WebCoreSupport/ChromeClientQt.h:
+ * WebCoreSupport/FullScreenVideoQt.cpp: Removed.
+ * WebCoreSupport/FullScreenVideoQt.h: Removed.
+ * 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:
+
2011-01-15 Robert Hogan <robert at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
index a6fbb83..6116ae7 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
@@ -76,14 +76,6 @@
#include <qtooltip.h>
#include <wtf/OwnPtr.h>
-#if ENABLE(VIDEO)
-#include "FullScreenVideoQt.h"
-#include "HTMLMediaElement.h"
-#include "HTMLNames.h"
-#include "HTMLVideoElement.h"
-#include "MediaPlayerPrivateQt.h"
-#endif
-
namespace WebCore {
bool ChromeClientQt::dumpVisitedLinksCallbacks = false;
@@ -91,9 +83,6 @@ bool ChromeClientQt::dumpVisitedLinksCallbacks = false;
ChromeClientQt::ChromeClientQt(QWebPage* webPage)
: m_webPage(webPage)
, m_eventLoop(0)
-#if ENABLE(VIDEO)
- , m_fullScreenVideo(0)
-#endif
{
toolBarsVisible = statusBarVisible = menuBarVisible = true;
}
@@ -102,10 +91,6 @@ ChromeClientQt::~ChromeClientQt()
{
if (m_eventLoop)
m_eventLoop->exit();
-
-#if ENABLE(VIDEO)
- delete m_fullScreenVideo;
-#endif
}
void ChromeClientQt::setWindowRect(const FloatRect& rect)
@@ -663,54 +648,6 @@ IntRect ChromeClientQt::visibleRectForTiledBackingStore() const
}
#endif
-#if ENABLE(VIDEO)
-FullScreenVideoQt* ChromeClientQt::fullScreenVideo()
-{
- if (!m_fullScreenVideo)
- m_fullScreenVideo = new FullScreenVideoQt(this);
- return m_fullScreenVideo;
-}
-
-bool ChromeClientQt::supportsFullscreenForNode(const Node* node)
-{
- ASSERT(node);
- return node->hasTagName(HTMLNames::videoTag) && fullScreenVideo()->isValid();
-}
-
-bool ChromeClientQt::requiresFullscreenForVideoPlayback()
-{
- return fullScreenVideo()->requiresFullScreenForVideoPlayback();
-}
-
-void ChromeClientQt::enterFullscreenForNode(Node* node)
-{
- ASSERT(node && node->hasTagName(HTMLNames::videoTag));
-
- HTMLVideoElement* videoElement = static_cast<HTMLVideoElement*>(node);
- PlatformMedia platformMedia = videoElement->platformMedia();
-
- ASSERT(platformMedia.type == PlatformMedia::QtMediaPlayerType);
- if (platformMedia.type != PlatformMedia::QtMediaPlayerType)
- return;
-
- fullScreenVideo()->enterFullScreenForNode(node);
-}
-
-void ChromeClientQt::exitFullscreenForNode(Node* node)
-{
- ASSERT(node && node->hasTagName(HTMLNames::videoTag));
-
- HTMLVideoElement* videoElement = static_cast<HTMLVideoElement*>(node);
- PlatformMedia platformMedia = videoElement->platformMedia();
-
- ASSERT(platformMedia.type == PlatformMedia::QtMediaPlayerType);
- if (platformMedia.type != PlatformMedia::QtMediaPlayerType)
- return;
-
- fullScreenVideo()->exitFullScreenForNode(node);
-}
-#endif
-
QWebSelectMethod* ChromeClientQt::createSelectPopup() const
{
QWebSelectMethod* result = m_platformPlugin.createSelectInputMethod();
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/WebKit/qt/WebCoreSupport/ChromeClientQt.h
index 3ae159c..bcf8975 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.h
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.h
@@ -50,7 +50,6 @@ namespace WebCore {
struct FrameLoadRequest;
class QtAbstractWebPopup;
struct ViewportArguments;
- class FullScreenVideoQt;
class ChromeClientQt : public ChromeClient
{
@@ -163,14 +162,6 @@ namespace WebCore {
#if ENABLE(TOUCH_EVENTS)
virtual void needTouchEvents(bool) { }
#endif
-
-#if ENABLE(VIDEO)
- virtual bool supportsFullscreenForNode(const Node*);
- virtual void enterFullscreenForNode(Node*);
- virtual void exitFullscreenForNode(Node*);
- virtual bool requiresFullscreenForVideoPlayback();
- FullScreenVideoQt* fullScreenVideo();
-#endif
virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
virtual void chooseIconForFiles(const Vector<String>&, FileChooser*);
@@ -205,10 +196,6 @@ namespace WebCore {
bool menuBarVisible;
QEventLoop* m_eventLoop;
-#if ENABLE(VIDEO)
- FullScreenVideoQt* m_fullScreenVideo;
-#endif
-
static bool dumpVisitedLinksCallbacks;
mutable QtPlatformPlugin m_platformPlugin;
diff --git a/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp b/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
deleted file mode 100644
index bdc22e5..0000000
--- a/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "FullScreenVideoQt.h"
-
-#include "ChromeClientQt.h"
-#include "HTMLNames.h"
-#include "HTMLVideoElement.h"
-#include "MediaPlayerPrivateQt.h"
-#include "Node.h"
-#include "qwebkitplatformplugin.h"
-
-#include <QGraphicsVideoItem>
-
-namespace WebCore {
-
-FullScreenVideoQt::FullScreenVideoQt(ChromeClientQt* chromeClient)
- : m_chromeClient(chromeClient)
- , m_videoElement(0)
-{
- Q_ASSERT(m_chromeClient);
- m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler();
-
- if (m_FullScreenVideoHandler)
- connect(m_FullScreenVideoHandler, SIGNAL(fullScreenClosed()), this, SLOT(aboutToClose()));
-}
-
-FullScreenVideoQt::~FullScreenVideoQt()
-{
- delete m_FullScreenVideoHandler;
-}
-
-void FullScreenVideoQt::enterFullScreenForNode(Node* node)
-{
- Q_ASSERT(node);
- Q_ASSERT(m_FullScreenVideoHandler);
-
- if (!m_FullScreenVideoHandler)
- return;
-
- MediaPlayerPrivateQt* mediaPlayerQt = mediaPlayerForNode(node);
- mediaPlayerQt->removeVideoItem();
- m_FullScreenVideoHandler->enterFullScreen(mediaPlayerQt->mediaPlayer());
-}
-
-void FullScreenVideoQt::exitFullScreenForNode(Node* node)
-{
- Q_ASSERT(node);
- Q_ASSERT(m_FullScreenVideoHandler);
-
- if (!m_FullScreenVideoHandler)
- return;
-
- m_FullScreenVideoHandler->exitFullScreen();
- MediaPlayerPrivateQt* mediaPlayerQt = mediaPlayerForNode(node);
- mediaPlayerQt->restoreVideoItem();
-}
-
-void FullScreenVideoQt::aboutToClose()
-{
- Q_ASSERT(m_videoElement);
- m_videoElement->exitFullscreen();
-}
-
-MediaPlayerPrivateQt* FullScreenVideoQt::mediaPlayer()
-{
- Q_ASSERT(m_videoElement);
- PlatformMedia platformMedia = m_videoElement->platformMedia();
- return static_cast<MediaPlayerPrivateQt*>(platformMedia.media.qtMediaPlayer);
-}
-
-MediaPlayerPrivateQt* FullScreenVideoQt::mediaPlayerForNode(Node* node)
-{
- Q_ASSERT(node);
- if (node)
- m_videoElement = static_cast<HTMLVideoElement*>(node);
- return mediaPlayer();
-}
-
-bool FullScreenVideoQt::requiresFullScreenForVideoPlayback()
-{
- return m_FullScreenVideoHandler ? m_FullScreenVideoHandler->requiresFullScreenForVideoPlayback() : false;
-}
-
-}
-
diff --git a/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h b/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
deleted file mode 100644
index 637da70..0000000
--- a/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef FullScreenVideoQt_h
-#define FullScreenVideoQt_h
-
-#include <QObject>
-
-QT_BEGIN_NAMESPACE
-class QGraphicsVideoItem;
-QT_END_NAMESPACE
-
-class QWebFullScreenVideoHandler;
-
-namespace WebCore {
-
-class ChromeClientQt;
-class HTMLVideoElement;
-class Node;
-class MediaPlayerPrivateQt;
-
-class FullScreenVideoQt : public QObject {
- Q_OBJECT
-public:
- FullScreenVideoQt(ChromeClientQt*);
- ~FullScreenVideoQt();
-
- virtual void enterFullScreenForNode(Node*);
- virtual void exitFullScreenForNode(Node*);
- bool requiresFullScreenForVideoPlayback();
- bool isValid() const { return m_FullScreenVideoHandler; }
-
-private:
- MediaPlayerPrivateQt* mediaPlayer();
- MediaPlayerPrivateQt* mediaPlayerForNode(Node* = 0);
-
-private slots:
- void aboutToClose();
-
-private:
- ChromeClientQt* m_chromeClient;
- HTMLVideoElement* m_videoElement;
- QWebFullScreenVideoHandler* m_FullScreenVideoHandler;
-};
-
-}
-
-#endif // PopupMenuQt_h
diff --git a/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp b/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp
index ff92d1c..e4b89b4 100644
--- a/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp
+++ b/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp
@@ -127,12 +127,4 @@ QWebTouchModifier* QtPlatformPlugin::createTouchModifier()
return p ? static_cast<QWebTouchModifier*>(p->createExtension(QWebKitPlatformPlugin::TouchInteraction)) : 0;
}
-#if ENABLE(VIDEO)
-QWebFullScreenVideoHandler* QtPlatformPlugin::createFullScreenVideoHandler()
-{
- QWebKitPlatformPlugin* p = plugin();
- return p ? static_cast<QWebFullScreenVideoHandler*>(p->createExtension(QWebKitPlatformPlugin::FullScreenVideoPlayer)) : 0;
-}
-#endif
-
}
diff --git a/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h b/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h
index eb86cb9..365b734 100644
--- a/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h
+++ b/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h
@@ -29,9 +29,6 @@ class QWebNotificationPresenter;
class QWebHapticFeedbackPlayer;
class QWebSelectData;
class QWebTouchModifier;
-#if ENABLE(VIDEO)
-class QWebFullScreenVideoHandler;
-#endif
namespace WebCore {
@@ -44,9 +41,6 @@ public:
QWebNotificationPresenter* createNotificationPresenter();
QWebHapticFeedbackPlayer* createHapticFeedbackPlayer();
QWebTouchModifier* createTouchModifier();
-#if ENABLE(VIDEO)
- QWebFullScreenVideoHandler* createFullScreenVideoHandler();
-#endif
QWebKitPlatformPlugin* plugin();
diff --git a/WebKit/qt/examples/platformplugin/WebPlugin.cpp b/WebKit/qt/examples/platformplugin/WebPlugin.cpp
index d1e1a56..d029b73 100644
--- a/WebKit/qt/examples/platformplugin/WebPlugin.cpp
+++ b/WebKit/qt/examples/platformplugin/WebPlugin.cpp
@@ -19,9 +19,7 @@
*/
#include "WebPlugin.h"
-#include <QEvent>
#include <QHBoxLayout>
-#include <QKeyEvent>
#include <QListWidget>
#include <QListWidgetItem>
#include <QPainter>
@@ -210,71 +208,6 @@ MultipleSelectionPopup::MultipleSelectionPopup(const QWebSelectData& data)
resize(size().width(), visibleItemCount * gMaemoListItemSize);
}
-#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
-FullScreenVideoWidget::FullScreenVideoWidget(QMediaPlayer* player)
- : QVideoWidget()
- , m_mediaPlayer(player)
-{
- Q_ASSERT(m_mediaPlayer);
-
- setFullScreen(true);
- m_mediaPlayer->setVideoOutput(this);
-}
-
-bool FullScreenVideoWidget::event(QEvent* ev)
-{
- if (ev->type() == QEvent::MouseButtonDblClick) {
- emit fullScreenClosed();
- ev->accept();
- return true;
- }
- return QWidget::event(ev);
-}
-
-void FullScreenVideoWidget::keyPressEvent(QKeyEvent* ev)
-{
- if (ev->key() == Qt::Key_Space) {
- if (m_mediaPlayer->state() == QMediaPlayer::PlayingState)
- m_mediaPlayer->pause();
- else
- m_mediaPlayer->play();
- ev->accept();
- return;
- }
-}
-
-FullScreenVideoHandler::FullScreenVideoHandler()
- : m_mediaWidget(0)
-{
-}
-
-FullScreenVideoHandler::~FullScreenVideoHandler()
-{
- delete m_mediaWidget;
-}
-
-bool FullScreenVideoHandler::requiresFullScreenForVideoPlayback() const
-{
- return true;
-}
-
-void FullScreenVideoHandler::enterFullScreen(QMediaPlayer* player)
-{
- Q_ASSERT(player);
-
- m_mediaWidget = new FullScreenVideoWidget(player);
- connect(m_mediaWidget, SIGNAL(fullScreenClosed()), this, SIGNAL(fullScreenClosed()));
- m_mediaWidget->showFullScreen();
-}
-
-void FullScreenVideoHandler::exitFullScreen()
-{
- m_mediaWidget->hide();
- delete m_mediaWidget;
- m_mediaWidget = 0;
-}
-#endif
-
bool WebPlugin::supportsExtension(Extension extension) const
{
switch (extension) {
@@ -286,10 +219,6 @@ bool WebPlugin::supportsExtension(Extension extension) const
#endif
case TouchInteraction:
return true;
-#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
- case FullScreenVideoPlayer:
- return true;
-#endif
default:
return false;
}
@@ -306,10 +235,6 @@ QObject* WebPlugin::createExtension(Extension extension) const
#endif
case TouchInteraction:
return new TouchModifier();
-#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
- case FullScreenVideoPlayer:
- return new FullScreenVideoHandler();
-#endif
default:
return 0;
}
diff --git a/WebKit/qt/examples/platformplugin/WebPlugin.h b/WebKit/qt/examples/platformplugin/WebPlugin.h
index 2e0e692..0243f57 100644
--- a/WebKit/qt/examples/platformplugin/WebPlugin.h
+++ b/WebKit/qt/examples/platformplugin/WebPlugin.h
@@ -24,9 +24,6 @@
#include "WebNotificationPresenter.h"
#include <QDialog>
-#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
-#include <QVideoWidget>
-#endif
class QListWidgetItem;
class QListWidget;
@@ -97,40 +94,6 @@ public:
}
};
-#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
-class FullScreenVideoWidget : public QVideoWidget {
- Q_OBJECT
-public:
- FullScreenVideoWidget(QMediaPlayer*);
- virtual ~FullScreenVideoWidget() {}
-
-Q_SIGNALS:
- void fullScreenClosed();
-
-protected:
- bool event(QEvent*);
- void keyPressEvent(QKeyEvent*);
-
-private:
- QMediaPlayer* m_mediaPlayer; // not owned
-};
-
-class FullScreenVideoHandler : public QWebFullScreenVideoHandler {
- Q_OBJECT
-public:
- FullScreenVideoHandler();
- virtual ~FullScreenVideoHandler();
- bool requiresFullScreenForVideoPlayback() const;
-
-public Q_SLOTS:
- void enterFullScreen(QMediaPlayer*);
- void exitFullScreen();
-
-private:
- FullScreenVideoWidget* m_mediaWidget; // owned
-};
-#endif
-
class WebPlugin : public QObject, public QWebKitPlatformPlugin
{
Q_OBJECT
diff --git a/WebKit/qt/examples/platformplugin/platformplugin.pro b/WebKit/qt/examples/platformplugin/platformplugin.pro
index 922ff47..9275665 100644
--- a/WebKit/qt/examples/platformplugin/platformplugin.pro
+++ b/WebKit/qt/examples/platformplugin/platformplugin.pro
@@ -3,20 +3,6 @@ TARGET = $$qtLibraryTarget(platformplugin)
TEMPLATE = lib
CONFIG += plugin
-## load mobilityconfig if mobility is available
-load(mobilityconfig, true)
-
-# HTML5 Media Support
-# We require QtMultimedia
-!contains(DEFINES, ENABLE_VIDEO=.) {
- contains(MOBILITY_CONFIG, multimedia) {
- CONFIG += mobility
- MOBILITY += multimedia
- DEFINES -= ENABLE_VIDEO=0
- DEFINES += ENABLE_VIDEO=1
- }
-}
-
DESTDIR = $$[QT_INSTALL_PLUGINS]/webkit
SOURCES += \
diff --git a/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h b/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h
index 01c53fb..b8cc984 100644
--- a/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h
+++ b/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h
@@ -28,9 +28,6 @@
#include <QObject>
#include <QUrl>
-#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
-#include <QMediaPlayer>
-#endif
class QWebSelectData
{
@@ -118,23 +115,6 @@ public:
virtual unsigned hitTestPaddingForTouch(const PaddingDirection) const = 0;
};
-#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
-class QWebFullScreenVideoHandler : public QObject {
- Q_OBJECT
-public:
- QWebFullScreenVideoHandler() {}
- virtual ~QWebFullScreenVideoHandler() {}
- virtual bool requiresFullScreenForVideoPlayback() const = 0;
-
-Q_SIGNALS:
- void fullScreenClosed();
-
-public Q_SLOTS:
- virtual void enterFullScreen(QMediaPlayer*) = 0;
- virtual void exitFullScreen() = 0;
-};
-#endif
-
class QWebKitPlatformPlugin
{
public:
@@ -144,8 +124,7 @@ public:
MultipleSelections,
Notifications,
Haptics,
- TouchInteraction,
- FullScreenVideoPlayer
+ TouchInteraction
};
virtual bool supportsExtension(Extension extension) const = 0;
@@ -153,7 +132,7 @@ public:
};
QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.7");
+Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.6");
QT_END_NAMESPACE
#endif // QWEBKITPLATFORMPLUGIN_H
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list