⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 109411 in webkit


Ignore:
Timestamp:
Mar 1, 2012, 1:42:45 PM (15 years ago)
Author:
nduca@chromium.org
Message:

[chromium] Move context lost control code from CCSingleThreadProxy to CCLayerTreeHost
​https://bugs.webkit.org/show_bug.cgi?id=79964

Reviewed by James Robinson.

Source/WebCore:

  • platform/graphics/chromium/cc/CCLayerTreeHost.cpp:

(WebCore::CCLayerTreeHost::CCLayerTreeHost):
(WebCore::CCLayerTreeHost::initializeLayerRenderer):
(WebCore::CCLayerTreeHost::recreateContext):
(WebCore::CCLayerTreeHost::createContext):
(WebCore::CCLayerTreeHost::didLoseContext):
(WebCore::CCLayerTreeHost::compositeAndReadback):
(WebCore::CCLayerTreeHost::loseContext):
(WebCore::CCLayerTreeHost::updateLayers):

  • platform/graphics/chromium/cc/CCLayerTreeHost.h:

(CCLayerTreeHostClient):
(CCLayerTreeHost):

  • platform/graphics/chromium/cc/CCProxy.h:

(CCProxy):

  • platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:

(WebCore::CCSingleThreadProxy::CCSingleThreadProxy):
(WebCore::CCSingleThreadProxy::compositeAndReadback):
(WebCore::CCSingleThreadProxy::initializeContext):
(WebCore::CCSingleThreadProxy::recreateContext):
(WebCore):
(WebCore::CCSingleThreadProxy::loseContext):
(WebCore::CCSingleThreadProxy::compositeImmediately):
(WebCore::CCSingleThreadProxy::doComposite):

  • platform/graphics/chromium/cc/CCSingleThreadProxy.h:

(CCSingleThreadProxy):

  • platform/graphics/chromium/cc/CCThreadProxy.cpp:

(WebCore::CCThreadProxy::initializeContext):
(WebCore::CCThreadProxy::recreateContext):
(WebCore):
(WebCore::CCThreadProxy::loseContext):

  • platform/graphics/chromium/cc/CCThreadProxy.h:

(CCThreadProxy):

Source/WebKit/chromium:

  • src/WebLayerTreeView.cpp:

(WebKit::WebLayerTreeView::loseCompositorContext):

  • src/WebLayerTreeViewImpl.cpp:

(WebKit::WebLayerTreeViewImpl::createContext):
(WebKit::WebLayerTreeViewImpl::didRecreateContext):

  • src/WebLayerTreeViewImpl.h:

(WebLayerTreeViewImpl):

  • tests/CCLayerTreeHostTest.cpp:

(WTF::MockLayerTreeHostClient::createContext):
(WTF::MockLayerTreeHostClient::didRecreateContext):

  • tests/FakeCCLayerTreeHostClient.h:

(WebCore::FakeCCLayerTreeHostClient::createContext):
(WebCore::FakeCCLayerTreeHostClient::didRecreateContext):

Location:
trunk/Source
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r109406 r109411  
     12012-02-29  Nat Duca  <nduca@chromium.org>
     2
     3        [chromium] Move context lost control code from CCSingleThreadProxy to CCLayerTreeHost
     4        https://bugs.webkit.org/show_bug.cgi?id=79964
     5
     6        Reviewed by James Robinson.
     7
     8        * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
     9        (WebCore::CCLayerTreeHost::CCLayerTreeHost):
     10        (WebCore::CCLayerTreeHost::initializeLayerRenderer):
     11        (WebCore::CCLayerTreeHost::recreateContext):
     12        (WebCore::CCLayerTreeHost::createContext):
     13        (WebCore::CCLayerTreeHost::didLoseContext):
     14        (WebCore::CCLayerTreeHost::compositeAndReadback):
     15        (WebCore::CCLayerTreeHost::loseContext):
     16        (WebCore::CCLayerTreeHost::updateLayers):
     17        * platform/graphics/chromium/cc/CCLayerTreeHost.h:
     18        (CCLayerTreeHostClient):
     19        (CCLayerTreeHost):
     20        * platform/graphics/chromium/cc/CCProxy.h:
     21        (CCProxy):
     22        * platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:
     23        (WebCore::CCSingleThreadProxy::CCSingleThreadProxy):
     24        (WebCore::CCSingleThreadProxy::compositeAndReadback):
     25        (WebCore::CCSingleThreadProxy::initializeContext):
     26        (WebCore::CCSingleThreadProxy::recreateContext):
     27        (WebCore):
     28        (WebCore::CCSingleThreadProxy::loseContext):
     29        (WebCore::CCSingleThreadProxy::compositeImmediately):
     30        (WebCore::CCSingleThreadProxy::doComposite):
     31        * platform/graphics/chromium/cc/CCSingleThreadProxy.h:
     32        (CCSingleThreadProxy):
     33        * platform/graphics/chromium/cc/CCThreadProxy.cpp:
     34        (WebCore::CCThreadProxy::initializeContext):
     35        (WebCore::CCThreadProxy::recreateContext):
     36        (WebCore):
     37        (WebCore::CCThreadProxy::loseContext):
     38        * platform/graphics/chromium/cc/CCThreadProxy.h:
     39        (CCThreadProxy):
     40
    1412012-03-01  Abhishek Arya  <inferno@chromium.org>
    242

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp

    r108886 r109411  
    6767    , m_frameNumber(0)
    6868    , m_layerRendererInitialized(false)
     69    , m_contextLost(false)
     70    , m_numTimesRecreateShouldFail(0)
     71    , m_numFailedRecreateAttempts(0)
    6972    , m_settings(settings)
    7073    , m_visible(true)
    … …  
    115118    if (!m_proxy->initializeLayerRenderer()) {
    116119        // Uh oh, better tell the client that we can't do anything with this context.
    117         m_client->didRecreateGraphicsContext(false);
     120        m_client->didRecreateContext(false);
    118121        return;
    119122    }
    … …  
    132135}
    133136
     137void CCLayerTreeHost::recreateContext()
     138{
     139    TRACE_EVENT0("cc", "CCLayerTreeHost::recreateContext");
     140    ASSERT(m_contextLost);
     141
     142    bool recreated = false;
     143    if (!m_numTimesRecreateShouldFail)
     144        recreated = m_proxy->recreateContext();
     145    else
     146        m_numTimesRecreateShouldFail--;
     147
     148    if (recreated) {
     149        m_client->didRecreateContext(true);
     150        m_contextLost = false;
     151        return;
     152    }
     153
     154    // Tolerate a certain number of recreation failures to work around races
     155    // in the context-lost machinery.
     156    m_numFailedRecreateAttempts++;
     157    if (m_numFailedRecreateAttempts < 5) {
     158        setNeedsCommit();
     159        return;
     160    }
     161
     162    // We have tried too many times to recreate the context. Tell the host to fall
     163    // back to software rendering.
     164    m_client->didRecreateContext(false);
     165}
    134166
    135167void CCLayerTreeHost::deleteContentsTexturesOnImplThread(TextureAllocator* allocator)
    … …  
    190222}
    191223
    192 PassRefPtr<GraphicsContext3D> CCLayerTreeHost::createLayerTreeHostContext3D()
    193 {
    194     return m_client->createLayerTreeHostContext3D();
     224PassRefPtr<GraphicsContext3D> CCLayerTreeHost::createContext()
     225{
     226    return m_client->createContext();
    195227}
    196228
    … …  
    200232}
    201233
    202 void CCLayerTreeHost::didRecreateGraphicsContext(bool success)
    203 {
    204     m_client->didRecreateGraphicsContext(success);
     234void CCLayerTreeHost::didLoseContext()
     235{
     236    TRACE_EVENT("CCLayerTreeHost::didLoseContext", 0, this);
     237    ASSERT(CCProxy::isMainThread());
     238    m_contextLost = true;
     239    m_numFailedRecreateAttempts = 0;
     240    setNeedsCommit();
    205241}
    206242
    … …  
    217253        initializeLayerRenderer();
    218254        if (!m_layerRendererInitialized)
     255            return false;
     256    }
     257    if (m_contextLost) {
     258        recreateContext();
     259        if (m_contextLost)
    219260            return false;
    220261    }
    … …  
    352393}
    353394
    354 void CCLayerTreeHost::loseCompositorContext(int numTimes)
    355 {
    356     m_proxy->loseCompositorContext(numTimes);
     395void CCLayerTreeHost::loseContext(int numTimes)
     396{
     397    TRACE_EVENT1("cc", "CCLayerTreeHost::loseCompositorContext", "numTimes", numTimes);
     398    m_numTimesRecreateShouldFail = numTimes - 1;
     399    m_proxy->loseContext();
    357400}
    358401
    … …  
    374417        // If we couldn't initialize, then bail since we're returning to software mode.
    375418        if (!m_layerRendererInitialized)
     419            return false;
     420    }
     421    if (m_contextLost) {
     422        recreateContext();
     423        if (m_contextLost)
    376424            return false;
    377425    }

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h

    r108880 r109411  
    5656    virtual void layout() = 0;
    5757    virtual void applyScrollAndScale(const IntSize& scrollDelta, float pageScale) = 0;
    58     virtual PassRefPtr<GraphicsContext3D> createLayerTreeHostContext3D() = 0;
    59     virtual void didRecreateGraphicsContext(bool success) = 0;
     58    virtual PassRefPtr<GraphicsContext3D> createContext() = 0;
     59    virtual void didRecreateContext(bool success) = 0;
    6060    virtual void didCommitAndDrawFrame() = 0;
    6161    virtual void didCompleteSwapBuffers() = 0;
    … …  
    131131    void finishCommitOnImplThread(CCLayerTreeHostImpl*);
    132132    void commitComplete();
    133     PassRefPtr<GraphicsContext3D> createLayerTreeHostContext3D();
     133    PassRefPtr<GraphicsContext3D> createContext();
    134134    virtual PassOwnPtr<CCLayerTreeHostImpl> createLayerTreeHostImpl(CCLayerTreeHostImplClient*);
    135135    void didBecomeInvisibleOnImplThread(CCLayerTreeHostImpl*);
    136     void didRecreateGraphicsContext(bool success);
     136    void didLoseContext();
    137137    void didCommitAndDrawFrame() { m_client->didCommitAndDrawFrame(); }
    138138    void didCompleteSwapBuffers() { m_client->didCompleteSwapBuffers(); }
    139139    void deleteContentsTexturesOnImplThread(TextureAllocator*);
     140    // Returns false if we should abort this frame due to initialization failure.
     141    bool updateLayers();
    140142
    141143    CCLayerTreeHostClient* client() { return m_client; }
    … …  
    160162
    161163    // Test only hook
    162     void loseCompositorContext(int numTimes);
     164    void loseContext(int numTimes);
    163165
    164166    void setNeedsAnimate();
    … …  
    186188    void setVisible(bool);
    187189
    188     // Returns false if we should abort this frame due to initialization failure.
    189     bool updateLayers();
    190 
    191190    void startPageScaleAnimation(const IntSize& targetPosition, bool useAnchor, float scale, double durationSec);
    192191
    … …  
    208207
    209208    void initializeLayerRenderer();
     209    void recreateContext();
    210210
    211211    enum PaintType { PaintVisible, PaintIdle };
    … …  
    231231    OwnPtr<CCProxy> m_proxy;
    232232    bool m_layerRendererInitialized;
     233    bool m_contextLost;
     234    int m_numTimesRecreateShouldFail;
     235    int m_numFailedRecreateAttempts;
    233236
    234237    RefPtr<LayerChromium> m_rootLayer;

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCProxy.h

    r107357 r109411  
    7171    virtual bool initializeLayerRenderer() = 0;
    7272
     73    // Attempts to recreate the context and layer renderer after a context lost. Returns false if the renderer couldn't be
     74    // reinitialized.
     75    virtual bool recreateContext() = 0;
     76
    7377    virtual int compositorIdentifier() const = 0;
    7478
    … …  
    96100
    97101    // Testing hooks
    98     virtual void loseCompositorContext(int numTimes) = 0;
     102    virtual void loseContext() = 0;
    99103
    100104#ifndef NDEBUG

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp

    r108581 r109411  
    4646CCSingleThreadProxy::CCSingleThreadProxy(CCLayerTreeHost* layerTreeHost)
    4747    : m_layerTreeHost(layerTreeHost)
     48    , m_contextLost(false)
    4849    , m_compositorIdentifier(-1)
    4950    , m_layerRendererInitialized(false)
    50     , m_numFailedRecreateAttempts(0)
    51     , m_graphicsContextLost(false)
    52     , m_timesRecreateShouldFail(0)
    5351    , m_nextFrameIsNewlyCommittedFrame(false)
    5452{
    … …  
    7472    TRACE_EVENT("CCSingleThreadProxy::compositeAndReadback", this, 0);
    7573    ASSERT(CCProxy::isMainThread());
    76 
    77     if (!recreateContextIfNeeded()) {
    78         TRACE_EVENT("compositeAndReadback_EarlyOut_ContextLost", this, 0);
    79         return false;
    80     }
    8174
    8275    if (!commitIfNeeded())
    … …  
    126119{
    127120    ASSERT(CCProxy::isMainThread());
    128     RefPtr<GraphicsContext3D> context = m_layerTreeHost->createLayerTreeHostContext3D();
     121    RefPtr<GraphicsContext3D> context = m_layerTreeHost->createContext();
    129122    if (!context)
    130123        return false;
    … …  
    149142}
    150143
     144bool CCSingleThreadProxy::recreateContext()
     145{
     146    TRACE_EVENT0("cc", "CCSingleThreadProxy::recreateContext");
     147    ASSERT(CCProxy::isMainThread());
     148    ASSERT(m_contextLost);
     149
     150    RefPtr<GraphicsContext3D> context = m_layerTreeHost->createContext();
     151    if (!context)
     152        return false;
     153
     154    ASSERT(context->hasOneRef());
     155    bool initialized;
     156    {
     157        DebugScopedSetImplThread impl;
     158        m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->contentsTextureAllocator());
     159        initialized = m_layerTreeHostImpl->initializeLayerRenderer(context);
     160        if (initialized)
     161            m_layerRendererCapabilitiesForMainThread = m_layerTreeHostImpl->layerRendererCapabilities();
     162    }
     163
     164    if (initialized)
     165        m_contextLost = false;
     166
     167    return initialized;
     168}
     169
    151170const LayerRendererCapabilities& CCSingleThreadProxy::layerRendererCapabilities() const
    152171{
    … …  
    156175}
    157176
    158 void CCSingleThreadProxy::loseCompositorContext(int numTimes)
    159 {
    160     m_graphicsContextLost = true;
    161     m_timesRecreateShouldFail = numTimes - 1;
     177void CCSingleThreadProxy::loseContext()
     178{
     179    ASSERT(CCProxy::isMainThread());
     180    m_layerTreeHost->didLoseContext();
     181    m_contextLost = true;
    162182}
    163183
    … …  
    244264void CCSingleThreadProxy::compositeImmediately()
    245265{
    246     if (!recreateContextIfNeeded())
    247         return;
    248 
    249266    if (!commitIfNeeded())
    250267        return;
    … …  
    254271}
    255272
    256 bool CCSingleThreadProxy::recreateContextIfNeeded()
    257 {
    258     ASSERT(CCProxy::isMainThread());
    259 
    260     if (!m_graphicsContextLost && m_layerTreeHostImpl->isContextLost()) {
    261         m_graphicsContextLost = true;
    262         m_numFailedRecreateAttempts = 0;
    263     }
    264 
    265     if (!m_graphicsContextLost)
    266         return true;
    267     RefPtr<GraphicsContext3D> context;
    268     if (!m_timesRecreateShouldFail)
    269         context = m_layerTreeHost->createLayerTreeHostContext3D();
    270     else
    271         m_timesRecreateShouldFail--;
    272 
    273     if (context) {
    274         ASSERT(context->hasOneRef());
    275         bool ok;
    276         {
    277             DebugScopedSetImplThread impl;
    278             m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->contentsTextureAllocator());
    279             ok = m_layerTreeHostImpl->initializeLayerRenderer(context);
    280             if (ok)
    281                 m_layerRendererCapabilitiesForMainThread = m_layerTreeHostImpl->layerRendererCapabilities();
    282         }
    283         if (ok) {
    284             m_layerTreeHost->didRecreateGraphicsContext(true);
    285             m_graphicsContextLost = false;
    286             return true;
    287         }
    288     }
    289 
    290     // Tolerate a certain number of recreation failures to work around races
    291     // in the context-lost machinery.
    292     m_numFailedRecreateAttempts++;
    293     if (m_numFailedRecreateAttempts < 5) {
    294         setNeedsCommit();
    295         return false;
    296     }
    297 
    298     // We have tried too many times to recreate the context. Tell the host to fall
    299     // back to software rendering.
    300     m_layerTreeHost->didRecreateGraphicsContext(false);
    301     return false;
    302 }
    303 
    304273bool CCSingleThreadProxy::commitIfNeeded()
    305274{
    … …  
    315284bool CCSingleThreadProxy::doComposite()
    316285{
    317     ASSERT(!m_graphicsContextLost);
    318 
     286    ASSERT(!m_contextLost);
    319287    {
    320288      DebugScopedSetImplThread impl;
    … …  
    325293
    326294    if (m_layerTreeHostImpl->isContextLost()) {
    327         // Trying to recover the context right here will not work if GPU process
    328         // died. This is because GpuChannelHost::OnErrorMessage will only be
    329         // called at the next iteration of the message loop, reverting our
    330         // recovery attempts here. Instead, we detach the root layer from the
    331         // renderer, recreate the renderer at the next message loop iteration
    332         // and request a repaint yet again.
    333         m_graphicsContextLost = true;
    334         m_numFailedRecreateAttempts = 0;
    335         setNeedsCommit();
     295        m_contextLost = true;
     296        m_layerTreeHost->didLoseContext();
    336297        return false;
    337298    }

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h

    r108581 r109411  
    5050    virtual bool initializeContext();
    5151    virtual bool initializeLayerRenderer();
     52    virtual bool recreateContext();
    5253    virtual int compositorIdentifier() const { return m_compositorIdentifier; }
    5354    virtual const LayerRendererCapabilities& layerRendererCapabilities() const;
    54     virtual void loseCompositorContext(int numTimes);
     55    virtual void loseContext();
    5556    virtual void setNeedsAnimate();
    5657    virtual void setNeedsCommit();
    … …  
    7273private:
    7374    explicit CCSingleThreadProxy(CCLayerTreeHost*);
    74     bool recreateContextIfNeeded();
     75
    7576    bool commitIfNeeded();
    7677    void doCommit();
    … …  
    7980    // Accessed on main thread only.
    8081    CCLayerTreeHost* m_layerTreeHost;
     82    bool m_contextLost;
    8183    int m_compositorIdentifier;
    8284
    … …  
    9092    LayerRendererCapabilities m_layerRendererCapabilitiesForMainThread;
    9193
    92     int m_numFailedRecreateAttempts;
    93     bool m_graphicsContextLost;
    94     int m_timesRecreateShouldFail; // Used during testing.
    9594    bool m_nextFrameIsNewlyCommittedFrame;
    9695};

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp

    r108581 r109411  
    171171{
    172172    TRACE_EVENT("CCThreadProxy::initializeContext", this, 0);
    173     RefPtr<GraphicsContext3D> context = m_layerTreeHost->createLayerTreeHostContext3D();
     173    RefPtr<GraphicsContext3D> context = m_layerTreeHost->createContext();
    174174    if (!context)
    175175        return false;
    … …  
    206206}
    207207
     208bool CCThreadProxy::recreateContext()
     209{
     210    ASSERT_NOT_REACHED();
     211    return false;
     212}
     213
    208214int CCThreadProxy::compositorIdentifier() const
    209215{
    … …  
    218224}
    219225
    220 void CCThreadProxy::loseCompositorContext(int numTimes)
     226void CCThreadProxy::loseContext()
    221227{
    222228    ASSERT_NOT_REACHED();

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h

    r108581 r109411  
    5757    virtual bool initializeContext();
    5858    virtual bool initializeLayerRenderer();
     59    virtual bool recreateContext();
    5960    virtual int compositorIdentifier() const;
    6061    virtual const LayerRendererCapabilities& layerRendererCapabilities() const;
    61     virtual void loseCompositorContext(int numTimes);
     62    virtual void loseContext();
    6263    virtual void setNeedsAnimate();
    6364    virtual void setNeedsCommit();

  • trunk/Source/WebKit/chromium/ChangeLog

    r109350 r109411  
     12012-02-29  Nat Duca  <nduca@chromium.org>
     2
     3        [chromium] Move context lost control code from CCSingleThreadProxy to CCLayerTreeHost
     4        https://bugs.webkit.org/show_bug.cgi?id=79964
     5
     6        Reviewed by James Robinson.
     7
     8        * src/WebLayerTreeView.cpp:
     9        (WebKit::WebLayerTreeView::loseCompositorContext):
     10        * src/WebLayerTreeViewImpl.cpp:
     11        (WebKit::WebLayerTreeViewImpl::createContext):
     12        (WebKit::WebLayerTreeViewImpl::didRecreateContext):
     13        * src/WebLayerTreeViewImpl.h:
     14        (WebLayerTreeViewImpl):
     15        * tests/CCLayerTreeHostTest.cpp:
     16        (WTF::MockLayerTreeHostClient::createContext):
     17        (WTF::MockLayerTreeHostClient::didRecreateContext):
     18        * tests/FakeCCLayerTreeHostClient.h:
     19        (WebCore::FakeCCLayerTreeHostClient::createContext):
     20        (WebCore::FakeCCLayerTreeHostClient::didRecreateContext):
     21
    1222012-03-01  Kentaro Hara  <haraken@chromium.org>
    223

  • trunk/Source/WebKit/chromium/src/WebLayerTreeView.cpp

    r108883 r109411  
    153153void WebLayerTreeView::loseCompositorContext(int numTimes)
    154154{
    155     m_private->loseCompositorContext(numTimes);
     155    m_private->loseContext(numTimes);
    156156}
    157157

  • trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp

    r108883 r109411  
    7979}
    8080
    81 PassRefPtr<GraphicsContext3D> WebLayerTreeViewImpl::createLayerTreeHostContext3D()
     81PassRefPtr<GraphicsContext3D> WebLayerTreeViewImpl::createContext()
    8282{
    8383    if (!m_client)
    … …  
    9090}
    9191
    92 void WebLayerTreeViewImpl::didRecreateGraphicsContext(bool success)
     92void WebLayerTreeViewImpl::didRecreateContext(bool success)
    9393{
    9494    if (m_client)

  • trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.h

    r104248 r109411  
    4545    virtual void layout();
    4646    virtual void applyScrollAndScale(const WebCore::IntSize& scrollDelta, float pageScale);
    47     virtual PassRefPtr<WebCore::GraphicsContext3D> createLayerTreeHostContext3D();
    48     virtual void didRecreateGraphicsContext(bool success);
     47    virtual PassRefPtr<WebCore::GraphicsContext3D> createContext();
     48    virtual void didRecreateContext(bool success);
    4949    virtual void didCommitAndDrawFrame();
    5050    virtual void didCompleteSwapBuffers();

  • trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp

    r108880 r109411  
    228228    }
    229229
    230     virtual PassRefPtr<GraphicsContext3D> createLayerTreeHostContext3D()
     230    virtual PassRefPtr<GraphicsContext3D> createContext()
    231231    {
    232232        GraphicsContext3D::Attributes attrs;
    … …  
    246246    }
    247247
    248     virtual void didRecreateGraphicsContext(bool)
     248    virtual void didRecreateContext(bool)
    249249    {
    250250    }

  • trunk/Source/WebKit/chromium/tests/FakeCCLayerTreeHostClient.h

    r106243 r109411  
    3838    virtual void layout() { }
    3939    virtual void applyScrollAndScale(const IntSize& scrollDelta, float pageScale) { }
    40     virtual PassRefPtr<GraphicsContext3D> createLayerTreeHostContext3D()
     40    virtual PassRefPtr<GraphicsContext3D> createContext()
    4141    {
    4242        GraphicsContext3D::Attributes attrs;
    4343        return createCompositorMockGraphicsContext3D(attrs);
    4444    }
    45     virtual void didRecreateGraphicsContext(bool success) { }
     45    virtual void didRecreateContext(bool success) { }
    4646    virtual void didCommitAndDrawFrame() { }
    4747    virtual void didCompleteSwapBuffers() { }
Note: See TracChangeset for help on using the changeset viewer.