Changeset 202675 in webkit


Ignore:
Timestamp:
Jun 30, 2016 12:32:32 AM (8 years ago)
Author:
Carlos Garcia Campos
Message:

[Coordinated Graphics] Move CompositingCoordinator from platform to WebKit2 layer
​https://bugs.webkit.org/show_bug.cgi?id=159209

Reviewed by Žan Doberšek.

Source/WebCore:

Remove CompositingCoordinator and its helper classes from the platform layer.

  • platform/TextureMapper.cmake:

Source/WebKit2:

Move CompositingCoordinator and its helper classes to the WebKit2 layer.

  • PlatformEfl.cmake:
  • PlatformGTK.cmake:
  • WebProcess/WebPage/CoordinatedGraphics/AreaAllocator.cpp: Renamed from Source/WebCore/platform/graphics/texmap/coordinated/AreaAllocator.cpp.

(WebKit::AreaAllocator::AreaAllocator):
(WebKit::AreaAllocator::~AreaAllocator):
(WebKit::AreaAllocator::expand):
(WebKit::AreaAllocator::expandBy):
(WebKit::AreaAllocator::release):
(WebKit::AreaAllocator::overhead):
(WebKit::AreaAllocator::roundAllocation):
(WebKit::GeneralAreaAllocator::GeneralAreaAllocator):
(WebKit::GeneralAreaAllocator::~GeneralAreaAllocator):
(WebKit::GeneralAreaAllocator::freeNode):
(WebKit::GeneralAreaAllocator::expand):
(WebKit::fitsWithin):
(WebKit::GeneralAreaAllocator::allocate):
(WebKit::GeneralAreaAllocator::allocateFromNode):
(WebKit::GeneralAreaAllocator::splitNode):
(WebKit::GeneralAreaAllocator::updateLargestFree):
(WebKit::GeneralAreaAllocator::release):
(WebKit::GeneralAreaAllocator::overhead):

  • WebProcess/WebPage/CoordinatedGraphics/AreaAllocator.h: Renamed from Source/WebCore/platform/graphics/texmap/coordinated/AreaAllocator.h.

(WebKit::nextPowerOfTwo):
(WebKit::AreaAllocator::size):
(WebKit::AreaAllocator::minimumAllocation):
(WebKit::AreaAllocator::setMinimumAllocation):
(WebKit::AreaAllocator::margin):
(WebKit::AreaAllocator::setMargin):

  • WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp: Renamed from Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp.

(WebKit::CompositingCoordinator::CompositingCoordinator):
(WebKit::CompositingCoordinator::~CompositingCoordinator):
(WebKit::CompositingCoordinator::setRootCompositingLayer):
(WebKit::CompositingCoordinator::setViewOverlayRootLayer):
(WebKit::CompositingCoordinator::sizeDidChange):
(WebKit::CompositingCoordinator::flushPendingLayerChanges):
(WebKit::CompositingCoordinator::timestamp):
(WebKit::CompositingCoordinator::syncDisplayState):
(WebKit::CompositingCoordinator::nextAnimationServiceTime):
(WebKit::CompositingCoordinator::clearPendingStateChanges):
(WebKit::CompositingCoordinator::initializeRootCompositingLayerIfNeeded):
(WebKit::CompositingCoordinator::createRootLayer):
(WebKit::CompositingCoordinator::syncLayerState):
(WebKit::CompositingCoordinator::createImageBackingIfNeeded):
(WebKit::CompositingCoordinator::createImageBacking):
(WebKit::CompositingCoordinator::updateImageBacking):
(WebKit::CompositingCoordinator::clearImageBackingContents):
(WebKit::CompositingCoordinator::removeImageBacking):
(WebKit::CompositingCoordinator::flushPendingImageBackingChanges):
(WebKit::CompositingCoordinator::notifyAnimationStarted):
(WebKit::CompositingCoordinator::notifyFlushRequired):
(WebKit::CompositingCoordinator::paintContents):
(WebKit::CompositingCoordinator::createGraphicsLayer):
(WebKit::CompositingCoordinator::deviceScaleFactor):
(WebKit::CompositingCoordinator::pageScaleFactor):
(WebKit::CompositingCoordinator::createUpdateAtlas):
(WebKit::CompositingCoordinator::removeUpdateAtlas):
(WebKit::CompositingCoordinator::visibleContentsRect):
(WebKit::CompositingCoordinator::mainContentsLayer):
(WebKit::CompositingCoordinator::setVisibleContentsRect):
(WebKit::CompositingCoordinator::deviceOrPageScaleFactorChanged):
(WebKit::CompositingCoordinator::detachLayer):
(WebKit::CompositingCoordinator::commitScrollOffset):
(WebKit::CompositingCoordinator::renderNextFrame):
(WebKit::CompositingCoordinator::purgeBackingStores):
(WebKit::CompositingCoordinator::paintToSurface):
(WebKit::CompositingCoordinator::scheduleReleaseInactiveAtlases):
(WebKit::CompositingCoordinator::releaseInactiveAtlasesTimerFired):

  • WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h: Renamed from Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h.

(WebKit::CompositingCoordinator::clearRootLayer):
(WebKit::CompositingCoordinator::rootLayer):
(WebKit::CompositingCoordinator::state):

  • WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
  • WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.cpp: Renamed from Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp.

(WebKit::UpdateAtlasSurfaceClient::UpdateAtlasSurfaceClient):
(WebKit::UpdateAtlas::UpdateAtlas):
(WebKit::UpdateAtlas::~UpdateAtlas):
(WebKit::UpdateAtlas::buildLayoutIfNeeded):
(WebKit::UpdateAtlas::didSwapBuffers):
(WebKit::UpdateAtlas::paintOnAvailableBuffer):

  • WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.h: Renamed from Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.h.

(WebKit::UpdateAtlas::size):
(WebKit::UpdateAtlas::supportsAlpha):
(WebKit::UpdateAtlas::addTimeInactive):
(WebKit::UpdateAtlas::isInactive):
(WebKit::UpdateAtlas::isInUse):

Location:
trunk/Source
Files:
6 edited
6 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r202674 r202675  
     12016-06-30  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [Coordinated Graphics] Move CompositingCoordinator from platform to WebKit2 layer
     4        https://bugs.webkit.org/show_bug.cgi?id=159209
     5
     6        Reviewed by Žan Doberšek.
     7
     8        Remove CompositingCoordinator and its helper classes from the platform layer.
     9
     10        * platform/TextureMapper.cmake:
     11
    1122016-06-29  Youenn Fablet  <youenn@apple.com>
    213

  • trunk/Source/WebCore/platform/TextureMapper.cmake

    r196429 r202675  
    3434        page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp
    3535
    36         platform/graphics/texmap/coordinated/AreaAllocator.cpp
    37         platform/graphics/texmap/coordinated/CompositingCoordinator.cpp
    3836        platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
    3937        platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp
    … …  
    4139        platform/graphics/texmap/coordinated/Tile.cpp
    4240        platform/graphics/texmap/coordinated/TiledBackingStore.cpp
    43         platform/graphics/texmap/coordinated/UpdateAtlas.cpp
    4441    )
    4542endif ()

  • trunk/Source/WebKit2/ChangeLog

    r202661 r202675  
     12016-06-30  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [Coordinated Graphics] Move CompositingCoordinator from platform to WebKit2 layer
     4        https://bugs.webkit.org/show_bug.cgi?id=159209
     5
     6        Reviewed by Žan Doberšek.
     7
     8        Move CompositingCoordinator and its helper classes to the WebKit2 layer.
     9
     10        * PlatformEfl.cmake:
     11        * PlatformGTK.cmake:
     12        * WebProcess/WebPage/CoordinatedGraphics/AreaAllocator.cpp: Renamed from Source/WebCore/platform/graphics/texmap/coordinated/AreaAllocator.cpp.
     13        (WebKit::AreaAllocator::AreaAllocator):
     14        (WebKit::AreaAllocator::~AreaAllocator):
     15        (WebKit::AreaAllocator::expand):
     16        (WebKit::AreaAllocator::expandBy):
     17        (WebKit::AreaAllocator::release):
     18        (WebKit::AreaAllocator::overhead):
     19        (WebKit::AreaAllocator::roundAllocation):
     20        (WebKit::GeneralAreaAllocator::GeneralAreaAllocator):
     21        (WebKit::GeneralAreaAllocator::~GeneralAreaAllocator):
     22        (WebKit::GeneralAreaAllocator::freeNode):
     23        (WebKit::GeneralAreaAllocator::expand):
     24        (WebKit::fitsWithin):
     25        (WebKit::GeneralAreaAllocator::allocate):
     26        (WebKit::GeneralAreaAllocator::allocateFromNode):
     27        (WebKit::GeneralAreaAllocator::splitNode):
     28        (WebKit::GeneralAreaAllocator::updateLargestFree):
     29        (WebKit::GeneralAreaAllocator::release):
     30        (WebKit::GeneralAreaAllocator::overhead):
     31        * WebProcess/WebPage/CoordinatedGraphics/AreaAllocator.h: Renamed from Source/WebCore/platform/graphics/texmap/coordinated/AreaAllocator.h.
     32        (WebKit::nextPowerOfTwo):
     33        (WebKit::AreaAllocator::size):
     34        (WebKit::AreaAllocator::minimumAllocation):
     35        (WebKit::AreaAllocator::setMinimumAllocation):
     36        (WebKit::AreaAllocator::margin):
     37        (WebKit::AreaAllocator::setMargin):
     38        * WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp: Renamed from Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp.
     39        (WebKit::CompositingCoordinator::CompositingCoordinator):
     40        (WebKit::CompositingCoordinator::~CompositingCoordinator):
     41        (WebKit::CompositingCoordinator::setRootCompositingLayer):
     42        (WebKit::CompositingCoordinator::setViewOverlayRootLayer):
     43        (WebKit::CompositingCoordinator::sizeDidChange):
     44        (WebKit::CompositingCoordinator::flushPendingLayerChanges):
     45        (WebKit::CompositingCoordinator::timestamp):
     46        (WebKit::CompositingCoordinator::syncDisplayState):
     47        (WebKit::CompositingCoordinator::nextAnimationServiceTime):
     48        (WebKit::CompositingCoordinator::clearPendingStateChanges):
     49        (WebKit::CompositingCoordinator::initializeRootCompositingLayerIfNeeded):
     50        (WebKit::CompositingCoordinator::createRootLayer):
     51        (WebKit::CompositingCoordinator::syncLayerState):
     52        (WebKit::CompositingCoordinator::createImageBackingIfNeeded):
     53        (WebKit::CompositingCoordinator::createImageBacking):
     54        (WebKit::CompositingCoordinator::updateImageBacking):
     55        (WebKit::CompositingCoordinator::clearImageBackingContents):
     56        (WebKit::CompositingCoordinator::removeImageBacking):
     57        (WebKit::CompositingCoordinator::flushPendingImageBackingChanges):
     58        (WebKit::CompositingCoordinator::notifyAnimationStarted):
     59        (WebKit::CompositingCoordinator::notifyFlushRequired):
     60        (WebKit::CompositingCoordinator::paintContents):
     61        (WebKit::CompositingCoordinator::createGraphicsLayer):
     62        (WebKit::CompositingCoordinator::deviceScaleFactor):
     63        (WebKit::CompositingCoordinator::pageScaleFactor):
     64        (WebKit::CompositingCoordinator::createUpdateAtlas):
     65        (WebKit::CompositingCoordinator::removeUpdateAtlas):
     66        (WebKit::CompositingCoordinator::visibleContentsRect):
     67        (WebKit::CompositingCoordinator::mainContentsLayer):
     68        (WebKit::CompositingCoordinator::setVisibleContentsRect):
     69        (WebKit::CompositingCoordinator::deviceOrPageScaleFactorChanged):
     70        (WebKit::CompositingCoordinator::detachLayer):
     71        (WebKit::CompositingCoordinator::commitScrollOffset):
     72        (WebKit::CompositingCoordinator::renderNextFrame):
     73        (WebKit::CompositingCoordinator::purgeBackingStores):
     74        (WebKit::CompositingCoordinator::paintToSurface):
     75        (WebKit::CompositingCoordinator::scheduleReleaseInactiveAtlases):
     76        (WebKit::CompositingCoordinator::releaseInactiveAtlasesTimerFired):
     77        * WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.h: Renamed from Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h.
     78        (WebKit::CompositingCoordinator::clearRootLayer):
     79        (WebKit::CompositingCoordinator::rootLayer):
     80        (WebKit::CompositingCoordinator::state):
     81        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
     82        * WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.cpp: Renamed from Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.cpp.
     83        (WebKit::UpdateAtlasSurfaceClient::UpdateAtlasSurfaceClient):
     84        (WebKit::UpdateAtlas::UpdateAtlas):
     85        (WebKit::UpdateAtlas::~UpdateAtlas):
     86        (WebKit::UpdateAtlas::buildLayoutIfNeeded):
     87        (WebKit::UpdateAtlas::didSwapBuffers):
     88        (WebKit::UpdateAtlas::paintOnAvailableBuffer):
     89        * WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.h: Renamed from Source/WebCore/platform/graphics/texmap/coordinated/UpdateAtlas.h.
     90        (WebKit::UpdateAtlas::size):
     91        (WebKit::UpdateAtlas::supportsAlpha):
     92        (WebKit::UpdateAtlas::addTimeInactive):
     93        (WebKit::UpdateAtlas::isInactive):
     94        (WebKit::UpdateAtlas::isInUse):
     95
    1962016-06-29  Hunseop Jeong  <hs85.jeong@samsung.com>
    297

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r200621 r202675  
    199199    WebProcess/WebPage/DrawingAreaImpl.cpp
    200200
     201    WebProcess/WebPage/CoordinatedGraphics/AreaAllocator.cpp
     202    WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
    201203    WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp
    202204    WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp
     205    WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.cpp
    203206    WebProcess/WebPage/CoordinatedGraphics/WebPageCoordinatedGraphics.cpp
    204207

  • trunk/Source/WebKit2/PlatformGTK.cmake

    r202621 r202675  
    827827        Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
    828828
     829        WebProcess/WebPage/CoordinatedGraphics/AreaAllocator.cpp
     830        WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
    829831        WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp
    830832        WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp
     833        WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.cpp
    831834    )
    832835    list(APPEND WebKit2_INCLUDE_DIRECTORIES

  • trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/AreaAllocator.cpp

    r202674 r202675  
    1919
    2020#include "config.h"
     21#include "AreaAllocator.h"
    2122
    2223#if USE(COORDINATED_GRAPHICS)
    2324
    24 #include "AreaAllocator.h"
    25 
    26 namespace WebCore {
     25using namespace WebCore;
     26
     27namespace WebKit {
    2728
    2829AreaAllocator::AreaAllocator(const IntSize& size)
    … …  
    331332}
    332333
    333 } // namespace WebCore
     334} // namespace WebKit
    334335
    335336#endif // USE(COORDINATED_GRAPHICS)

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

    r202674 r202675  
    2121#define AreaAllocator_h
    2222
    23 #include "IntPoint.h"
    24 #include "IntRect.h"
    25 #include "IntSize.h"
    26 
    2723#if USE(COORDINATED_GRAPHICS)
    2824
    29 namespace WebCore {
     25#include <WebCore/IntPoint.h>
     26#include <WebCore/IntRect.h>
     27#include <WebCore/IntSize.h>
     28
     29namespace WebKit {
    3030
    3131inline int nextPowerOfTwo(int number)
    … …  
    4242}
    4343
    44 inline IntSize nextPowerOfTwo(const IntSize& size)
     44inline WebCore::IntSize nextPowerOfTwo(const WebCore::IntSize& size)
    4545{
    46     return IntSize(nextPowerOfTwo(size.width()), nextPowerOfTwo(size.height()));
     46    return WebCore::IntSize(nextPowerOfTwo(size.width()), nextPowerOfTwo(size.height()));
    4747}
    4848
    … …  
    5050    WTF_MAKE_FAST_ALLOCATED;
    5151public:
    52     explicit AreaAllocator(const IntSize&);
     52    explicit AreaAllocator(const WebCore::IntSize&);
    5353    virtual ~AreaAllocator();
    5454
    55     IntSize size() const { return m_size; }
     55    WebCore::IntSize size() const { return m_size; }
    5656
    57     IntSize minimumAllocation() const { return m_minAlloc; }
    58     void setMinimumAllocation(const IntSize& size) { m_minAlloc = size; }
     57    WebCore::IntSize minimumAllocation() const { return m_minAlloc; }
     58    void setMinimumAllocation(const WebCore::IntSize& size) { m_minAlloc = size; }
    5959
    60     IntSize margin() const { return m_margin; }
    61     void setMargin(const IntSize &margin) { m_margin = margin; }
     60    WebCore::IntSize margin() const { return m_margin; }
     61    void setMargin(const WebCore::IntSize &margin) { m_margin = margin; }
    6262
    63     virtual void expand(const IntSize&);
    64     void expandBy(const IntSize&);
     63    virtual void expand(const WebCore::IntSize&);
     64    void expandBy(const WebCore::IntSize&);
    6565
    66     virtual IntRect allocate(const IntSize&) = 0;
    67     virtual void release(const IntRect&);
     66    virtual WebCore::IntRect allocate(const WebCore::IntSize&) = 0;
     67    virtual void release(const WebCore::IntRect&);
    6868
    6969    virtual int overhead() const;
    7070
    7171protected:
    72     IntSize m_size;
    73     IntSize m_minAlloc;
    74     IntSize m_margin;
     72    WebCore::IntSize m_size;
     73    WebCore::IntSize m_minAlloc;
     74    WebCore::IntSize m_margin;
    7575
    76     IntSize roundAllocation(const IntSize&) const;
     76    WebCore::IntSize roundAllocation(const WebCore::IntSize&) const;
    7777};
    7878
    … …  
    8080    WTF_MAKE_FAST_ALLOCATED;
    8181public:
    82     explicit GeneralAreaAllocator(const IntSize&);
     82    explicit GeneralAreaAllocator(const WebCore::IntSize&);
    8383    virtual ~GeneralAreaAllocator();
    8484
    85     void expand(const IntSize&);
    86     IntRect allocate(const IntSize&);
    87     void release(const IntRect&);
     85    void expand(const WebCore::IntSize&);
     86    WebCore::IntRect allocate(const WebCore::IntSize&);
     87    void release(const WebCore::IntRect&);
    8888    int overhead() const;
    8989
    … …  
    9292
    9393    struct Node {
    94         IntRect rect;
    95         IntSize largestFree;
     94        WebCore::IntRect rect;
     95        WebCore::IntSize largestFree;
    9696        Node* parent;
    9797        Node* left;
    … …  
    103103
    104104    static void freeNode(Node*);
    105     IntPoint allocateFromNode(const IntSize&, Node*);
     105    WebCore::IntPoint allocateFromNode(const WebCore::IntSize&, Node*);
    106106    Node* splitNode(Node*, Split);
    107107    static void updateLargestFree(Node*);
    108108};
    109109
    110 } // namespace WebCore
     110} // namespace WebKit
    111111
    112112#endif // USE(COORDINATED_GRAPHICS)
    113 
    114113#endif // AreaAllocator_h

  • trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp

    r202674 r202675  
    2626
    2727#include "config.h"
     28#include "CompositingCoordinator.h"
    2829
    2930#if USE(COORDINATED_GRAPHICS)
    3031
    31 #include "CompositingCoordinator.h"
    32 
    33 #include "DOMWindow.h"
    34 #include "Document.h"
    35 #include "FrameView.h"
    36 #include "GraphicsContext.h"
    37 #include "InspectorController.h"
    38 #include "MainFrame.h"
    39 #include "Page.h"
    40 #include "Settings.h"
     32#include <WebCore/DOMWindow.h>
     33#include <WebCore/Document.h>
     34#include <WebCore/FrameView.h>
     35#include <WebCore/GraphicsContext.h>
     36#include <WebCore/InspectorController.h>
     37#include <WebCore/MainFrame.h>
     38#include <WebCore/Page.h>
     39#include <WebCore/Settings.h>
    4140#include <wtf/CurrentTime.h>
    4241#include <wtf/TemporaryChange.h>
    4342
    44 // FIXME: Having this in the platform directory is a layering violation. This does not belong here.
    45 
    46 namespace WebCore {
     43using namespace WebCore;
     44
     45namespace WebKit {
    4746
    4847CompositingCoordinator::CompositingCoordinator(Page* page, CompositingCoordinator::Client* client)
    … …  
    449448}
    450449
    451 } // namespace WebCore
     450} // namespace WebKit
    452451
    453452#endif // USE(COORDINATED_GRAPHICS)

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

    r202674 r202675  
    3030#if USE(COORDINATED_GRAPHICS)
    3131
    32 #include "CoordinatedGraphicsLayer.h"
    33 #include "CoordinatedGraphicsState.h"
    34 #include "CoordinatedImageBacking.h"
    35 #include "FloatPoint.h"
    36 #include "GraphicsLayerClient.h"
    37 #include "GraphicsLayerFactory.h"
    38 #include "IntRect.h"
    39 #include "Timer.h"
    4032#include "UpdateAtlas.h"
     33#include <WebCore/CoordinatedGraphicsLayer.h>
     34#include <WebCore/CoordinatedGraphicsState.h>
     35#include <WebCore/CoordinatedImageBacking.h>
     36#include <WebCore/FloatPoint.h>
     37#include <WebCore/GraphicsLayerClient.h>
     38#include <WebCore/GraphicsLayerFactory.h>
     39#include <WebCore/IntRect.h>
     40#include <WebCore/Timer.h>
    4141
    4242namespace WebCore {
    43 
    4443class Page;
    4544class GraphicsContext;
    4645class GraphicsLayer;
    4746class CoordinatedSurface;
     47}
    4848
    49 class CompositingCoordinator : public GraphicsLayerClient
    50     , public CoordinatedGraphicsLayerClient
    51     , public CoordinatedImageBacking::Client
     49namespace WebKit {
     50
     51class CompositingCoordinator : public WebCore::GraphicsLayerClient
     52    , public WebCore::CoordinatedGraphicsLayerClient
     53    , public WebCore::CoordinatedImageBacking::Client
    5254    , public UpdateAtlas::Client
    53     , public GraphicsLayerFactory {
     55    , public WebCore::GraphicsLayerFactory {
    5456    WTF_MAKE_NONCOPYABLE(CompositingCoordinator); WTF_MAKE_FAST_ALLOCATED;
    5557public:
    5658    class Client {
    5759    public:
    58         virtual void didFlushRootLayer(const FloatRect& visibleContentRect) = 0;
     60        virtual void didFlushRootLayer(const WebCore::FloatRect& visibleContentRect) = 0;
    5961        virtual void notifyFlushRequired() = 0;
    60         virtual void commitSceneState(const CoordinatedGraphicsState&) = 0;
    61         virtual void paintLayerContents(const GraphicsLayer*, GraphicsContext&, const IntRect& clipRect) = 0;
     62        virtual void commitSceneState(const WebCore::CoordinatedGraphicsState&) = 0;
     63        virtual void paintLayerContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, const WebCore::IntRect& clipRect) = 0;
    6264    };
    6365
    64     CompositingCoordinator(Page*, CompositingCoordinator::Client*);
     66    CompositingCoordinator(WebCore::Page*, CompositingCoordinator::Client*);
    6567    virtual ~CompositingCoordinator();
    6668
    67     void setRootCompositingLayer(GraphicsLayer*);
    68     void setViewOverlayRootLayer(GraphicsLayer*);
    69     void sizeDidChange(const IntSize& newSize);
     69    void setRootCompositingLayer(WebCore::GraphicsLayer*);
     70    void setViewOverlayRootLayer(WebCore::GraphicsLayer*);
     71    void sizeDidChange(const WebCore::IntSize&);
    7072    void deviceOrPageScaleFactorChanged();
    7173
    72     void setVisibleContentsRect(const FloatRect&, const FloatPoint&);
     74    void setVisibleContentsRect(const WebCore::FloatRect&, const WebCore::FloatPoint&);
    7375    void renderNextFrame();
    7476    void purgeBackingStores();
    75     void commitScrollOffset(uint32_t layerID, const IntSize& offset);
     77    void commitScrollOffset(uint32_t layerID, const WebCore::IntSize& offset);
    7678
    77     void createRootLayer(const IntSize&);
     79    void createRootLayer(const WebCore::IntSize&);
    7880    void clearRootLayer() { m_rootLayer = nullptr; }
    79     GraphicsLayer* rootLayer() const { return m_rootLayer.get(); }
    80     CoordinatedGraphicsLayer* mainContentsLayer();
     81    WebCore::GraphicsLayer* rootLayer() const { return m_rootLayer.get(); }
     82    WebCore::CoordinatedGraphicsLayer* mainContentsLayer();
    8183
    8284    bool flushPendingLayerChanges();
    83     CoordinatedGraphicsState& state() { return m_state; }
     85    WebCore::CoordinatedGraphicsState& state() { return m_state; }
    8486
    8587    void syncDisplayState();
    … …  
    9193private:
    9294    // GraphicsLayerClient
    93     void notifyAnimationStarted(const GraphicsLayer*, const String&, double time) override;
    94     void notifyFlushRequired(const GraphicsLayer*) override;
    95     void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const FloatRect& clipRect) override;
     95    void notifyAnimationStarted(const WebCore::GraphicsLayer*, const String&, double time) override;
     96    void notifyFlushRequired(const WebCore::GraphicsLayer*) override;
     97    void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::FloatRect& clipRect) override;
    9698    float deviceScaleFactor() const override;
    9799    float pageScaleFactor() const override;
    98100
    99101    // CoordinatedImageBacking::Client
    100     void createImageBacking(CoordinatedImageBackingID) override;
    101     void updateImageBacking(CoordinatedImageBackingID, PassRefPtr<CoordinatedSurface>) override;
    102     void clearImageBackingContents(CoordinatedImageBackingID) override;
    103     void removeImageBacking(CoordinatedImageBackingID) override;
     102    void createImageBacking(WebCore::CoordinatedImageBackingID) override;
     103    void updateImageBacking(WebCore::CoordinatedImageBackingID, PassRefPtr<WebCore::CoordinatedSurface>) override;
     104    void clearImageBackingContents(WebCore::CoordinatedImageBackingID) override;
     105    void removeImageBacking(WebCore::CoordinatedImageBackingID) override;
    104106
    105107    // CoordinatedGraphicsLayerClient
    106108    bool isFlushingLayerChanges() const override { return m_isFlushingLayerChanges; }
    107     FloatRect visibleContentsRect() const override;
    108     PassRefPtr<CoordinatedImageBacking> createImageBackingIfNeeded(Image*) override;
    109     void detachLayer(CoordinatedGraphicsLayer*) override;
     109    WebCore::FloatRect visibleContentsRect() const override;
     110    PassRefPtr<WebCore::CoordinatedImageBacking> createImageBackingIfNeeded(WebCore::Image*) override;
     111    void detachLayer(WebCore::CoordinatedGraphicsLayer*) override;
    110112    bool paintToSurface(const WebCore::IntSize&, WebCore::CoordinatedSurface::Flags, uint32_t& /* atlasID */, WebCore::IntPoint&, WebCore::CoordinatedSurface::Client*) override;
    111     void syncLayerState(CoordinatedLayerID, CoordinatedGraphicsLayerState&) override;
     113    void syncLayerState(WebCore::CoordinatedLayerID, WebCore::CoordinatedGraphicsLayerState&) override;
    112114
    113115    // UpdateAtlas::Client
    114     void createUpdateAtlas(uint32_t atlasID, PassRefPtr<CoordinatedSurface>) override;
     116    void createUpdateAtlas(uint32_t atlasID, PassRefPtr<WebCore::CoordinatedSurface>) override;
    115117    void removeUpdateAtlas(uint32_t atlasID) override;
    116118
    117119    // GraphicsLayerFactory
    118     std::unique_ptr<GraphicsLayer> createGraphicsLayer(GraphicsLayer::Type, GraphicsLayerClient&) override;
     120    std::unique_ptr<WebCore::GraphicsLayer> createGraphicsLayer(WebCore::GraphicsLayer::Type, WebCore::GraphicsLayerClient&) override;
    119121
    120122    void initializeRootCompositingLayerIfNeeded();
    … …  
    128130    double timestamp() const;
    129131
    130     Page* m_page;
     132    WebCore::Page* m_page;
    131133    CompositingCoordinator::Client* m_client;
    132134
    133     std::unique_ptr<GraphicsLayer> m_rootLayer;
    134     GraphicsLayer* m_rootCompositingLayer;
    135     GraphicsLayer* m_overlayCompositingLayer;
     135    std::unique_ptr<WebCore::GraphicsLayer> m_rootLayer;
     136    WebCore::GraphicsLayer* m_rootCompositingLayer;
     137    WebCore::GraphicsLayer* m_overlayCompositingLayer;
    136138
    137     CoordinatedGraphicsState m_state;
     139    WebCore::CoordinatedGraphicsState m_state;
    138140
    139     typedef HashMap<CoordinatedLayerID, CoordinatedGraphicsLayer*> LayerMap;
     141    typedef HashMap<WebCore::CoordinatedLayerID, WebCore::CoordinatedGraphicsLayer*> LayerMap;
    140142    LayerMap m_registeredLayers;
    141     typedef HashMap<CoordinatedImageBackingID, RefPtr<CoordinatedImageBacking> > ImageBackingMap;
     143    typedef HashMap<WebCore::CoordinatedImageBackingID, RefPtr<WebCore::CoordinatedImageBacking> > ImageBackingMap;
    142144    ImageBackingMap m_imageBackings;
    143145    Vector<std::unique_ptr<UpdateAtlas>> m_updateAtlases;
    … …  
    148150    bool m_isFlushingLayerChanges;
    149151
    150     FloatRect m_visibleContentsRect;
     152    WebCore::FloatRect m_visibleContentsRect;
    151153
    152154    bool m_shouldSyncFrame;
    153155    bool m_didInitializeRootCompositingLayer;
    154     Timer m_releaseInactiveAtlasesTimer;
     156    WebCore::Timer m_releaseInactiveAtlasesTimer;
    155157
    156158#if ENABLE(REQUEST_ANIMATION_FRAME)
    … …  
    161163}
    162164
    163 #endif
     165#endif // namespace WebKit
    164166
    165167#endif // CompositingCoordinator_h

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

    r202621 r202675  
    2424#if USE(COORDINATED_GRAPHICS)
    2525
     26#include "CompositingCoordinator.h"
    2627#include "LayerTreeHost.h"
    27 #include <WebCore/CompositingCoordinator.h>
    2828#include <wtf/RunLoop.h>
    2929
    … …  
    3737class WebPage;
    3838
    39 class CoordinatedLayerTreeHost : public LayerTreeHost, public WebCore::CompositingCoordinator::Client
     39class CoordinatedLayerTreeHost : public LayerTreeHost, public CompositingCoordinator::Client
    4040{
    4141public:
    … …  
    8686    static RefPtr<WebCore::CoordinatedSurface> createCoordinatedSurface(const WebCore::IntSize&, WebCore::CoordinatedSurface::Flags);
    8787
    88     std::unique_ptr<WebCore::CompositingCoordinator> m_coordinator;
     88    std::unique_ptr<CompositingCoordinator> m_coordinator;
    8989    bool m_isWaitingForRenderer { true };
    9090    uint64_t m_forceRepaintAsyncCallbackID { 0 };

  • trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.cpp

    r202674 r202675  
    2424#if USE(COORDINATED_GRAPHICS)
    2525
    26 #include "CoordinatedGraphicsState.h"
    27 #include "GraphicsContext.h"
    28 #include "IntRect.h"
     26#include <WebCore/CoordinatedGraphicsState.h>
     27#include <WebCore/GraphicsContext.h>
     28#include <WebCore/IntRect.h>
    2929#include <wtf/MathExtras.h>
    3030
    31 namespace WebCore {
     31using namespace WebCore;
     32
     33namespace WebKit {
    3234
    3335class UpdateAtlasSurfaceClient : public CoordinatedSurface::Client {

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

    r202674 r202675  
    2323
    2424#include "AreaAllocator.h"
    25 #include "CoordinatedSurface.h"
    26 #include "IntSize.h"
     25#include <WebCore/CoordinatedSurface.h>
     26#include <WebCore/IntSize.h>
    2727#include <wtf/PassRefPtr.h>
    2828#include <wtf/RefPtr.h>
    … …  
    3333class GraphicsContext;
    3434class IntPoint;
     35}
     36
     37namespace WebKit {
    3538
    3639class UpdateAtlas {
    … …  
    3942    class Client {
    4043    public:
    41         virtual void createUpdateAtlas(uint32_t /* id */, PassRefPtr<CoordinatedSurface>) = 0;
     44        virtual void createUpdateAtlas(uint32_t /* id */, PassRefPtr<WebCore::CoordinatedSurface>) = 0;
    4245        virtual void removeUpdateAtlas(uint32_t /* id */) = 0;
    4346    };
    4447
    45     UpdateAtlas(Client*, int dimension, CoordinatedSurface::Flags);
     48    UpdateAtlas(Client*, int dimension, WebCore::CoordinatedSurface::Flags);
    4649    ~UpdateAtlas();
    4750
    48     inline IntSize size() const { return m_surface->size(); }
     51    inline WebCore::IntSize size() const { return m_surface->size(); }
    4952
    5053    // Returns false if there is no available buffer.
    51     bool paintOnAvailableBuffer(const IntSize&, uint32_t& atlasID, IntPoint& offset, CoordinatedSurface::Client*);
     54    bool paintOnAvailableBuffer(const WebCore::IntSize&, uint32_t& atlasID, WebCore::IntPoint& offset, WebCore::CoordinatedSurface::Client*);
    5255    void didSwapBuffers();
    5356    bool supportsAlpha() const { return m_surface->supportsAlpha(); }
    … …  
    7174    Client* m_client;
    7275    std::unique_ptr<GeneralAreaAllocator> m_areaAllocator;
    73     RefPtr<CoordinatedSurface> m_surface;
     76    RefPtr<WebCore::CoordinatedSurface> m_surface;
    7477    double m_inactivityInSeconds;
    7578    uint32_t m_ID;
    7679};
    7780
    78 } // namespace WebCore
     81} // namespace WebKit
     82
    7983#endif // USE(COORDINATED_GRAPHICS)
    8084#endif // UpdateAtlas_h
Note: See TracChangeset for help on using the changeset viewer.