Changeset 106800 in webkit


Ignore:
Timestamp:
Feb 6, 2012 5:11:50 AM (12 years ago)
Author:
jocelyn.turcotte@nokia.com
Message:

[Qt][WK2] Remove TiledDrawingArea and dependencies.
​https://bugs.webkit.org/show_bug.cgi?id=71681

Reviewed by Kenneth Rohde Christiansen.

Tiled drawing surface functionality got converted to LayerTree.
TiledDrawingArea and its dependencies are not used by any port anymore.

  • CMakeLists.txt:
  • GNUmakefile.am:
  • Shared/DrawingAreaInfo.h:
  • Target.pri:
  • UIProcess/API/qt/qquickwebpage.cpp:

(QQuickWebPagePrivate::QQuickWebPagePrivate):

  • UIProcess/API/qt/qquickwebpage_p.h:
  • UIProcess/API/qt/qquickwebpage_p_p.h:

(QQuickWebPagePrivate):

  • UIProcess/DrawingAreaProxy.h:
  • UIProcess/DrawingAreaProxy.messages.in:
  • UIProcess/TiledDrawingAreaProxy.cpp: Removed.
  • UIProcess/TiledDrawingAreaProxy.h: Removed.
  • UIProcess/qt/QtSGTileNode.cpp: Removed.
  • UIProcess/qt/QtSGTileNode.h: Removed.
  • UIProcess/qt/QtSGUpdateQueue.cpp: Removed.
  • UIProcess/qt/QtSGUpdateQueue.h: Removed.
  • UIProcess/qt/TiledDrawingAreaProxyQt.cpp: Removed.
  • WebProcess/WebPage/DrawingArea.cpp:

(WebKit::DrawingArea::create):

  • WebProcess/WebPage/DrawingArea.h:
  • WebProcess/WebPage/DrawingArea.messages.in:
  • WebProcess/WebPage/TiledDrawingArea.cpp: Removed.
  • WebProcess/WebPage/TiledDrawingArea.h: Removed.
  • WebProcess/WebPage/WebPage.h:

(WebPage):

Location:
trunk/Source/WebKit2
Files:
9 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/CMakeLists.txt

    r103512 r106800  
    220220    UIProcess/GeolocationPermissionRequestProxy.cpp
    221221    UIProcess/ResponsivenessTimer.cpp
    222     UIProcess/TiledDrawingAreaProxy.cpp
    223222    UIProcess/VisitedLinkProvider.cpp
    224223    UIProcess/WebApplicationCacheManagerProxy.cpp
    … …  
    374373    WebProcess/WebPage/LayerTreeHost.cpp
    375374    WebProcess/WebPage/PageOverlay.cpp
    376     WebProcess/WebPage/TiledDrawingArea.cpp
    377375    WebProcess/WebPage/WebBackForwardListProxy.cpp
    378376    WebProcess/WebPage/WebContextMenu.cpp

  • trunk/Source/WebKit2/ChangeLog

    r106799 r106800  
     12012-02-03  Zalan Bujtas  <zbujtas@gmail.com>  and  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
     2
     3        [Qt][WK2] Remove TiledDrawingArea and dependencies.
     4        https://bugs.webkit.org/show_bug.cgi?id=71681
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Tiled drawing surface functionality got converted to LayerTree.
     9        TiledDrawingArea and its dependencies are not used by any port anymore.
     10
     11        * CMakeLists.txt:
     12        * GNUmakefile.am:
     13        * Shared/DrawingAreaInfo.h:
     14        * Target.pri:
     15        * UIProcess/API/qt/qquickwebpage.cpp:
     16        (QQuickWebPagePrivate::QQuickWebPagePrivate):
     17        * UIProcess/API/qt/qquickwebpage_p.h:
     18        * UIProcess/API/qt/qquickwebpage_p_p.h:
     19        (QQuickWebPagePrivate):
     20        * UIProcess/DrawingAreaProxy.h:
     21        * UIProcess/DrawingAreaProxy.messages.in:
     22        * UIProcess/TiledDrawingAreaProxy.cpp: Removed.
     23        * UIProcess/TiledDrawingAreaProxy.h: Removed.
     24        * UIProcess/qt/QtSGTileNode.cpp: Removed.
     25        * UIProcess/qt/QtSGTileNode.h: Removed.
     26        * UIProcess/qt/QtSGUpdateQueue.cpp: Removed.
     27        * UIProcess/qt/QtSGUpdateQueue.h: Removed.
     28        * UIProcess/qt/TiledDrawingAreaProxyQt.cpp: Removed.
     29        * WebProcess/WebPage/DrawingArea.cpp:
     30        (WebKit::DrawingArea::create):
     31        * WebProcess/WebPage/DrawingArea.h:
     32        * WebProcess/WebPage/DrawingArea.messages.in:
     33        * WebProcess/WebPage/TiledDrawingArea.cpp: Removed.
     34        * WebProcess/WebPage/TiledDrawingArea.h: Removed.
     35        * WebProcess/WebPage/WebPage.h:
     36        (WebPage):
     37
    1382012-02-03  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
    239

  • trunk/Source/WebKit2/GNUmakefile.am

    r106537 r106800  
    636636        Source/WebKit2/UIProcess/ResponsivenessTimer.h \
    637637        Source/WebKit2/UIProcess/TextChecker.h \
    638         Source/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp \
    639         Source/WebKit2/UIProcess/TiledDrawingAreaProxy.h \
    640638        Source/WebKit2/UIProcess/VisitedLinkProvider.cpp \
    641639        Source/WebKit2/UIProcess/VisitedLinkProvider.h \
    … …  
    922920        Source/WebKit2/WebProcess/WebPage/PageOverlay.cpp \
    923921        Source/WebKit2/WebProcess/WebPage/PageOverlay.h \
    924         Source/WebKit2/WebProcess/WebPage/TiledDrawingArea.cpp \
    925         Source/WebKit2/WebProcess/WebPage/TiledDrawingArea.h \
    926922        Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp \
    927923        Source/WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h \

  • trunk/Source/WebKit2/Shared/DrawingAreaInfo.h

    r99473 r106800  
    3131enum DrawingAreaType {
    3232    DrawingAreaTypeImpl,
    33 #if USE(TILED_BACKING_STORE)
    34     DrawingAreaTypeTiled,
    35 #endif
    3633#if PLATFORM(MAC)
    3734    DrawingAreaTypeTiledCoreAnimation,

  • trunk/Source/WebKit2/Target.pri

    r105990 r106800  
    212212    UIProcess/ResponsivenessTimer.h \
    213213    UIProcess/TextChecker.h \
    214     UIProcess/TiledDrawingAreaProxy.h \
    215214    UIProcess/VisitedLinkProvider.h \
    216215    UIProcess/WebApplicationCacheManagerProxy.h \
    … …  
    268267    UIProcess/qt/QtWebPagePolicyClient.h \
    269268    UIProcess/qt/QtWebPageUIClient.h \
    270     UIProcess/qt/QtSGUpdateQueue.h \
    271     UIProcess/qt/QtSGTileNode.h \
    272269    UIProcess/qt/QtViewportInteractionEngine.h \
    273270    UIProcess/qt/QtWebUndoController.h \
    … …  
    542539    UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp \
    543540    UIProcess/ResponsivenessTimer.cpp \
    544     UIProcess/TiledDrawingAreaProxy.cpp \
    545541    UIProcess/VisitedLinkProvider.cpp \
    546542    UIProcess/WebApplicationCacheManagerProxy.cpp \
    … …  
    598594    UIProcess/qt/QtWebPagePolicyClient.cpp \
    599595    UIProcess/qt/QtWebPageUIClient.cpp \
    600     UIProcess/qt/QtSGUpdateQueue.cpp \
    601     UIProcess/qt/QtSGTileNode.cpp \
    602     UIProcess/qt/TiledDrawingAreaProxyQt.cpp \
    603596    UIProcess/qt/TextCheckerQt.cpp \
    604597    UIProcess/qt/QtViewportInteractionEngine.cpp \
    … …  
    705698    WebProcess/WebPage/PageOverlay.cpp \
    706699    WebProcess/WebPage/TiledBackingStoreRemoteTile.cpp \
    707     WebProcess/WebPage/TiledDrawingArea.cpp \
    708700    WebProcess/WebPage/WebBackForwardListProxy.cpp \
    709701    WebProcess/WebPage/WebContextMenu.cpp \

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

    r106658 r106800  
    4747}
    4848
    49 QtSGUpdateQueue *QQuickWebPage::sceneGraphUpdateQueue() const
    50 {
    51     return &d->sgUpdateQueue;
    52 }
    53 
    5449QQuickWebPagePrivate::QQuickWebPagePrivate(QQuickWebPage* q, QQuickWebView* viewportItem)
    5550    : q(q)
    5651    , viewportItem(viewportItem)
    5752    , webPageProxy(0)
    58     , sgUpdateQueue(q)
    5953    , paintingIsInitialized(false)
    6054    , m_paintNode(0)

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

    r106658 r106800  
    3232class QWebPreferences;
    3333
    34 namespace WebKit {
    35 class QtSGUpdateQueue;
    36 }
    37 
    3834class QWEBKIT_EXPORT QQuickWebPage : public QQuickItem {
    3935    Q_OBJECT
    … …  
    5248    QtWebPageEventHandler* eventHandler() const;
    5349
    54     // Internal. To be removed soon.
    55     WebKit::QtSGUpdateQueue* sceneGraphUpdateQueue() const;
    56 
    5750protected:
    5851    virtual QSGNode* updatePaintNode(QSGNode*, UpdatePaintNodeData*);

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

    r106658 r106800  
    2222#define qquickwebpage_p_p_h
    2323
    24 #include "QtSGUpdateQueue.h"
    2524#include "qquickwebpage_p.h"
    2625#include <QTransform>
    … …  
    5150    QQuickWebView* const viewportItem;
    5251    WebKit::WebPageProxy* webPageProxy;
    53     WebKit::QtSGUpdateQueue sgUpdateQueue;
    5452    bool paintingIsInitialized;
    5553    QSGNode* m_paintNode;

  • trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h

    r106524 r106800  
    131131    virtual void didUpdateGeometry() { }
    132132#endif
    133 #if USE(TILED_BACKING_STORE)
    134     virtual void snapshotTaken(const UpdateInfo&) { }
    135     virtual void createTile(int tileID, const UpdateInfo& updateInfo) { }
    136     virtual void updateTile(int tileID, const UpdateInfo& updateInfo) { }
    137     virtual void didRenderFrame() { }
    138     virtual void removeTile(int tileID) { }
    139     virtual void allTileUpdatesProcessed() { }
    140 #endif
    141133};
    142134

  • trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.messages.in

    r99615 r106800  
    3333    DidUpdateGeometry()
    3434#endif
    35 
    36 #if USE(TILED_BACKING_STORE)
    37     CreateTile(int tileID, WebKit::UpdateInfo updateInfo)
    38     UpdateTile(int tileID, WebKit::UpdateInfo updateInfo)
    39     DidRenderFrame()
    40     RemoveTile(int tileID)
    41     SnapshotTaken(WebKit::UpdateInfo updateInfo)
    42 #endif
    4335}

  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp

    r99473 r106800  
    3030#include "DrawingAreaImpl.h"
    3131
    32 #if USE(TILED_BACKING_STORE)
    33 #include "TiledDrawingArea.h"
    34 #endif
    35 
    3632#if PLATFORM(MAC)
    3733#include "TiledCoreAnimationDrawingArea.h"
    … …  
    4743    case DrawingAreaTypeImpl:
    4844        return DrawingAreaImpl::create(webPage, parameters);
    49 #if USE(TILED_BACKING_STORE)
    50     case DrawingAreaTypeTiled:
    51         return adoptPtr(new TiledDrawingArea(webPage));
    52 #endif
    5345#if PLATFORM(MAC)
    5446    case DrawingAreaTypeTiledCoreAnimation:

  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h

    r103565 r106800  
    107107    virtual void updateGeometry(const WebCore::IntSize& viewSize) { }
    108108#endif
    109 
    110 #if USE(TILED_BACKING_STORE)
    111     virtual void setSize(const WebCore::IntSize& viewSize) { }
    112     virtual void setVisibleContentRectAndScale(const WebCore::IntRect&, float) { }
    113     virtual void setVisibleContentRectTrajectoryVector(const WebCore::FloatPoint&) { }
    114     virtual void setContentsScale(float scale) { }
    115     virtual void renderNextFrame() { }
    116     virtual void takeSnapshot(const WebCore::IntSize& targetSize, const WebCore::IntRect& contentsRect) { }
    117 #endif
    118109};
    119110

  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in

    r102407 r106800  
    3232    UpdateGeometry(WebCore::IntSize viewSize)
    3333#endif
    34 
    35 #if USE(TILED_BACKING_STORE)
    36     SetSize(WebCore::IntSize viewSize)
    37     SetVisibleContentRectAndScale(WebCore::IntRect visibleContentRect, float scale)
    38     SetVisibleContentRectTrajectoryVector(WebCore::FloatPoint trajectoryVector)
    39     RenderNextFrame()
    40     TakeSnapshot(WebCore::IntSize size, WebCore::IntRect contentsRect)
    41 #endif
    4234}

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r106511 r106800  
    717717
    718718#if USE(TILED_BACKING_STORE)
    719     WebCore::IntSize m_resizesToContentsLayoutSize;
    720719    WebCore::IntSize m_viewportSize;
    721720#endif
Note: See TracChangeset for help on using the changeset viewer.