Changeset 92684 in webkit


Ignore:
Timestamp:
Aug 9, 2011 7:28:38 AM (13 years ago)
Author:
kenneth@webkit.org
Message:

[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:
Location:
trunk/Source/WebKit2
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r92680 r92684  
     12011-08-09  Kenneth Rohde Christiansen  <kenneth@webkit.org>
     2
     3        [Qt] Redirect didFindZoomableArea thru to the view
     4        https://bugs.webkit.org/show_bug.cgi?id=65913
     5
     6        Reviewed by Andreas Kling.
     7
     8        * UIProcess/API/qt/qdesktopwebview.cpp:
     9        (QDesktopWebViewPrivate::didFindZoomableArea):
     10        * UIProcess/API/qt/qdesktopwebview_p.h:
     11        * UIProcess/qt/QtWebPageProxy.cpp:
     12        (QtWebPageProxy::didFindZoomableArea):
     13        * UIProcess/qt/QtWebPageProxy.h:
     14        * UIProcess/qt/TouchViewInterface.cpp:
     15        (WebKit::TouchViewInterface::didFindZoomableArea):
     16        * UIProcess/qt/TouchViewInterface.h:
     17        * UIProcess/qt/ViewInterface.h:
     18        * UIProcess/qt/qdesktopwebpageproxy.cpp:
     19        (QDesktopWebPageProxy::timerEvent):
     20        * UIProcess/qt/qdesktopwebpageproxy.h:
     21        * UIProcess/qt/qtouchwebpageproxy.cpp:
     22        (QTouchWebPageProxy::setContentsScale):
     23        * UIProcess/qt/qtouchwebpageproxy.h:
     24
    1252011-08-09  Kenneth Rohde Christiansen  <kenneth@webkit.org>
    226

  • trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.cpp

    r92373 r92684  
    9090}
    9191
     92void QDesktopWebViewPrivate::didFindZoomableArea(const QPoint&, const QRect&)
     93{
     94    // This feature is only used by QTouchWebView.
     95}
     96
    9297void QDesktopWebViewPrivate::didChangeUrl(const QUrl& url)
    9398{

  • trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview_p.h

    r92373 r92684  
    5353
    5454    virtual void startDrag(Qt::DropActions supportedDropActions, const QImage& dragImage, QMimeData*, QPoint* clientPosition, QPoint* globalPosition, Qt::DropAction* dropAction);
     55    virtual void didFindZoomableArea(const QPoint&, const QRect&);
    5556
    5657    virtual void didChangeUrl(const QUrl&);

  • trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp

    r91985 r92684  
    401401}
    402402
     403void QtWebPageProxy::didFindZoomableArea(const IntPoint& target, const IntRect& area)
     404{
     405    m_viewInterface->didFindZoomableArea(QPoint(target), QRect(area));
     406}
     407
    403408void QtWebPageProxy::didChangeUrl(const QUrl& url)
    404409{

  • trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h

    r91985 r92684  
    128128    virtual float userSpaceScaleFactor() const { return 1; }
    129129
     130    virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&);
     131
    130132    void didChangeUrl(const QUrl&);
    131133    void didChangeTitle(const QString&);

  • trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp

    r92376 r92684  
    9292}
    9393
     94void TouchViewInterface::didFindZoomableArea(const QPoint&, const QRect&)
     95{
     96}
     97
    9498SGAgent* TouchViewInterface::sceneGraphAgent() const
    9599{

  • trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.h

    r92376 r92684  
    6060
    6161    virtual void startDrag(Qt::DropActions supportedDropActions, const QImage& dragImage, QMimeData* data, QPoint* clientPosition, QPoint* globalPosition, Qt::DropAction* dropAction);
     62    virtual void didFindZoomableArea(const QPoint&, const QRect&);
    6263
    6364    virtual void didChangeUrl(const QUrl&);

  • trunk/Source/WebKit2/UIProcess/qt/ViewInterface.h

    r91863 r92684  
    5454
    5555    virtual void startDrag(Qt::DropActions supportedDropActions, const QImage& dragImage, QMimeData* data, QPoint* clientPosition, QPoint* globalPosition, Qt::DropAction* dropAction) = 0;
     56    virtual void didFindZoomableArea(const QPoint&, const QRect&) = 0;
    5657
    5758    virtual void didChangeUrl(const QUrl&) = 0;

  • trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp

    r92680 r92684  
    226226        QObject::timerEvent(ev);
    227227}
    228 
    229 void QDesktopWebPageProxy::didFindZoomableArea(const IntPoint&, const IntRect&)
    230 {
    231     // This feature is only used by QTouchWebView.
    232 }

  • trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.h

    r92680 r92684  
    4747    virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled);
    4848#endif
    49     virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&);
    5049
    5150    virtual void timerEvent(QTimerEvent*);

  • trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.cpp

    r92680 r92684  
    121121    drawingArea()->setContentsScale(scale);
    122122}
    123 
    124 void QTouchWebPageProxy::didFindZoomableArea(const IntPoint& target, const IntRect& area)
    125 {
    126     emit zoomableAreaFound(QRect(area));
    127 }

  • trunk/Source/WebKit2/UIProcess/qt/qtouchwebpageproxy.h

    r92680 r92684  
    5555    virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled);
    5656#endif
    57     virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&);
    5857
    5958    TouchViewInterface* touchViewInterface() const { return static_cast<TouchViewInterface*>(m_viewInterface); }
Note: See TracChangeset for help on using the changeset viewer.