Title: [90739] trunk/Source/WebKit2
- Revision
- 90739
- Author
- andreas.kl...@nokia.com
- Date
- 2011-07-11 06:25:24 -0700 (Mon, 11 Jul 2011)
Log Message
[Qt][WK2] Move zoomable-area-for-point functionality to QTouchWebPageProxy
https://bugs.webkit.org/show_bug.cgi?id=64273
Reviewed by Kenneth Rohde Christiansen.
* UIProcess/qt/QtWebPageProxy.cpp:
* UIProcess/qt/QtWebPageProxy.h:
* UIProcess/qt/qdesktopwebpageproxy.cpp:
(QDesktopWebPageProxy::didFindZoomableArea):
* UIProcess/qt/qdesktopwebpageproxy.h:
* UIProcess/qt/qtouchwebpageproxy.cpp:
(QTouchWebPageProxy::findZoomableAreaForPoint):
(QTouchWebPageProxy::didFindZoomableArea):
* UIProcess/qt/qtouchwebpageproxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (90738 => 90739)
--- trunk/Source/WebKit2/ChangeLog 2011-07-11 12:32:18 UTC (rev 90738)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-11 13:25:24 UTC (rev 90739)
@@ -1,3 +1,20 @@
+2011-07-11 Andreas Kling <kl...@webkit.org>
+
+ [Qt][WK2] Move zoomable-area-for-point functionality to QTouchWebPageProxy
+ https://bugs.webkit.org/show_bug.cgi?id=64273
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ * UIProcess/qt/QtWebPageProxy.h:
+ * UIProcess/qt/qdesktopwebpageproxy.cpp:
+ (QDesktopWebPageProxy::didFindZoomableArea):
+ * UIProcess/qt/qdesktopwebpageproxy.h:
+ * UIProcess/qt/qtouchwebpageproxy.cpp:
+ (QTouchWebPageProxy::findZoomableAreaForPoint):
+ (QTouchWebPageProxy::didFindZoomableArea):
+ * UIProcess/qt/qtouchwebpageproxy.h:
+
2011-07-10 Anders Carlsson <ander...@apple.com>
WebKit2 is leaking NSCursors created by leakNamedCursor
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (90738 => 90739)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-07-11 12:32:18 UTC (rev 90738)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-07-11 13:25:24 UTC (rev 90739)
@@ -745,16 +745,6 @@
return a;
}
-void QtWebPageProxy::findZoomableAreaForPoint(const QPoint& point)
-{
- m_webPageProxy->findZoomableAreaForPoint(point);
-}
-
-void QtWebPageProxy::didFindZoomableArea(const IntRect& area)
-{
- emit zoomableAreaFound(QRect(area));
-}
-
void QtWebPageProxy::startDrag(const WebCore::DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
{
QImage dragQImage;
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h (90738 => 90739)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h 2011-07-11 12:32:18 UTC (rev 90738)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h 2011-07-11 13:25:24 UTC (rev 90739)
@@ -108,7 +108,7 @@
virtual void pageClosed() { }
virtual void didRelaunchProcess();
virtual void didChangeContentsSize(const WebCore::IntSize&);
- virtual void didFindZoomableArea(const WebCore::IntRect&);
+
virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage);
virtual WebCore::IntRect viewportVisibleRect() const;
virtual void setCursor(const WebCore::Cursor&);
@@ -188,8 +188,6 @@
QWKHistory* history() const;
- void findZoomableAreaForPoint(const QPoint&);
-
void setPageIsVisible(bool);
public Q_SLOTS:
Modified: trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp (90738 => 90739)
--- trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp 2011-07-11 12:32:18 UTC (rev 90738)
+++ trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp 2011-07-11 13:25:24 UTC (rev 90739)
@@ -225,3 +225,8 @@
else
QObject::timerEvent(ev);
}
+
+void QDesktopWebPageProxy::didFindZoomableArea(const IntRect&)
+{
+ // This feature is only used by QTouchWebView.
+}
Modified: trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.h (90738 => 90739)
--- trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.h 2011-07-11 12:32:18 UTC (rev 90738)
+++ trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.h 2011-07-11 13:25:24 UTC (rev 90739)
@@ -46,6 +46,7 @@
#if ENABLE(TOUCH_EVENTS)
virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled);
#endif
+ virtual void didFindZoomableArea(const WebCore::IntRect&);
virtual void timerEvent(QTimerEvent*);
Modified: trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp (90738 => 90739)
--- trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp 2011-07-11 12:32:18 UTC (rev 90738)
+++ trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp 2011-07-11 13:25:24 UTC (rev 90739)
@@ -96,3 +96,13 @@
ev->ignore();
#endif
}
+
+void QTouchWebPageProxy::findZoomableAreaForPoint(const QPoint& point)
+{
+ m_webPageProxy->findZoomableAreaForPoint(point);
+}
+
+void QTouchWebPageProxy::didFindZoomableArea(const IntRect& area)
+{
+ emit zoomableAreaFound(QRect(area));
+}
Modified: trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h (90738 => 90739)
--- trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h 2011-07-11 12:32:18 UTC (rev 90738)
+++ trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h 2011-07-11 13:25:24 UTC (rev 90739)
@@ -39,6 +39,7 @@
virtual bool handleEvent(QEvent*);
void setResizesToContentsUsingLayoutSize(const QSize& targetLayoutSize);
+ void findZoomableAreaForPoint(const QPoint&);
protected:
virtual void paintContent(QPainter* painter, const QRect& area);
@@ -50,6 +51,7 @@
#if ENABLE(TOUCH_EVENTS)
virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled);
#endif
+ virtual void didFindZoomableArea(const WebCore::IntRect&);
TouchViewInterface* touchViewInterface() const { return static_cast<TouchViewInterface*>(m_viewInterface); }
QTouchWebPage* pageView() const { return static_cast<QTouchWebPage*>(touchViewInterface()->pageView()); }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
