[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:01:48 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 61b414ce0bdc178b24660a3bb6ccd161950553af
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 15 05:38:48 2011 +0000
2011-01-14 Sam Magnuson <smagnuso at gmail.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Compile with QT_NO_GRAPHICSVIEW
https://bugs.webkit.org/show_bug.cgi?id=49750
* platform/graphics/qt/GraphicsLayerQt.cpp:
* platform/graphics/qt/GraphicsLayerQt.h:
* platform/qt/PlatformMouseEventQt.cpp:
2011-01-14 Sam Magnuson <smagnuso at gmail.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Compile with QT_NO_GRAPHICSVIEW
https://bugs.webkit.org/show_bug.cgi?id=49750
* Api/qgraphicswebview.cpp:
* Api/qgraphicswebview.h:
* Api/qwebpage.cpp:
(QWebPage::event):
* Api/qwebpage_p.h:
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::createPlugin):
* WebCoreSupport/PageClientQt.cpp:
* WebCoreSupport/PageClientQt.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75870 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index af00d89..a81ee7c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-14 Sam Magnuson <smagnuso at gmail.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Compile with QT_NO_GRAPHICSVIEW
+ https://bugs.webkit.org/show_bug.cgi?id=49750
+
+ * platform/graphics/qt/GraphicsLayerQt.cpp:
+ * platform/graphics/qt/GraphicsLayerQt.h:
+ * platform/qt/PlatformMouseEventQt.cpp:
+
2011-01-14 Tony Chang <tony at chromium.org>
Reviewed by Alexey Proskuryakov.
diff --git a/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp b/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
index cfb9059..75fb427 100644
--- a/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
@@ -20,6 +20,8 @@
#include "config.h"
#include "GraphicsLayerQt.h"
+#if !defined(QT_NO_GRAPHICSVIEW)
+
#include "CurrentTime.h"
#include "FloatRect.h"
#include "GraphicsContext.h"
@@ -1777,3 +1779,6 @@ void GraphicsLayerQt::resumeAnimations()
}
#include <GraphicsLayerQt.moc>
+
+
+#endif // QT_NO_GRAPHICSVIEW
diff --git a/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.h b/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.h
index b1692d2..8027143 100644
--- a/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.h
+++ b/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.h
@@ -26,6 +26,8 @@
#include "GraphicsLayer.h"
#include "GraphicsLayerClient.h"
+#if !defined(QT_NO_GRAPHICSVIEW)
+
namespace WebCore {
class GraphicsLayerQtImpl;
@@ -92,4 +94,5 @@ private:
};
}
+#endif
#endif // GraphicsLayerQt_h
diff --git a/Source/WebCore/platform/qt/PlatformMouseEventQt.cpp b/Source/WebCore/platform/qt/PlatformMouseEventQt.cpp
index a8956bf..125ae52 100644
--- a/Source/WebCore/platform/qt/PlatformMouseEventQt.cpp
+++ b/Source/WebCore/platform/qt/PlatformMouseEventQt.cpp
@@ -34,6 +34,7 @@
namespace WebCore {
+#if !defined(QT_NO_GRAPHICSVIEW)
PlatformMouseEvent::PlatformMouseEvent(QGraphicsSceneMouseEvent* event, int clickCount)
{
m_timestamp = WTF::currentTime();
@@ -69,6 +70,7 @@ PlatformMouseEvent::PlatformMouseEvent(QGraphicsSceneMouseEvent* event, int clic
m_altKey = (event->modifiers() & Qt::AltModifier);
m_metaKey = (event->modifiers() & Qt::MetaModifier);
}
+#endif // QT_NO_GRAPHICSVIEW
PlatformMouseEvent::PlatformMouseEvent(QInputEvent* event, int clickCount)
{
diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 9697c20..b6ac31b 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -21,6 +21,8 @@
#include "config.h"
#include "qgraphicswebview.h"
+#if !defined(QT_NO_GRAPHICSVIEW)
+
#include "qwebframe.h"
#include "qwebframe_p.h"
#include "qwebpage.h"
@@ -1143,4 +1145,6 @@ void QGraphicsWebView::inputMethodEvent(QInputMethodEvent* ev)
\sa QWebPage::linkDelegationPolicy()
*/
+#endif // QT_NO_GRAPHICSVIEW
+
#include "moc_qgraphicswebview.cpp"
diff --git a/WebKit/qt/Api/qgraphicswebview.h b/WebKit/qt/Api/qgraphicswebview.h
index 8620ac5..e08e895 100644
--- a/WebKit/qt/Api/qgraphicswebview.h
+++ b/WebKit/qt/Api/qgraphicswebview.h
@@ -29,6 +29,8 @@
#include <QtGui/qpainter.h>
#include <QtNetwork/qnetworkaccessmanager.h>
+#if !defined(QT_NO_GRAPHICSVIEW)
+
class QWebPage;
class QWebHistory;
class QWebSettings;
@@ -156,4 +158,6 @@ private:
friend class QGraphicsWebViewPrivate;
};
+#endif // QT_NO_GRAPHICSVIEW
+
#endif // QGraphicsWebView_h
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index fce2832..e80aac5 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -1297,6 +1297,7 @@ void QWebPagePrivate::adjustPointForClicking(QMouseEvent*)
notImplemented();
}
+#if !defined(QT_NO_GRAPHICSVIEW)
void QWebPagePrivate::adjustPointForClicking(QGraphicsSceneMouseEvent* ev)
{
QtPlatformPlugin platformPlugin;
@@ -1327,6 +1328,7 @@ void QWebPagePrivate::adjustPointForClicking(QGraphicsSceneMouseEvent* ev)
ev->setPos(QPointF(adjustedPoint));
}
+#endif
bool QWebPagePrivate::touchEvent(QTouchEvent* event)
{
@@ -2998,43 +3000,49 @@ bool QWebPage::event(QEvent *ev)
case QEvent::MouseMove:
d->mouseMoveEvent(static_cast<QMouseEvent*>(ev));
break;
- case QEvent::GraphicsSceneMouseMove:
- d->mouseMoveEvent(static_cast<QGraphicsSceneMouseEvent*>(ev));
- break;
case QEvent::MouseButtonPress:
d->mousePressEvent(static_cast<QMouseEvent*>(ev));
break;
- case QEvent::GraphicsSceneMousePress:
- d->mousePressEvent(static_cast<QGraphicsSceneMouseEvent*>(ev));
- break;
case QEvent::MouseButtonDblClick:
d->mouseDoubleClickEvent(static_cast<QMouseEvent*>(ev));
break;
- case QEvent::GraphicsSceneMouseDoubleClick:
- d->mouseDoubleClickEvent(static_cast<QGraphicsSceneMouseEvent*>(ev));
- break;
case QEvent::MouseButtonRelease:
d->mouseReleaseEvent(static_cast<QMouseEvent*>(ev));
break;
+#if !defined(QT_NO_GRAPHICSVIEW)
+ case QEvent::GraphicsSceneMouseMove:
+ d->mouseMoveEvent(static_cast<QGraphicsSceneMouseEvent*>(ev));
+ break;
+ case QEvent::GraphicsSceneMousePress:
+ d->mousePressEvent(static_cast<QGraphicsSceneMouseEvent*>(ev));
+ break;
+ case QEvent::GraphicsSceneMouseDoubleClick:
+ d->mouseDoubleClickEvent(static_cast<QGraphicsSceneMouseEvent*>(ev));
+ break;
case QEvent::GraphicsSceneMouseRelease:
d->mouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent*>(ev));
break;
+#endif
#ifndef QT_NO_CONTEXTMENU
case QEvent::ContextMenu:
d->contextMenuEvent(static_cast<QContextMenuEvent*>(ev)->globalPos());
break;
+#if !defined(QT_NO_GRAPHICSVIEW)
case QEvent::GraphicsSceneContextMenu:
d->contextMenuEvent(static_cast<QGraphicsSceneContextMenuEvent*>(ev)->screenPos());
break;
#endif
+#endif
#ifndef QT_NO_WHEELEVENT
case QEvent::Wheel:
d->wheelEvent(static_cast<QWheelEvent*>(ev));
break;
+#if !defined(QT_NO_GRAPHICSVIEW)
case QEvent::GraphicsSceneWheel:
d->wheelEvent(static_cast<QGraphicsSceneWheelEvent*>(ev));
break;
#endif
+#endif
case QEvent::KeyPress:
d->keyPressEvent(static_cast<QKeyEvent*>(ev));
break;
@@ -3051,28 +3059,31 @@ bool QWebPage::event(QEvent *ev)
case QEvent::DragEnter:
d->dragEnterEvent(static_cast<QDragEnterEvent*>(ev));
break;
- case QEvent::GraphicsSceneDragEnter:
- d->dragEnterEvent(static_cast<QGraphicsSceneDragDropEvent*>(ev));
- break;
case QEvent::DragLeave:
d->dragLeaveEvent(static_cast<QDragLeaveEvent*>(ev));
break;
- case QEvent::GraphicsSceneDragLeave:
- d->dragLeaveEvent(static_cast<QGraphicsSceneDragDropEvent*>(ev));
- break;
case QEvent::DragMove:
d->dragMoveEvent(static_cast<QDragMoveEvent*>(ev));
break;
+ case QEvent::Drop:
+ d->dropEvent(static_cast<QDropEvent*>(ev));
+ break;
+#if !defined(QT_NO_GRAPHICSVIEW)
+ case QEvent::GraphicsSceneDragEnter:
+ d->dragEnterEvent(static_cast<QGraphicsSceneDragDropEvent*>(ev));
+ break;
case QEvent::GraphicsSceneDragMove:
d->dragMoveEvent(static_cast<QGraphicsSceneDragDropEvent*>(ev));
break;
- case QEvent::Drop:
- d->dropEvent(static_cast<QDropEvent*>(ev));
+ case QEvent::GraphicsSceneDragLeave:
+ d->dragLeaveEvent(static_cast<QGraphicsSceneDragDropEvent*>(ev));
break;
case QEvent::GraphicsSceneDrop:
d->dropEvent(static_cast<QGraphicsSceneDragDropEvent*>(ev));
break;
#endif
+
+#endif
case QEvent::InputMethod:
d->inputMethodEvent(static_cast<QInputMethodEvent*>(ev));
break;
diff --git a/WebKit/qt/Api/qwebpage_p.h b/WebKit/qt/Api/qwebpage_p.h
index dc6da7e..7bd1252 100644
--- a/WebKit/qt/Api/qwebpage_p.h
+++ b/WebKit/qt/Api/qwebpage_p.h
@@ -145,7 +145,9 @@ public:
};
void adjustPointForClicking(QMouseEvent*);
+#if !defined(QT_NO_GRAPHICSVIEW)
void adjustPointForClicking(QGraphicsSceneMouseEvent*);
+#endif
void setInspector(QWebInspector*);
QWebInspector* getOrCreateInspector();
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 48dd5d7..14facb4 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,20 @@
+2011-01-14 Sam Magnuson <smagnuso at gmail.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Compile with QT_NO_GRAPHICSVIEW
+ https://bugs.webkit.org/show_bug.cgi?id=49750
+
+ * Api/qgraphicswebview.cpp:
+ * Api/qgraphicswebview.h:
+ * Api/qwebpage.cpp:
+ (QWebPage::event):
+ * Api/qwebpage_p.h:
+ * WebCoreSupport/FrameLoaderClientQt.cpp:
+ (WebCore::FrameLoaderClientQt::createPlugin):
+ * WebCoreSupport/PageClientQt.cpp:
+ * WebCoreSupport/PageClientQt.h:
+
2011-01-14 Yuzo Fujishima <yuzo at google.com>
Reviewed by Antti Koivisto.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 6f7a6c3..ba0370d 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -1405,6 +1405,7 @@ private:
}
};
+#if !defined(QT_NO_GRAPHICSVIEW)
class QtPluginGraphicsWidget: public Widget
{
public:
@@ -1454,6 +1455,7 @@ private:
QGraphicsWidget* graphicsWidget;
};
+#endif // QT_NO_GRAPHICSVIEW
PassRefPtr<Widget> FrameLoaderClientQt::createPlugin(const IntSize& pluginSize, HTMLPlugInElement* element, const KURL& url, const Vector<String>& paramNames,
const Vector<String>& paramValues, const String& mimeType, bool loadManually)
@@ -1527,6 +1529,7 @@ PassRefPtr<Widget> FrameLoaderClientQt::createPlugin(const IntSize& pluginSize,
return w;
}
+#if !defined(QT_NO_GRAPHICSVIEW)
QGraphicsWidget* graphicsWidget = qobject_cast<QGraphicsWidget*>(object);
if (graphicsWidget) {
QGraphicsObject* parentWidget = 0;
@@ -1540,6 +1543,7 @@ PassRefPtr<Widget> FrameLoaderClientQt::createPlugin(const IntSize& pluginSize,
w->setFrameRect(IntRect(0, 0, 0, 0));
return w;
}
+#endif // QT_NO_GRAPHICSVIEW
// FIXME: make things work for widgetless plugins as well
delete object;
diff --git a/WebKit/qt/WebCoreSupport/PageClientQt.cpp b/WebKit/qt/WebCoreSupport/PageClientQt.cpp
index 9fa5bf7..c3869c5 100644
--- a/WebKit/qt/WebCoreSupport/PageClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/PageClientQt.cpp
@@ -116,6 +116,7 @@ private:
QWidget* m_widget;
};
+#if !defined(QT_NO_GRAPHICSVIEW)
class PlatformLayerProxyQGraphicsObject : public PlatformLayerProxyQt {
public:
PlatformLayerProxyQGraphicsObject(QWebFrame* frame, TextureMapperContentLayer* layer, QGraphicsObject* object)
@@ -150,6 +151,7 @@ public:
private:
QGraphicsItem* m_graphicsItem;
};
+#endif // QT_NO_GRAPHICSVIEW
void PageClientQWidget::setRootGraphicsLayer(TextureMapperPlatformLayer* layer)
{
@@ -254,6 +256,7 @@ QRectF PageClientQWidget::windowRect() const
return QRectF(view->window()->geometry());
}
+#if !defined(QT_NO_GRAPHICSVIEW)
PageClientQGraphicsWidget::~PageClientQGraphicsWidget()
{
delete overlay;
@@ -475,5 +478,6 @@ QRectF PageClientQGraphicsWidget::windowRect() const
// The sceneRect is a good approximation of the size of the application, independent of the view.
return view->scene()->sceneRect();
}
+#endif // QT_NO_GRAPHICSVIEW
} // namespace WebCore
diff --git a/WebKit/qt/WebCoreSupport/PageClientQt.h b/WebKit/qt/WebCoreSupport/PageClientQt.h
index 6745cdc..16bb50c 100644
--- a/WebKit/qt/WebCoreSupport/PageClientQt.h
+++ b/WebKit/qt/WebCoreSupport/PageClientQt.h
@@ -108,6 +108,7 @@ public:
#endif
};
+#if !defined(QT_NO_GRAPHICSVIEW)
// the overlay is here for one reason only: to have the scroll-bars and other
// extra UI elements appear on top of any QGraphicsItems created by CSS compositing layers
class QGraphicsItemOverlay : public QGraphicsObject {
@@ -232,6 +233,7 @@ public:
// we need to put the root graphics layer behind the overlay (which contains the scrollbar)
enum { RootGraphicsLayerZValue, OverlayZValue };
};
+#endif // QT_NO_GRAPHICSVIEW
}
#endif // PageClientQt
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list