Diff
Modified: trunk/Source/WebKit2/ChangeLog (92683 => 92684)
--- trunk/Source/WebKit2/ChangeLog 2011-08-09 14:24:36 UTC (rev 92683)
+++ trunk/Source/WebKit2/ChangeLog 2011-08-09 14:28:38 UTC (rev 92684)
@@ -1,5 +1,29 @@
2011-08-09 Kenneth Rohde Christiansen <[email protected]>
+ [Qt] Redirect didFindZoomableArea thru to the view
+ https://bugs.webkit.org/show_bug.cgi?id=65913
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/API/qt/qdesktopwebview.cpp:
+ (QDesktopWebViewPrivate::didFindZoomableArea):
+ * UIProcess/API/qt/qdesktopwebview_p.h:
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ (QtWebPageProxy::didFindZoomableArea):
+ * UIProcess/qt/QtWebPageProxy.h:
+ * UIProcess/qt/TouchViewInterface.cpp:
+ (WebKit::TouchViewInterface::didFindZoomableArea):
+ * UIProcess/qt/TouchViewInterface.h:
+ * UIProcess/qt/ViewInterface.h:
+ * UIProcess/qt/qdesktopwebpageproxy.cpp:
+ (QDesktopWebPageProxy::timerEvent):
+ * UIProcess/qt/qdesktopwebpageproxy.h:
+ * UIProcess/qt/qtouchwebpageproxy.cpp:
+ (QTouchWebPageProxy::setContentsScale):
+ * UIProcess/qt/qtouchwebpageproxy.h:
+
+2011-08-09 Kenneth Rohde Christiansen <[email protected]>
+
[Qt] Vastly improve the algorithm for finding a zoomable area when doing double-tap
https://bugs.webkit.org/show_bug.cgi?id=65907
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp (92683 => 92684)
--- trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp 2011-08-09 14:24:36 UTC (rev 92683)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp 2011-08-09 14:28:38 UTC (rev 92684)
@@ -89,6 +89,11 @@
*clientPosition = widget->mapFromGlobal(*globalPosition);
}
+void QDesktopWebViewPrivate::didFindZoomableArea(const QPoint&, const QRect&)
+{
+ // This feature is only used by QTouchWebView.
+}
+
void QDesktopWebViewPrivate::didChangeUrl(const QUrl& url)
{
emit q->urlChanged(url);
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview_p.h (92683 => 92684)
--- trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview_p.h 2011-08-09 14:24:36 UTC (rev 92683)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview_p.h 2011-08-09 14:28:38 UTC (rev 92684)
@@ -52,6 +52,7 @@
virtual bool isVisible();
virtual void startDrag(Qt::DropActions supportedDropActions, const QImage& dragImage, QMimeData*, QPoint* clientPosition, QPoint* globalPosition, Qt::DropAction* dropAction);
+ virtual void didFindZoomableArea(const QPoint&, const QRect&);
virtual void didChangeUrl(const QUrl&);
virtual void didChangeTitle(const QString&);
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (92683 => 92684)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-08-09 14:24:36 UTC (rev 92683)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-08-09 14:28:38 UTC (rev 92684)
@@ -400,6 +400,11 @@
return toAPI(m_webPageProxy.get());;
}
+void QtWebPageProxy::didFindZoomableArea(const IntPoint& target, const IntRect& area)
+{
+ m_viewInterface->didFindZoomableArea(QPoint(target), QRect(area));
+}
+
void QtWebPageProxy::didChangeUrl(const QUrl& url)
{
m_viewInterface->didChangeUrl(url);
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h (92683 => 92684)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h 2011-08-09 14:24:36 UTC (rev 92683)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h 2011-08-09 14:28:38 UTC (rev 92684)
@@ -127,6 +127,8 @@
virtual void countStringMatchesInCustomRepresentation(const String&, FindOptions, unsigned maxMatchCount) { }
virtual float userSpaceScaleFactor() const { return 1; }
+ virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&);
+
void didChangeUrl(const QUrl&);
void didChangeTitle(const QString&);
Modified: trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp (92683 => 92684)
--- trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp 2011-08-09 14:24:36 UTC (rev 92683)
+++ trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp 2011-08-09 14:28:38 UTC (rev 92684)
@@ -91,6 +91,10 @@
m_viewportView->d->viewportRectUpdated();
}
+void TouchViewInterface::didFindZoomableArea(const QPoint&, const QRect&)
+{
+}
+
SGAgent* TouchViewInterface::sceneGraphAgent() const
{
return &m_pageView->d->sgAgent;
Modified: trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.h (92683 => 92684)
--- trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.h 2011-08-09 14:24:36 UTC (rev 92683)
+++ trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.h 2011-08-09 14:28:38 UTC (rev 92684)
@@ -59,6 +59,7 @@
virtual bool isVisible();
virtual void startDrag(Qt::DropActions supportedDropActions, const QImage& dragImage, QMimeData* data, QPoint* clientPosition, QPoint* globalPosition, Qt::DropAction* dropAction);
+ virtual void didFindZoomableArea(const QPoint&, const QRect&);
virtual void didChangeUrl(const QUrl&);
virtual void didChangeTitle(const QString&);
Modified: trunk/Source/WebKit2/UIProcess/qt/ViewInterface.h (92683 => 92684)
--- trunk/Source/WebKit2/UIProcess/qt/ViewInterface.h 2011-08-09 14:24:36 UTC (rev 92683)
+++ trunk/Source/WebKit2/UIProcess/qt/ViewInterface.h 2011-08-09 14:28:38 UTC (rev 92684)
@@ -53,6 +53,7 @@
virtual bool isVisible() = 0;
virtual void startDrag(Qt::DropActions supportedDropActions, const QImage& dragImage, QMimeData* data, QPoint* clientPosition, QPoint* globalPosition, Qt::DropAction* dropAction) = 0;
+ virtual void didFindZoomableArea(const QPoint&, const QRect&) = 0;
virtual void didChangeUrl(const QUrl&) = 0;
virtual void didChangeTitle(const QString&) = 0;
Modified: trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp (92683 => 92684)
--- trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp 2011-08-09 14:24:36 UTC (rev 92683)
+++ trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp 2011-08-09 14:28:38 UTC (rev 92684)
@@ -225,8 +225,3 @@
else
QObject::timerEvent(ev);
}
-
-void QDesktopWebPageProxy::didFindZoomableArea(const IntPoint&, const IntRect&)
-{
- // This feature is only used by QTouchWebView.
-}
Modified: trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.h (92683 => 92684)
--- trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.h 2011-08-09 14:24:36 UTC (rev 92683)
+++ trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.h 2011-08-09 14:28:38 UTC (rev 92684)
@@ -46,7 +46,6 @@
#if ENABLE(TOUCH_EVENTS)
virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled);
#endif
- virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&);
virtual void timerEvent(QTimerEvent*);
Modified: trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp (92683 => 92684)
--- trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp 2011-08-09 14:24:36 UTC (rev 92683)
+++ trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp 2011-08-09 14:28:38 UTC (rev 92684)
@@ -120,8 +120,3 @@
{
drawingArea()->setContentsScale(scale);
}
-
-void QTouchWebPageProxy::didFindZoomableArea(const IntPoint& target, const IntRect& area)
-{
- emit zoomableAreaFound(QRect(area));
-}
Modified: trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h (92683 => 92684)
--- trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h 2011-08-09 14:24:36 UTC (rev 92683)
+++ trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h 2011-08-09 14:28:38 UTC (rev 92684)
@@ -54,7 +54,6 @@
#if ENABLE(TOUCH_EVENTS)
virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled);
#endif
- virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&);
TouchViewInterface* touchViewInterface() const { return static_cast<TouchViewInterface*>(m_viewInterface); }
TiledDrawingAreaProxy* drawingArea() const { return static_cast<WebKit::TiledDrawingAreaProxy*>(m_webPageProxy->drawingArea()); }
