Changeset 201802 in webkit


Ignore:
Timestamp:
Jun 8, 2016 5:13:11 AM (8 years ago)
Author:
Carlos Garcia Campos
Message:

LayerTreeHost should be created with a WebPage reference instead of a pointer
​https://bugs.webkit.org/show_bug.cgi?id=158520

Reviewed by Žan Doberšek.

We are indeed creating the LayerTreeHost always from a WebPage reference but getting its address to pass it to
the LayerTreeHost create() function.

  • WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:

(WebKit::CoordinatedDrawingArea::enterAcceleratedCompositingMode):

  • WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:

(WebKit::CoordinatedLayerTreeHost::create):
(WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
(WebKit::CoordinatedLayerTreeHost::didFlushRootLayer):
(WebKit::CoordinatedLayerTreeHost::performScheduledLayerFlush):
(WebKit::CoordinatedLayerTreeHost::commitSceneState):
(WebKit::CoordinatedLayerTreeHost::deviceOrPageScaleFactorChanged):

  • WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
  • WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:

(WebKit::ThreadedCoordinatedLayerTreeHost::create):
(WebKit::ThreadedCoordinatedLayerTreeHost::ThreadedCoordinatedLayerTreeHost):
(WebKit::ThreadedCoordinatedLayerTreeHost::deviceOrPageScaleFactorChanged):
(WebKit::ThreadedCoordinatedLayerTreeHost::compositorDidFlushLayers):
(WebKit::ThreadedCoordinatedLayerTreeHost::didScaleFactorChanged):
(WebKit::ThreadedCoordinatedLayerTreeHost::setVisibleContentsRect):

  • WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:
  • WebProcess/WebPage/DrawingAreaImpl.cpp:

(WebKit::DrawingAreaImpl::enterAcceleratedCompositingMode):

  • WebProcess/WebPage/LayerTreeHost.cpp:

(WebKit::LayerTreeHost::create):
(WebKit::LayerTreeHost::LayerTreeHost):

  • WebProcess/WebPage/LayerTreeHost.h:
  • WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:

(WebKit::LayerTreeHostGtk::create):
(WebKit::LayerTreeHostGtk::LayerTreeHostGtk):
(WebKit::LayerTreeHostGtk::makeContextCurrent):
(WebKit::LayerTreeHostGtk::deviceOrPageScaleFactorChanged):
(WebKit::LayerTreeHostGtk::paintContents):
(WebKit::LayerTreeHostGtk::deviceScaleFactor):
(WebKit::LayerTreeHostGtk::pageScaleFactor):
(WebKit::LayerTreeHostGtk::flushPendingLayerChanges):
(WebKit::LayerTreeHostGtk::flushAndRenderLayers):
(WebKit::LayerTreeHostGtk::pageBackgroundTransparencyChanged):
(WebKit::LayerTreeHostGtk::initialize): Deleted.

  • WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
Location:
trunk/Source/WebKit2
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r201770 r201802  
     12016-06-08  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        LayerTreeHost should be created with a WebPage reference instead of a pointer
     4        https://bugs.webkit.org/show_bug.cgi?id=158520
     5
     6        Reviewed by Žan Doberšek.
     7
     8        We are indeed creating the LayerTreeHost always from a WebPage reference but getting its address to pass it to
     9        the LayerTreeHost create() function.
     10
     11        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:
     12        (WebKit::CoordinatedDrawingArea::enterAcceleratedCompositingMode):
     13        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
     14        (WebKit::CoordinatedLayerTreeHost::create):
     15        (WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
     16        (WebKit::CoordinatedLayerTreeHost::didFlushRootLayer):
     17        (WebKit::CoordinatedLayerTreeHost::performScheduledLayerFlush):
     18        (WebKit::CoordinatedLayerTreeHost::commitSceneState):
     19        (WebKit::CoordinatedLayerTreeHost::deviceOrPageScaleFactorChanged):
     20        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
     21        * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:
     22        (WebKit::ThreadedCoordinatedLayerTreeHost::create):
     23        (WebKit::ThreadedCoordinatedLayerTreeHost::ThreadedCoordinatedLayerTreeHost):
     24        (WebKit::ThreadedCoordinatedLayerTreeHost::deviceOrPageScaleFactorChanged):
     25        (WebKit::ThreadedCoordinatedLayerTreeHost::compositorDidFlushLayers):
     26        (WebKit::ThreadedCoordinatedLayerTreeHost::didScaleFactorChanged):
     27        (WebKit::ThreadedCoordinatedLayerTreeHost::setVisibleContentsRect):
     28        * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:
     29        * WebProcess/WebPage/DrawingAreaImpl.cpp:
     30        (WebKit::DrawingAreaImpl::enterAcceleratedCompositingMode):
     31        * WebProcess/WebPage/LayerTreeHost.cpp:
     32        (WebKit::LayerTreeHost::create):
     33        (WebKit::LayerTreeHost::LayerTreeHost):
     34        * WebProcess/WebPage/LayerTreeHost.h:
     35        * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
     36        (WebKit::LayerTreeHostGtk::create):
     37        (WebKit::LayerTreeHostGtk::LayerTreeHostGtk):
     38        (WebKit::LayerTreeHostGtk::makeContextCurrent):
     39        (WebKit::LayerTreeHostGtk::deviceOrPageScaleFactorChanged):
     40        (WebKit::LayerTreeHostGtk::paintContents):
     41        (WebKit::LayerTreeHostGtk::deviceScaleFactor):
     42        (WebKit::LayerTreeHostGtk::pageScaleFactor):
     43        (WebKit::LayerTreeHostGtk::flushPendingLayerChanges):
     44        (WebKit::LayerTreeHostGtk::flushAndRenderLayers):
     45        (WebKit::LayerTreeHostGtk::pageBackgroundTransparencyChanged):
     46        (WebKit::LayerTreeHostGtk::initialize): Deleted.
     47        * WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
     48
    1492016-06-07  Sam Weinig  <sam@webkit.org>
    250

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

    r193843 r201802  
    307307    m_wantsToExitAcceleratedCompositingMode = false;
    308308
    309     m_layerTreeHost = LayerTreeHost::create(&m_webPage);
     309    m_layerTreeHost = LayerTreeHost::create(m_webPage);
    310310    if (!m_inUpdateBackingStoreState)
    311311        m_layerTreeHost->setShouldNotifyAfterNextScheduledLayerFlush(true);

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

    r200408 r201802  
    5050namespace WebKit {
    5151
    52 Ref<CoordinatedLayerTreeHost> CoordinatedLayerTreeHost::create(WebPage* webPage)
     52Ref<CoordinatedLayerTreeHost> CoordinatedLayerTreeHost::create(WebPage& webPage)
    5353{
    5454    return adoptRef(*new CoordinatedLayerTreeHost(webPage));
    … …  
    5959}
    6060
    61 CoordinatedLayerTreeHost::CoordinatedLayerTreeHost(WebPage* webPage)
     61CoordinatedLayerTreeHost::CoordinatedLayerTreeHost(WebPage& webPage)
    6262    : LayerTreeHost(webPage)
    6363    , m_notifyAfterScheduledLayerFlush(false)
    … …  
    7070    , m_viewOverlayRootLayer(nullptr)
    7171{
    72     m_coordinator = std::make_unique<CompositingCoordinator>(webPage->corePage(), this);
    73 
    74     m_coordinator->createRootLayer(webPage->size());
     72    m_coordinator = std::make_unique<CompositingCoordinator>(m_webPage.corePage(), this);
     73
     74    m_coordinator->createRootLayer(m_webPage.size());
    7575    m_layerTreeContext.contextID = toCoordinatedGraphicsLayer(m_coordinator->rootLayer())->id();
    7676
    … …  
    187187    // Because our view-relative overlay root layer is not attached to the FrameView's GraphicsLayer tree, we need to flush it manually.
    188188    if (m_viewOverlayRootLayer)
    189         m_viewOverlayRootLayer->flushCompositingState(visibleContentRect,  m_webPage->mainFrame()->view()->viewportIsStable());
     189        m_viewOverlayRootLayer->flushCompositingState(visibleContentRect,  m_webPage.mainFrame()->view()->viewportIsStable());
    190190}
    191191
    … …  
    203203
    204204    if (m_forceRepaintAsyncCallbackID) {
    205         m_webPage->send(Messages::WebPageProxy::VoidCallback(m_forceRepaintAsyncCallbackID));
     205        m_webPage.send(Messages::WebPageProxy::VoidCallback(m_forceRepaintAsyncCallbackID));
    206206        m_forceRepaintAsyncCallbackID = 0;
    207207    }
    208208
    209209    if (m_notifyAfterScheduledLayerFlush && didSync) {
    210         static_cast<CoordinatedDrawingArea*>(m_webPage->drawingArea())->layerHostDidFlushLayers();
     210        static_cast<CoordinatedDrawingArea*>(m_webPage.drawingArea())->layerHostDidFlushLayers();
    211211        m_notifyAfterScheduledLayerFlush = false;
    212212    }
    … …  
    224224void CoordinatedLayerTreeHost::commitSceneState(const WebCore::CoordinatedGraphicsState& state)
    225225{
    226     m_webPage->send(Messages::CoordinatedLayerTreeHostProxy::CommitCoordinatedGraphicsState(state));
     226    m_webPage.send(Messages::CoordinatedLayerTreeHostProxy::CommitCoordinatedGraphicsState(state));
    227227    m_isWaitingForRenderer = true;
    228228}
    … …  
    236236{
    237237    m_coordinator->deviceOrPageScaleFactorChanged();
    238     m_webPage->mainFrame()->pageOverlayController().didChangeDeviceScaleFactor();
     238    m_webPage.mainFrame()->pageOverlayController().didChangeDeviceScaleFactor();
    239239}
    240240

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

    r200408 r201802  
    4141{
    4242public:
    43     static Ref<CoordinatedLayerTreeHost> create(WebPage*);
     43    static Ref<CoordinatedLayerTreeHost> create(WebPage&);
    4444    virtual ~CoordinatedLayerTreeHost();
    4545
    … …  
    7676
    7777protected:
    78     explicit CoordinatedLayerTreeHost(WebPage*);
     78    explicit CoordinatedLayerTreeHost(WebPage&);
    7979
    8080private:

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

    r200408 r201802  
    4949namespace WebKit {
    5050
    51 Ref<ThreadedCoordinatedLayerTreeHost> ThreadedCoordinatedLayerTreeHost::create(WebPage* webPage)
     51Ref<ThreadedCoordinatedLayerTreeHost> ThreadedCoordinatedLayerTreeHost::create(WebPage webPage)
    5252{
    5353    return adoptRef(*new ThreadedCoordinatedLayerTreeHost(webPage));
    … …  
    5858}
    5959
    60 ThreadedCoordinatedLayerTreeHost::ThreadedCoordinatedLayerTreeHost(WebPage* webPage)
     60ThreadedCoordinatedLayerTreeHost::ThreadedCoordinatedLayerTreeHost(WebPage& webPage)
    6161    : LayerTreeHost(webPage)
    6262    , m_forceRepaintAsyncCallbackID(0)
    … …  
    6767    , m_layerFlushSchedulingEnabled(true)
    6868{
    69     m_coordinator = std::make_unique<CompositingCoordinator>(m_webPage->corePage(), this);
    70 
    71     m_coordinator->createRootLayer(m_webPage->size());
     69    m_coordinator = std::make_unique<CompositingCoordinator>(m_webPage.corePage(), this);
     70
     71    m_coordinator->createRootLayer(m_webPage.size());
    7272
    7373    CoordinatedSurface::setFactory(createCoordinatedSurface);
    … …  
    150150{
    151151    m_coordinator->deviceOrPageScaleFactorChanged();
    152     m_compositor->setDeviceScaleFactor(m_webPage->deviceScaleFactor());
     152    m_compositor->setDeviceScaleFactor(m_webPage.deviceScaleFactor());
    153153}
    154154
    … …  
    181181void ThreadedCoordinatedLayerTreeHost::compositorDidFlushLayers()
    182182{
    183     static_cast<DrawingAreaImpl*>(m_webPage->drawingArea())->layerHostDidFlushLayers();
     183    static_cast<DrawingAreaImpl*>(m_webPage.drawingArea())->layerHostDidFlushLayers();
    184184}
    185185
    186186void ThreadedCoordinatedLayerTreeHost::didScaleFactorChanged(float scale, const IntPoint& origin)
    187187{
    188     m_webPage->scalePage(scale, origin);
     188    m_webPage.scalePage(scale, origin);
    189189}
    190190
    … …  
    222222        m_lastScrollPosition = roundedIntPoint(rect.location());
    223223
    224         if (!m_webPage->corePage()->mainFrame().view()->useFixedLayout())
    225             m_webPage->corePage()->mainFrame().view()->notifyScrollPositionChanged(m_lastScrollPosition);
     224        if (!m_webPage.corePage()->mainFrame().view()->useFixedLayout())
     225            m_webPage.corePage()->mainFrame().view()->notifyScrollPositionChanged(m_lastScrollPosition);
    226226    }
    227227

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

    r200408 r201802  
    6262    WTF_MAKE_NONCOPYABLE(ThreadedCoordinatedLayerTreeHost); WTF_MAKE_FAST_ALLOCATED;
    6363public:
    64     static Ref<ThreadedCoordinatedLayerTreeHost> create(WebPage*);
     64    static Ref<ThreadedCoordinatedLayerTreeHost> create(WebPage&);
    6565    virtual ~ThreadedCoordinatedLayerTreeHost();
    6666
    … …  
    102102
    103103protected:
    104     explicit ThreadedCoordinatedLayerTreeHost(WebPage*);
     104    explicit ThreadedCoordinatedLayerTreeHost(WebPage&);
    105105
    106106private:

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

    r197927 r201802  
    472472    ASSERT(!m_layerTreeHost);
    473473
    474     m_layerTreeHost = LayerTreeHost::create(&m_webPage);
     474    m_layerTreeHost = LayerTreeHost::create(m_webPage);
    475475#if USE(TEXTURE_MAPPER) && PLATFORM(GTK)
    476476    if (m_nativeSurfaceHandleForCompositing)

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

    r194108 r201802  
    4242namespace WebKit {
    4343
    44 PassRefPtr<LayerTreeHost> LayerTreeHost::create(WebPage* webPage)
     44RefPtr<LayerTreeHost> LayerTreeHost::create(WebPage& webPage)
    4545{
    4646#if USE(COORDINATED_GRAPHICS_THREADED)
    … …  
    5252#else
    5353    UNUSED_PARAM(webPage);
    54     return 0;
     54    return nullptr;
    5555#endif
    5656}
    5757
    58 LayerTreeHost::LayerTreeHost(WebPage* webPage)
     58LayerTreeHost::LayerTreeHost(WebPage& webPage)
    5959    : m_webPage(webPage)
    6060{

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

    r194108 r201802  
    5858class LayerTreeHost : public RefCounted<LayerTreeHost> {
    5959public:
    60     static PassRefPtr<LayerTreeHost> create(WebPage*);
     60    static RefPtr<LayerTreeHost> create(WebPage&);
    6161    virtual ~LayerTreeHost();
    6262
    … …  
    102102
    103103protected:
    104     explicit LayerTreeHost(WebPage*);
     104    explicit LayerTreeHost(WebPage&);
    105105
    106     WebPage* m_webPage;
     106    WebPage& m_webPage;
    107107};
    108108

  • trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp

    r198266 r201802  
    127127}
    128128
    129 PassRefPtr<LayerTreeHostGtk> LayerTreeHostGtk::create(WebPage* webPage)
    130 {
    131     RefPtr<LayerTreeHostGtk> host = adoptRef(new LayerTreeHostGtk(webPage));
    132     host->initialize();
    133     return host.release();
    134 }
    135 
    136 LayerTreeHostGtk::LayerTreeHostGtk(WebPage* webPage)
     129Ref<LayerTreeHostGtk> LayerTreeHostGtk::create(WebPage& webPage)
     130{
     131    return adoptRef(*new LayerTreeHostGtk(webPage));
     132}
     133
     134LayerTreeHostGtk::LayerTreeHostGtk(WebPage& webPage)
    137135    : LayerTreeHost(webPage)
    138136    , m_isValid(true)
    … …  
    142140    , m_renderFrameScheduler(std::bind(&LayerTreeHostGtk::renderFrame, this))
    143141{
     142    m_rootLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
     143    m_rootLayer->setDrawsContent(false);
     144    m_rootLayer->setSize(m_webPage.size());
     145
     146    m_scaleMatrix.makeIdentity();
     147    m_scaleMatrix.scale(m_webPage.deviceScaleFactor() * m_webPage.pageScaleFactor());
     148    downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setAnchorPoint(FloatPoint3D());
     149    downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setTransform(m_scaleMatrix);
     150
     151    // The non-composited contents are a child of the root layer.
     152    m_nonCompositedContentLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
     153    m_nonCompositedContentLayer->setDrawsContent(true);
     154    m_nonCompositedContentLayer->setContentsOpaque(m_webPage.drawsBackground());
     155    m_nonCompositedContentLayer->setSize(m_webPage.size());
     156    if (m_webPage.corePage()->settings().acceleratedDrawingEnabled())
     157        m_nonCompositedContentLayer->setAcceleratesDrawing(true);
     158
     159#ifndef NDEBUG
     160    m_rootLayer->setName("LayerTreeHost root layer");
     161    m_nonCompositedContentLayer->setName("LayerTreeHost non-composited content");
     162#endif
     163
     164    m_rootLayer->addChild(m_nonCompositedContentLayer.get());
     165    m_nonCompositedContentLayer->setNeedsDisplay();
    144166}
    145167
    … …  
    160182}
    161183
    162 void LayerTreeHostGtk::initialize()
    163 {
    164     m_rootLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
    165     m_rootLayer->setDrawsContent(false);
    166     m_rootLayer->setSize(m_webPage->size());
    167 
    168     m_scaleMatrix.makeIdentity();
    169     m_scaleMatrix.scale(m_webPage->deviceScaleFactor() * m_webPage->pageScaleFactor());
    170     downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setAnchorPoint(FloatPoint3D());
    171     downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setTransform(m_scaleMatrix);
    172 
    173     // The non-composited contents are a child of the root layer.
    174     m_nonCompositedContentLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
    175     m_nonCompositedContentLayer->setDrawsContent(true);
    176     m_nonCompositedContentLayer->setContentsOpaque(m_webPage->drawsBackground());
    177     m_nonCompositedContentLayer->setSize(m_webPage->size());
    178     if (m_webPage->corePage()->settings().acceleratedDrawingEnabled())
    179         m_nonCompositedContentLayer->setAcceleratesDrawing(true);
    180 
    181 #ifndef NDEBUG
    182     m_rootLayer->setName("LayerTreeHost root layer");
    183     m_nonCompositedContentLayer->setName("LayerTreeHost non-composited content");
    184 #endif
    185 
    186     m_rootLayer->addChild(m_nonCompositedContentLayer.get());
    187     m_nonCompositedContentLayer->setNeedsDisplay();
    188 }
    189 
    190184LayerTreeHostGtk::~LayerTreeHostGtk()
    191185{
    … …  
    280274
    281275    m_scaleMatrix.makeIdentity();
    282     m_scaleMatrix.scale(m_webPage->deviceScaleFactor() * m_webPage->pageScaleFactor());
     276    m_scaleMatrix.scale(m_webPage.deviceScaleFactor() * m_webPage.pageScaleFactor());
    283277    downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setTransform(m_scaleMatrix);
    284278}
    … …  
    292286{
    293287    if (graphicsLayer == m_nonCompositedContentLayer.get())
    294         m_webPage->drawRect(graphicsContext, enclosingIntRect(clipRect));
     288        m_webPage.drawRect(graphicsContext, enclosingIntRect(clipRect));
    295289}
    296290
    297291float LayerTreeHostGtk::deviceScaleFactor() const
    298292{
    299     return m_webPage->deviceScaleFactor();
     293    return m_webPage.deviceScaleFactor();
    300294}
    301295
    302296float LayerTreeHostGtk::pageScaleFactor() const
    303297{
    304     return m_webPage->pageScaleFactor();
     298    return m_webPage.pageScaleFactor();
    305299}
    306300
    … …  
    313307bool LayerTreeHostGtk::flushPendingLayerChanges()
    314308{
    315     bool viewportIsStable = m_webPage->corePage()->mainFrame().view()->viewportIsStable();
     309    bool viewportIsStable = m_webPage.corePage()->mainFrame().view()->viewportIsStable();
    316310    m_rootLayer->flushCompositingStateForThisLayerOnly(viewportIsStable);
    317311    m_nonCompositedContentLayer->flushCompositingStateForThisLayerOnly(viewportIsStable);
    318312
    319     if (!m_webPage->corePage()->mainFrame().view()->flushCompositingStateIncludingSubframes())
     313    if (!m_webPage.corePage()->mainFrame().view()->flushCompositingStateIncludingSubframes())
    320314        return false;
    321315
    … …  
    355349    {
    356350        RefPtr<LayerTreeHostGtk> protect(this);
    357         m_webPage->layoutIfNeeded();
     351        m_webPage.layoutIfNeeded();
    358352
    359353        if (!m_isValid)
    … …  
    372366    if (m_notifyAfterScheduledLayerFlush) {
    373367        // Let the drawing area know that we've done a flush of the layer changes.
    374         static_cast<DrawingAreaImpl*>(m_webPage->drawingArea())->layerHostDidFlushLayers();
     368        static_cast<DrawingAreaImpl*>(m_webPage.drawingArea())->layerHostDidFlushLayers();
    375369        m_notifyAfterScheduledLayerFlush = false;
    376370    }
    … …  
    402396void LayerTreeHostGtk::pageBackgroundTransparencyChanged()
    403397{
    404     m_nonCompositedContentLayer->setContentsOpaque(m_webPage->drawsBackground());
     398    m_nonCompositedContentLayer->setContentsOpaque(m_webPage.drawsBackground());
    405399}
    406400

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

    r197563 r201802  
    4242class LayerTreeHostGtk final : public LayerTreeHost, WebCore::GraphicsLayerClient {
    4343public:
    44     static PassRefPtr<LayerTreeHostGtk> create(WebPage*);
     44    static Ref<LayerTreeHostGtk> create(WebPage&);
    4545    virtual ~LayerTreeHostGtk();
    4646
    47 protected:
    48     explicit LayerTreeHostGtk(WebPage*);
     47private:
     48    explicit LayerTreeHostGtk(WebPage&);
    4949
    5050    WebCore::GraphicsLayer* rootLayer() const { return m_rootLayer.get(); }
    51 
    52     void initialize();
    5351
    5452    // LayerTreeHost
    … …  
    6462
    6563    void setNativeSurfaceHandleForCompositing(uint64_t) override;
    66 
    67 private:
    6864
    6965    class RenderFrameScheduler {
Note: See TracChangeset for help on using the changeset viewer.