Changeset 90739 in webkit


Ignore:
Timestamp:
Jul 11, 2011 6:25:24 AM (13 years ago)
Author:
andreas.kling@nokia.com
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:
Location:
trunk/Source/WebKit2
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r90705 r90739  
     12011-07-11  Andreas Kling  <kling@webkit.org>
     2
     3        [Qt][WK2] Move zoomable-area-for-point functionality to QTouchWebPageProxy
     4        https://bugs.webkit.org/show_bug.cgi?id=64273
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        * UIProcess/qt/QtWebPageProxy.cpp:
     9        * UIProcess/qt/QtWebPageProxy.h:
     10        * UIProcess/qt/qdesktopwebpageproxy.cpp:
     11        (QDesktopWebPageProxy::didFindZoomableArea):
     12        * UIProcess/qt/qdesktopwebpageproxy.h:
     13        * UIProcess/qt/qtouchwebpageproxy.cpp:
     14        (QTouchWebPageProxy::findZoomableAreaForPoint):
     15        (QTouchWebPageProxy::didFindZoomableArea):
     16        * UIProcess/qt/qtouchwebpageproxy.h:
     17
    1182011-07-10  Anders Carlsson  <andersca@apple.com>
    219

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

    r90694 r90739  
    746746}
    747747
    748 void QtWebPageProxy::findZoomableAreaForPoint(const QPoint& point)
    749 {
    750     m_webPageProxy->findZoomableAreaForPoint(point);
    751 }
    752 
    753 void QtWebPageProxy::didFindZoomableArea(const IntRect& area)
    754 {
    755     emit zoomableAreaFound(QRect(area));
    756 }
    757 
    758748void QtWebPageProxy::startDrag(const WebCore::DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
    759749{

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

    r90694 r90739  
    109109    virtual void didRelaunchProcess();
    110110    virtual void didChangeContentsSize(const WebCore::IntSize&);
    111     virtual void didFindZoomableArea(const WebCore::IntRect&);
     111
    112112    virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage);
    113113    virtual WebCore::IntRect viewportVisibleRect() const;
    … …  
    189189    QWKHistory* history() const;
    190190
    191     void findZoomableAreaForPoint(const QPoint&);
    192 
    193191    void setPageIsVisible(bool);
    194192

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

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

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

    r90550 r90739  
    4747    virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled);
    4848#endif
     49    virtual void didFindZoomableArea(const WebCore::IntRect&);
    4950
    5051    virtual void timerEvent(QTimerEvent*);

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

    r90694 r90739  
    9797#endif
    9898}
     99
     100void QTouchWebPageProxy::findZoomableAreaForPoint(const QPoint& point)
     101{
     102    m_webPageProxy->findZoomableAreaForPoint(point);
     103}
     104
     105void QTouchWebPageProxy::didFindZoomableArea(const IntRect& area)
     106{
     107    emit zoomableAreaFound(QRect(area));
     108}

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

    r90694 r90739  
    4040
    4141    void setResizesToContentsUsingLayoutSize(const QSize& targetLayoutSize);
     42    void findZoomableAreaForPoint(const QPoint&);
    4243
    4344protected:
    … …  
    5152    virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled);
    5253#endif
     54    virtual void didFindZoomableArea(const WebCore::IntRect&);
    5355
    5456    TouchViewInterface* touchViewInterface() const { return static_cast<TouchViewInterface*>(m_viewInterface); }
Note: See TracChangeset for help on using the changeset viewer.