Diff
Modified: trunk/Source/WebKit2/ChangeLog (90749 => 90750)
--- trunk/Source/WebKit2/ChangeLog 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-11 15:53:47 UTC (rev 90750)
@@ -1,3 +1,49 @@
+2011-07-11 Benjamin Poulain <benja...@webkit.org>
+
+ [Qt][WK2] Forward the viewport visible area from the view instead of inferring it from the TiledDrawingAreaProxy
+ https://bugs.webkit.org/show_bug.cgi?id=64275
+
+ Reviewed by Simon Hausmann.
+
+ This patch refactors the way the viewport visible area is handled.
+ Previously, the TiledDrawingAreaProxy would ask for the visible rect
+ when painting or updating. This is reversed with this patch, and the viewport
+ informs the page of any change in the view area.
+
+ With this change, the TiledDrawingAreaProxy does not need to know about QTouchWebPage,
+ and can use the TouchViewInterface directly.
+
+ * UIProcess/API/qt/qtouchwebpage.cpp:
+ (QTouchWebPagePrivate::setViewportRect):
+ * UIProcess/API/qt/qtouchwebpage.h:
+ * UIProcess/API/qt/qtouchwebpage_p.h:
+ * UIProcess/API/qt/qtouchwebview.cpp:
+ (QTouchWebViewPrivate::scroll):
+ (QTouchWebViewPrivate::viewportRectUpdated):
+ (QTouchWebView::resizeEvent):
+ * UIProcess/API/qt/qtouchwebview.h:
+ * UIProcess/API/qt/qtouchwebview_p.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/TiledDrawingAreaProxy.cpp:
+ (WebKit::TiledDrawingAreaProxy::invalidate):
+ (WebKit::TiledDrawingAreaProxy::paint):
+ (WebKit::TiledDrawingAreaProxy::setVisibleArea):
+ (WebKit::TiledDrawingAreaProxy::createTiles):
+ * UIProcess/TiledDrawingAreaProxy.h:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ * UIProcess/qt/QtWebPageProxy.h:
+ * UIProcess/qt/TiledDrawingAreaProxyQt.cpp:
+ (WebKit::TiledDrawingAreaProxy::updateWebView):
+ * UIProcess/qt/TouchViewInterface.cpp:
+ (WebKit::TouchViewInterface::contentSizeChanged):
+ * UIProcess/qt/TouchViewInterface.h:
+ * UIProcess/qt/WebPageProxyQt.cpp:
+ * UIProcess/qt/qtouchwebpageproxy.cpp:
+ (QTouchWebPageProxy::createDrawingAreaProxy):
+ (QTouchWebPageProxy::setVisibleArea):
+ * UIProcess/qt/qtouchwebpageproxy.h:
+
2011-07-11 Andreas Kling <kl...@webkit.org>
[Qt][WK2] Move zoomable-area-for-point functionality to QTouchWebPageProxy
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp 2011-07-11 15:53:47 UTC (rev 90750)
@@ -153,21 +153,6 @@
{
}
-QRectF QTouchWebPage::visibleRect() const
-{
- if (!scene())
- return QRectF();
-
- QList<QGraphicsView*> views = scene()->views();
- if (views.isEmpty())
- return QRectF();
-
- QGraphicsView* graphicsView = views.at(0);
- int xOffset = graphicsView->horizontalScrollBar()->value();
- int yOffset = graphicsView->verticalScrollBar()->value();
- return mapRectFromScene(QRectF(QPointF(xOffset, yOffset), graphicsView->viewport()->size()));
-}
-
void QTouchWebPagePrivate::prepareScaleChange()
{
ASSERT(!m_isChangingScale);
@@ -196,4 +181,10 @@
QObject::connect(page, SIGNAL(focusNextPrevChild(bool)), q, SLOT(focusNextPrevChildCallback(bool)));
}
+void QTouchWebPagePrivate::setViewportRect(const QRectF& viewportRect)
+{
+ const QRectF visibleArea = q->boundingRect().intersected(viewportRect);
+ page->setVisibleArea(visibleArea);
+}
+
#include "moc_qtouchwebpage.cpp"
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h 2011-07-11 15:53:47 UTC (rev 90750)
@@ -54,9 +54,6 @@
virtual void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*);
virtual bool event(QEvent*);
- // FIXME: should not be public
- virtual QRectF visibleRect() const;
-
Q_SIGNALS:
void urlChanged(const QUrl&);
void titleChanged(const QString&);
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage_p.h (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage_p.h 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage_p.h 2011-07-11 15:53:47 UTC (rev 90750)
@@ -25,8 +25,9 @@
#include <QBasicTimer>
#include "qtouchwebpage.h"
+class QRectF;
+class QString;
class QTouchWebPage;
-class QString;
class QTouchWebPageProxy;
class QTouchWebPagePrivate {
@@ -37,7 +38,7 @@
void setPage(QTouchWebPageProxy*);
- void setViewportSize(const QSizeF&);
+ void setViewportRect(const QRectF&);
void prepareScaleChange();
void commitScaleChange();
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.cpp 2011-07-11 15:53:47 UTC (rev 90750)
@@ -40,8 +40,16 @@
void QTouchWebViewPrivate::scroll(qreal deltaX, qreal deltaY)
{
pageView->moveBy(deltaX, deltaY);
+ viewportRectUpdated();
}
+void QTouchWebViewPrivate::viewportRectUpdated()
+{
+ QTouchWebPagePrivate* const pageViewPrivate = QTouchWebPagePrivate::getPageViewPrivate(pageView.data());
+ const QRectF viewportRectInPageViewCoordinate = q->mapRectToItem(pageView.data(), q->boundingRect());
+ pageViewPrivate->setViewportRect(viewportRectInPageViewCoordinate);
+}
+
QTouchWebView::QTouchWebView()
: d(new QTouchWebViewPrivate(this))
{
@@ -57,3 +65,9 @@
{
return d->pageView.data();
}
+
+void QTouchWebView::resizeEvent(QGraphicsSceneResizeEvent* event)
+{
+ QGraphicsWidget::resizeEvent(event);
+ d->viewportRectUpdated();
+}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.h (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.h 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview.h 2011-07-11 15:53:47 UTC (rev 90750)
@@ -43,6 +43,9 @@
QTouchWebPage *page();
+protected:
+ void resizeEvent(QGraphicsSceneResizeEvent*);
+
private:
friend class WebKit::TouchViewInterface;
QTouchWebViewPrivate *d;
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview_p.h (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview_p.h 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebview_p.h 2011-07-11 15:53:47 UTC (rev 90750)
@@ -33,6 +33,7 @@
public:
QTouchWebViewPrivate(QTouchWebView* q);
void scroll(qreal deltaX, qreal deltaY);
+ void viewportRectUpdated();
QTouchWebView* const q;
QScopedPointer<QTouchWebPage> pageView;
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2011-07-11 15:53:47 UTC (rev 90750)
@@ -107,8 +107,6 @@
virtual void didFindZoomableArea(const WebCore::IntRect&) = 0;
virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage) = 0;
-
- virtual WebCore::IntRect viewportVisibleRect() const = 0;
#endif
virtual void setCursor(const WebCore::Cursor&) = 0;
Modified: trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp 2011-07-11 15:53:47 UTC (rev 90750)
@@ -181,7 +181,7 @@
TiledDrawingAreaTile::Coordinate topLeft = tileCoordinateForPoint(dirtyRect.location());
TiledDrawingAreaTile::Coordinate bottomRight = tileCoordinateForPoint(innerBottomRight(dirtyRect));
- IntRect coverRect = calculateCoverRect(m_previousVisibleRect);
+ IntRect coverRect = calculateCoverRect(m_visibleArea);
Vector<TiledDrawingAreaTile::Coordinate> tilesToRemove;
@@ -265,8 +265,6 @@
return false;
}
- adjustVisibleRect();
-
GraphicsContext gc(context);
gc.save();
@@ -292,14 +290,12 @@
return true;
}
-void TiledDrawingAreaProxy::adjustVisibleRect()
+void TiledDrawingAreaProxy::setVisibleArea(const WebCore::IntRect& visibleArea)
{
- IntRect visibleRect = mapFromContents(webViewVisibleRect());
- if (m_previousVisibleRect == visibleRect)
- return;
- m_previousVisibleRect = visibleRect;
-
- startTileCreationTimer();
+ if (m_visibleArea != visibleArea) {
+ m_visibleArea = visibleArea;
+ startTileCreationTimer();
+ }
}
void TiledDrawingAreaProxy::setContentsScale(float scale)
@@ -355,17 +351,14 @@
void TiledDrawingAreaProxy::createTiles()
{
- IntRect visibleRect = mapFromContents(webViewVisibleRect());
- m_previousVisibleRect = visibleRect;
-
- if (visibleRect.isEmpty())
+ if (m_visibleArea.isEmpty())
return;
// Resize tiles on edges in case the contents size has changed.
bool didResizeTiles = resizeEdgeTiles();
// Remove tiles outside out current maximum keep rect.
- dropTilesOutsideRect(calculateKeepRect(visibleRect));
+ dropTilesOutsideRect(calculateKeepRect(m_visibleArea));
// Search for the tile position closest to the viewport center that does not yet contain a tile.
// Which position is considered the closest depends on the tileDistance function.
@@ -373,13 +366,13 @@
Vector<TiledDrawingAreaTile::Coordinate> tilesToCreate;
unsigned requiredTileCount = 0;
bool hasVisibleCheckers = false;
- TiledDrawingAreaTile::Coordinate topLeft = tileCoordinateForPoint(visibleRect.location());
- TiledDrawingAreaTile::Coordinate bottomRight = tileCoordinateForPoint(innerBottomRight(visibleRect));
+ TiledDrawingAreaTile::Coordinate topLeft = tileCoordinateForPoint(m_visibleArea.location());
+ TiledDrawingAreaTile::Coordinate bottomRight = tileCoordinateForPoint(innerBottomRight(m_visibleArea));
for (unsigned yCoordinate = topLeft.y(); yCoordinate <= bottomRight.y(); ++yCoordinate) {
for (unsigned xCoordinate = topLeft.x(); xCoordinate <= bottomRight.x(); ++xCoordinate) {
TiledDrawingAreaTile::Coordinate currentCoordinate(xCoordinate, yCoordinate);
// Distance is 0 for all currently visible tiles.
- double distance = tileDistance(visibleRect, currentCoordinate);
+ double distance = tileDistance(m_visibleArea, currentCoordinate);
RefPtr<TiledDrawingAreaTile> tile = tileAt(currentCoordinate);
if (!distance && (!tile || !tile->isReadyToPaint()))
Modified: trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.h (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.h 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.h 2011-07-11 15:53:47 UTC (rev 90750)
@@ -43,9 +43,6 @@
#else
class WKView;
#endif
-#elif PLATFORM(QT)
-class QTouchWebPage;
-#include <QImage>
#endif
namespace WebKit {
@@ -59,7 +56,8 @@
class WebView;
typedef WebView PlatformWebView;
#elif PLATFORM(QT)
-typedef QTouchWebPage PlatformWebView;
+class TouchViewInterface;
+typedef TouchViewInterface PlatformWebView;
#endif
class TiledDrawingAreaProxy : public DrawingAreaProxy {
@@ -69,6 +67,7 @@
TiledDrawingAreaProxy(PlatformWebView*, WebPageProxy*);
virtual ~TiledDrawingAreaProxy();
+ void setVisibleArea(const WebCore::IntRect& visibleRect);
float contentsScale() const { return m_contentsScale; }
void setContentsScale(float);
@@ -102,7 +101,6 @@
private:
WebPageProxy* page();
- WebCore::IntRect webViewVisibleRect();
void updateWebView(const Vector<WebCore::IntRect>& paintedArea);
// DrawingAreaProxy
@@ -115,8 +113,6 @@
virtual void tileUpdated(int tileID, const UpdateInfo& updateInfo, float scale, unsigned pendingUpdateCount);
virtual void allTileUpdatesProcessed();
- void adjustVisibleRect();
-
void requestTileUpdate(int tileID, const WebCore::IntRect& dirtyRect);
PassRefPtr<TiledDrawingAreaTile> createTile(const TiledDrawingAreaTile::Coordinate&);
@@ -170,7 +166,7 @@
WebCore::FloatSize m_keepAreaMultiplier;
WebCore::FloatSize m_coverAreaMultiplier;
- WebCore::IntRect m_previousVisibleRect;
+ WebCore::IntRect m_visibleArea;
float m_contentsScale;
friend class TiledDrawingAreaTile;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-07-11 15:53:47 UTC (rev 90750)
@@ -510,7 +510,6 @@
#if PLATFORM(QT)
void findZoomableAreaForPoint(const WebCore::IntPoint&);
- WebCore::IntRect viewportVisibleRect();
#endif
void advanceToNextMisspelling(bool startBeforeSelection) const;
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-07-11 15:53:47 UTC (rev 90750)
@@ -533,11 +533,6 @@
m_viewInterface->processDidCrash();
}
-void QtWebPageProxy::setActualVisibleContentsRect(const QRect& rect) const
-{
- m_webPageProxy->setActualVisibleContentRect(rect);
-}
-
QWKPreferences* QtWebPageProxy::preferences() const
{
if (!m_preferences) {
@@ -768,12 +763,6 @@
m_webPageProxy->dragEnded(clientPosition, globalPosition, dropActionToDragOperation(actualDropAction));
}
-WebCore::IntRect QtWebPageProxy::viewportVisibleRect() const
-{
- // FIXME: TODO
- return IntRect();
-}
-
void QtWebPageProxy::setPageIsVisible(bool isVisible)
{
m_webPageProxy->drawingArea()->setPageIsVisible(isVisible);
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h 2011-07-11 15:53:47 UTC (rev 90750)
@@ -110,7 +110,6 @@
virtual void didChangeContentsSize(const WebCore::IntSize&);
virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage);
- virtual WebCore::IntRect viewportVisibleRect() const;
virtual void setCursor(const WebCore::Cursor&);
virtual void toolTipChanged(const WTF::String&, const WTF::String&);
virtual void registerEditCommand(PassRefPtr<WebKit::WebEditCommandProxy>, WebKit::WebPageProxy::UndoOrRedo);
@@ -169,8 +168,6 @@
QString title() const;
- void setActualVisibleContentsRect(const QRect& rect) const;
-
QAction* navigationAction(QtWebKit::NavigationAction) const;
QAction* action(WebAction action) const;
Modified: trunk/Source/WebKit2/UIProcess/qt/TiledDrawingAreaProxyQt.cpp (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/qt/TiledDrawingAreaProxyQt.cpp 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/qt/TiledDrawingAreaProxyQt.cpp 2011-07-11 15:53:47 UTC (rev 90750)
@@ -27,11 +27,10 @@
#include "TiledDrawingAreaProxy.h"
#include "ShareableBitmap.h"
+#include "TouchViewInterface.h"
#include "WKAPICast.h"
#include "WebPageProxy.h"
-#include "qtouchwebpage.h"
-
using namespace WebCore;
#define TILE_DEBUG_LOG
@@ -45,14 +44,9 @@
unsigned size = paintedArea.size();
for (unsigned n = 0; n < size; ++n)
- m_webView->update(QRect(paintedArea[n]));
+ static_cast<ViewInterface*>(m_webView)->setViewNeedsDisplay(QRect(paintedArea[n]));
}
-IntRect TiledDrawingAreaProxy::webViewVisibleRect()
-{
- return enclosingIntRect(FloatRect(m_webView->visibleRect()));
-}
-
WebPageProxy* TiledDrawingAreaProxy::page()
{
return m_webPageProxy;
Modified: trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp 2011-07-11 15:53:47 UTC (rev 90750)
@@ -69,7 +69,13 @@
void TouchViewInterface::contentSizeChanged(const QSize& newSize)
{
+ // FIXME: the viewport should take care of:
+ // -resize the page
+ // -change the zoom level if needed
+ // -move the page back in viewport boundaries if needed
+ // -update the viewport rect
m_pageView->resize(newSize);
+ m_viewportView->d->viewportRectUpdated();
}
bool TouchViewInterface::isActive()
Modified: trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.h (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.h 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.h 2011-07-11 15:53:47 UTC (rev 90750)
@@ -32,7 +32,6 @@
{
public:
TouchViewInterface(QTouchWebView* viewportView, QTouchWebPage* pageView);
- QTouchWebPage* pageView() const { return m_pageView; }
void panGestureStarted();
void panGestureRequestScroll(qreal deltaX, qreal deltaY);
Modified: trunk/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp 2011-07-11 15:53:47 UTC (rev 90750)
@@ -47,9 +47,4 @@
notImplemented();
}
-WebCore::IntRect WebPageProxy::viewportVisibleRect()
-{
- return m_pageClient->viewportVisibleRect();
-}
-
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp 2011-07-11 15:53:47 UTC (rev 90750)
@@ -39,7 +39,7 @@
PassOwnPtr<DrawingAreaProxy> QTouchWebPageProxy::createDrawingAreaProxy()
{
- return TiledDrawingAreaProxy::create(pageView(), m_webPageProxy.get());
+ return TiledDrawingAreaProxy::create(touchViewInterface(), m_webPageProxy.get());
}
void QTouchWebPageProxy::processDidCrash()
@@ -81,6 +81,17 @@
return QtWebPageProxy::handleEvent(ev);
}
+void QTouchWebPageProxy::setVisibleArea(const QRectF& visibleArea)
+{
+ TiledDrawingAreaProxy* tiledDrawingArea = static_cast<TiledDrawingAreaProxy*>(m_webPageProxy->drawingArea());
+ QRect alignedVisibleArea = visibleArea.toAlignedRect();
+ tiledDrawingArea->setVisibleArea(alignedVisibleArea);
+
+ // FIXME: Once we support suspend and resume, this should be delayed until the page is active if the page is suspended.
+ IntRect contentVisibleArea = tiledDrawingArea->mapToContents(alignedVisibleArea);
+ m_webPageProxy->setActualVisibleContentRect(contentVisibleArea);
+}
+
void QTouchWebPageProxy::setResizesToContentsUsingLayoutSize(const QSize& targetLayoutSize)
{
m_webPageProxy->setResizesToContentsUsingLayoutSize(targetLayoutSize);
Modified: trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h (90749 => 90750)
--- trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h 2011-07-11 15:44:10 UTC (rev 90749)
+++ trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h 2011-07-11 15:53:47 UTC (rev 90750)
@@ -26,7 +26,6 @@
#include "QtPanGestureRecognizer.h"
#include "QtWebPageProxy.h"
#include "TouchViewInterface.h"
-#include "qtouchwebpage.h"
#include <wtf/PassOwnPtr.h>
using namespace WebKit;
@@ -38,6 +37,7 @@
virtual bool handleEvent(QEvent*);
+ void setVisibleArea(const QRectF&);
void setResizesToContentsUsingLayoutSize(const QSize& targetLayoutSize);
void findZoomableAreaForPoint(const QPoint&);
@@ -54,7 +54,6 @@
virtual void didFindZoomableArea(const WebCore::IntRect&);
TouchViewInterface* touchViewInterface() const { return static_cast<TouchViewInterface*>(m_viewInterface); }
- QTouchWebPage* pageView() const { return static_cast<QTouchWebPage*>(touchViewInterface()->pageView()); }
void touchEvent(QTouchEvent*);
