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

Changeset 98039 in webkit


Ignore:
Timestamp:
Oct 20, 2011, 4:36:29 PM (15 years ago)
Author:
nduca@chromium.org
Message:

[chromium] Route onSwapBuffersComplete from LayerRenderer to CCScheduler.

Reviewed by James Robinson.

Source/WebCore:

  • platform/graphics/chromium/LayerRendererChromium.cpp:

(WebCore::LayerRendererSwapBuffersCompleteCallbackAdapter::create):
(WebCore::LayerRendererSwapBuffersCompleteCallbackAdapter::~LayerRendererSwapBuffersCompleteCallbackAdapter):
(WebCore::LayerRendererSwapBuffersCompleteCallbackAdapter::onSwapBuffersComplete):
(WebCore::LayerRendererSwapBuffersCompleteCallbackAdapter::LayerRendererSwapBuffersCompleteCallbackAdapter):
(WebCore::LayerRendererChromium::initialize):
(WebCore::LayerRendererChromium::~LayerRendererChromium):
(WebCore::LayerRendererChromium::swapBuffers):
(WebCore::LayerRendererChromium::onSwapBuffersComplete):

  • platform/graphics/chromium/LayerRendererChromium.h:
  • platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp:

(WebCore::CCHeadsUpDisplay::onSwapBuffers):

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

(WebCore::LayerRendererCapabilities::LayerRendererCapabilities):

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

(WebCore::CCLayerTreeHostImpl::swapBuffers):
(WebCore::CCLayerTreeHostImpl::onSwapBuffersComplete):

  • platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
  • platform/graphics/chromium/cc/CCScheduler.cpp:

(WebCore::CCScheduler::requestRedraw):
(WebCore::CCScheduler::didDrawAndSwap):
(WebCore::CCScheduler::didSwapBuffersComplete):
(WebCore::CCScheduler::didSwapBuffersAbort):

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

(WebCore::CCSingleThreadProxy::compositeImmediately):

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

(WebCore::CCSingleThreadProxy::onSwapBuffersCompleteOnImplThread):

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

(WebCore::CCThreadProxySchedulerClient::scheduleDrawAndSwap):
(WebCore::CCThreadProxy::drawLayersAndReadbackOnImplThread):
(WebCore::CCThreadProxy::onSwapBuffersCompleteOnImplThread):
(WebCore::CCThreadProxy::finishAllRenderingOnImplThread):
(WebCore::CCThreadProxy::drawLayersAndSwapOnImplThread):
(WebCore::CCThreadProxy::drawLayersOnImplThread):

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

Source/WebKit/chromium:

  • src/GraphicsContext3DChromium.cpp:

(WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::~GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
(WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
(WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::onSwapBuffersComplete):
(WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::create):
(WebCore::GraphicsContext3DPrivate::setSwapBuffersCompleteCallbackCHROMIUM):

  • src/GraphicsContext3DPrivate.h:
  • tests/CCLayerTreeHostImplTest.cpp:

(WebCore::CCLayerTreeHostImplTest::onSwapBuffersCompleteOnImplThread):

  • tests/CCSchedulerTest.cpp:

(WebCore::CCSchedulerTest::CCSchedulerTest):
(WebCore::TEST_F):

Location:
trunk/Source
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r98033 r98039  
     12011-10-20  Nat Duca  <nduca@chromium.org>
     2
     3        [chromium] Route onSwapBuffersComplete from LayerRenderer to CCScheduler.
     4
     5        Reviewed by James Robinson.
     6
     7        * platform/graphics/chromium/LayerRendererChromium.cpp:
     8        (WebCore::LayerRendererSwapBuffersCompleteCallbackAdapter::create):
     9        (WebCore::LayerRendererSwapBuffersCompleteCallbackAdapter::~LayerRendererSwapBuffersCompleteCallbackAdapter):
     10        (WebCore::LayerRendererSwapBuffersCompleteCallbackAdapter::onSwapBuffersComplete):
     11        (WebCore::LayerRendererSwapBuffersCompleteCallbackAdapter::LayerRendererSwapBuffersCompleteCallbackAdapter):
     12        (WebCore::LayerRendererChromium::initialize):
     13        (WebCore::LayerRendererChromium::~LayerRendererChromium):
     14        (WebCore::LayerRendererChromium::swapBuffers):
     15        (WebCore::LayerRendererChromium::onSwapBuffersComplete):
     16        * platform/graphics/chromium/LayerRendererChromium.h:
     17        * platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp:
     18        (WebCore::CCHeadsUpDisplay::onSwapBuffers):
     19        * platform/graphics/chromium/cc/CCHeadsUpDisplay.h:
     20        * platform/graphics/chromium/cc/CCLayerTreeHost.h:
     21        (WebCore::LayerRendererCapabilities::LayerRendererCapabilities):
     22        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
     23        (WebCore::CCLayerTreeHostImpl::swapBuffers):
     24        (WebCore::CCLayerTreeHostImpl::onSwapBuffersComplete):
     25        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
     26        * platform/graphics/chromium/cc/CCScheduler.cpp:
     27        (WebCore::CCScheduler::requestRedraw):
     28        (WebCore::CCScheduler::didDrawAndSwap):
     29        (WebCore::CCScheduler::didSwapBuffersComplete):
     30        (WebCore::CCScheduler::didSwapBuffersAbort):
     31        * platform/graphics/chromium/cc/CCScheduler.h:
     32        * platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:
     33        (WebCore::CCSingleThreadProxy::compositeImmediately):
     34        * platform/graphics/chromium/cc/CCSingleThreadProxy.h:
     35        (WebCore::CCSingleThreadProxy::onSwapBuffersCompleteOnImplThread):
     36        * platform/graphics/chromium/cc/CCThreadProxy.cpp:
     37        (WebCore::CCThreadProxySchedulerClient::scheduleDrawAndSwap):
     38        (WebCore::CCThreadProxy::drawLayersAndReadbackOnImplThread):
     39        (WebCore::CCThreadProxy::onSwapBuffersCompleteOnImplThread):
     40        (WebCore::CCThreadProxy::finishAllRenderingOnImplThread):
     41        (WebCore::CCThreadProxy::drawLayersAndSwapOnImplThread):
     42        (WebCore::CCThreadProxy::drawLayersOnImplThread):
     43        * platform/graphics/chromium/cc/CCThreadProxy.h:
     44
    1452011-10-20  Julien Chaffraix  <jchaffraix@webkit.org>
    246

  • trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

    r97924 r98039  
    5757#include "cc/CCLayerTreeHostCommon.h"
    5858#include "cc/CCMainThreadTask.h"
     59#include "cc/CCThreadProxy.h"
    5960#if USE(SKIA)
    6061#include "Extensions3D.h"
    … …  
    131132} // anonymous namespace
    132133
     134class LayerRendererSwapBuffersCompleteCallbackAdapter : public Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM {
     135public:
     136    static PassOwnPtr<LayerRendererSwapBuffersCompleteCallbackAdapter> create(LayerRendererChromium* layerRenderer)
     137    {
     138        return adoptPtr(new LayerRendererSwapBuffersCompleteCallbackAdapter(layerRenderer));
     139    }
     140    virtual ~LayerRendererSwapBuffersCompleteCallbackAdapter() { }
     141
     142    virtual void onSwapBuffersComplete()
     143    {
     144        m_layerRenderer->onSwapBuffersComplete();
     145    }
     146
     147private:
     148    explicit LayerRendererSwapBuffersCompleteCallbackAdapter(LayerRendererChromium* layerRenderer)
     149    {
     150        m_layerRenderer = layerRenderer;
     151    }
     152
     153    LayerRendererChromium* m_layerRenderer;
     154};
     155
     156
    133157PassOwnPtr<LayerRendererChromium> LayerRendererChromium::create(CCLayerTreeHostImpl* owner, PassRefPtr<GraphicsContext3D> context)
    134158{
    … …  
    166190        extensions->ensureEnabled("GL_CHROMIUM_map_sub");
    167191
     192    // Use the swapBuffers callback only with the threaded proxy.
     193    if (settings().enableCompositorThread)
     194        m_capabilities.usingSwapCompleteCallback = extensions->supports("GL_CHROMIUM_swapbuffers_complete_callback");
     195    if (m_capabilities.usingSwapCompleteCallback) {
     196        extensions->ensureEnabled("GL_CHROMIUM_swapbuffers_complete_callback");
     197        Extensions3DChromium* extensions3DChromium = static_cast<Extensions3DChromium*>(extensions);
     198        extensions3DChromium->setSwapBuffersCompleteCallbackCHROMIUM(LayerRendererSwapBuffersCompleteCallbackAdapter::create(this));
     199    }
     200
     201    if (extensions->supports("GL_EXT_texture_format_BGRA8888"))
     202        extensions->ensureEnabled("GL_EXT_texture_format_BGRA8888");
     203
    168204    GLC(m_context.get(), m_context->getIntegerv(GraphicsContext3D::MAX_TEXTURE_SIZE, &m_capabilities.maxTextureSize));
    169205    m_capabilities.bestTextureFormat = PlatformColor::bestTextureFormat(m_context.get());
    … …  
    181217LayerRendererChromium::~LayerRendererChromium()
    182218{
    183     ASSERT(CCProxy::isImplThread
    184 ());
     219    ASSERT(CCProxy::isImplThread());
     220    Extensions3DChromium* extensions3DChromium = static_cast<Extensions3DChromium*>(m_context->getExtensions());
     221    extensions3DChromium->setSwapBuffersCompleteCallbackCHROMIUM(nullptr);
    185222    m_headsUpDisplay.clear(); // Explicitly destroy the HUD before the TextureManager dies.
    186223    cleanupSharedObjects();
    … …  
    412449}
    413450
    414 void LayerRendererChromium::present()
    415 {
    416     TRACE_EVENT("LayerRendererChromium::present", this, 0);
     451void LayerRendererChromium::swapBuffers()
     452{
     453    TRACE_EVENT("LayerRendererChromium::swapBuffers", this, 0);
    417454    // We're done! Time to swapbuffers!
    418455
    … …  
    421458    m_context->prepareTexture();
    422459
    423     m_headsUpDisplay->onPresent();
     460    m_headsUpDisplay->onSwapBuffers();
     461}
     462
     463void LayerRendererChromium::onSwapBuffersComplete()
     464{
     465    m_owner->onSwapBuffersComplete();
    424466}
    425467

  • trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h

    r97924 r98039  
    7171class NonCompositedContentHost;
    7272class TrackingTextureAllocator;
     73class LayerRendererSwapBuffersCompleteCallbackAdapter;
    7374
    7475// Class that handles drawing of composited render layers using GL.
    … …  
    104105
    105106    // puts backbuffer onscreen
    106     void present();
     107    void swapBuffers();
    107108
    108109    void setZoomAnimatorTransform(const TransformationMatrix& t) { m_zoomAnimatorTransform = t; }
    … …  
    182183
    183184    void clearRenderSurfacesOnCCLayerImplRecursive(CCLayerImpl*);
     185
     186    friend class LayerRendererSwapBuffersCompleteCallbackAdapter;
     187    void onSwapBuffersComplete();
    184188
    185189    CCLayerTreeHostImpl* m_owner;

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

    r96186 r98039  
    8383}
    8484
    85 void CCHeadsUpDisplay::onPresent()
     85void CCHeadsUpDisplay::onSwapBuffers()
    8686{
    8787    m_currentFrameNumber += 1;

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

    r95901 r98039  
    5454
    5555    void onFrameBegin(double timestamp);
    56     void onPresent();
     56    void onSwapBuffers();
    5757
    5858    bool enabled() const;

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

    r98025 r98039  
    8484        , usingMapSub(false)
    8585        , usingAcceleratedPainting(false)
     86        , usingSwapCompleteCallback(false)
    8687        , maxTextureSize(0) { }
    8788
    … …  
    8990    bool usingMapSub;
    9091    bool usingAcceleratedPainting;
     92    bool usingSwapCompleteCallback;
    9193    int maxTextureSize;
    9294};

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

    r98025 r98039  
    105105}
    106106
    107 void CCLayerTreeHostImpl::present()
     107void CCLayerTreeHostImpl::swapBuffers()
    108108{
    109109    ASSERT(m_layerRenderer && !isContextLost());
    110     m_layerRenderer->present();
     110    m_layerRenderer->swapBuffers();
     111}
     112
     113void CCLayerTreeHostImpl::onSwapBuffersComplete()
     114{
     115    m_client->onSwapBuffersCompleteOnImplThread();
    111116}
    112117

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

    r98025 r98039  
    4747class CCLayerTreeHostImplClient {
    4848public:
     49    virtual void onSwapBuffersCompleteOnImplThread() = 0;
    4950    virtual void setNeedsRedrawOnImplThread() = 0;
    5051    virtual void setNeedsCommitOnImplThread() = 0;
    … …  
    7778    TextureAllocator* contentsTextureAllocator() const;
    7879
    79     void present();
     80    void swapBuffers();
     81    void onSwapBuffersComplete();
    8082
    8183    void readback(void* pixels, const IntRect&);

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

    r97922 r98039  
    5959    m_redrawPending = true;
    6060
    61     m_client->scheduleDrawAndPresent();
     61    m_client->scheduleDrawAndSwap();
    6262}
    6363
    … …  
    6767}
    6868
    69 void CCScheduler::didDraw()
     69void CCScheduler::didDrawAndSwap()
    7070{
    7171    m_redrawPending = false;
    7272}
    7373
     74void CCScheduler::didSwapBuffersComplete()
     75{
    7476}
     77
     78void CCScheduler::didSwapBuffersAbort()
     79{
     80}
     81
     82}

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

    r97922 r98039  
    3636public:
    3737    virtual void scheduleBeginFrameAndCommit() = 0;
    38     virtual void scheduleDrawAndPresent() = 0;
     38    virtual void scheduleDrawAndSwap() = 0;
    3939
    4040protected:
    … …  
    5555
    5656    void didCommit();
    57     void didDraw();
     57    void didDrawAndSwap();
     58    void didSwapBuffersComplete();
     59    void didSwapBuffersAbort();
    5860
    5961    bool commitPending() const { return m_commitPending; }

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

    r98025 r98039  
    199199
    200200    if (doComposite())
    201         m_layerTreeHostImpl->present();
     201        m_layerTreeHostImpl->swapBuffers();
    202202}
    203203

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

    r98025 r98039  
    5757
    5858    // CCLayerTreeHostImplClient implementation
     59    virtual void onSwapBuffersCompleteOnImplThread() { ASSERT_NOT_REACHED(); }
    5960    virtual void setNeedsRedrawOnImplThread() { m_layerTreeHost->setNeedsCommitThenRedraw(); }
    6061    virtual void setNeedsCommitOnImplThread() { m_layerTreeHost->setNeedsCommitThenRedraw(); }

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

    r98025 r98039  
    6666    }
    6767
    68     virtual void scheduleDrawAndPresent()
    69     {
    70         m_proxy->drawLayersAndPresentOnImplThread();
     68    virtual void scheduleDrawAndSwap()
     69    {
     70        m_proxy->drawLayersAndSwapOnImplThread();
    7171    }
    7272
    … …  
    147147    drawLayersOnImplThread();
    148148    m_layerTreeHostImpl->readback(pixels, rect);
    149     *success = m_layerTreeHostImpl->isContextLost();
     149    bool lost = m_layerTreeHostImpl->isContextLost();
     150    if (lost)
     151        m_schedulerOnImplThread->didSwapBuffersAbort();
     152    *success = !lost;
    150153    completion->signal();
    151154}
    … …  
    253256}
    254257
     258void CCThreadProxy::onSwapBuffersCompleteOnImplThread()
     259{
     260    ASSERT(isImplThread());
     261    TRACE_EVENT("CCThreadProxy::onSwapBuffersCompleteOnImplThread", this, 0);
     262    m_schedulerOnImplThread->didSwapBuffersComplete();
     263}
     264
    255265void CCThreadProxy::setNeedsCommitOnImplThread()
    256266{
    … …  
    310320    if (m_schedulerOnImplThread->redrawPending()) {
    311321        drawLayersOnImplThread();
    312         m_layerTreeHostImpl->present();
    313         m_schedulerOnImplThread->didDraw();
     322        m_layerTreeHostImpl->swapBuffers();
     323        m_schedulerOnImplThread->didDrawAndSwap();
    314324    }
    315325    m_layerTreeHostImpl->finishAllRendering();
    … …  
    418428}
    419429
    420 void CCThreadProxy::drawLayersAndPresentOnImplThread()
     430void CCThreadProxy::drawLayersAndSwapOnImplThread()
     431{
     432    TRACE_EVENT("CCThreadProxy::drawLayersAndSwapOnImplThread", this, 0);
     433    ASSERT(isImplThread());
     434    if (!m_layerTreeHostImpl)
     435        return;
     436
     437    drawLayersOnImplThread();
     438    m_layerTreeHostImpl->swapBuffers();
     439    m_schedulerOnImplThread->didDrawAndSwap();
     440}
     441
     442void CCThreadProxy::drawLayersOnImplThread()
    421443{
    422444    TRACE_EVENT("CCThreadProxy::drawLayersOnImplThread", this, 0);
    423445    ASSERT(isImplThread());
    424     if (!m_layerTreeHostImpl)
    425         return;
    426 
    427     drawLayersOnImplThread();
    428     m_layerTreeHostImpl->present();
    429     m_schedulerOnImplThread->didDraw();
    430 }
    431 
    432 void CCThreadProxy::drawLayersOnImplThread()
    433 {
    434     TRACE_EVENT("CCThreadProxy::drawLayersOnImplThread", this, 0);
    435     ASSERT(isImplThread());
    436446    ASSERT(m_layerTreeHostImpl);
    437447
    438448    m_layerTreeHostImpl->drawLayers();
     449    // FIXME: handle case where m_layerTreeHostImpl->isContextLost.
     450    // FIXME: pass didSwapBuffersAbort if m_layerTreeHostImpl->isContextLost.
    439451    ASSERT(!m_layerTreeHostImpl->isContextLost());
    440452}

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

    r98025 r98039  
    6767
    6868    // CCLayerTreeHostImplClient implementation
     69    virtual void onSwapBuffersCompleteOnImplThread();
    6970    virtual void setNeedsRedrawOnImplThread();
    7071    virtual void setNeedsCommitOnImplThread();
    … …  
    8182    void obtainBeginFrameAndCommitTaskFromCCThread(CCCompletionEvent*, CCMainThread::Task**);
    8283    void commitOnImplThread(CCCompletionEvent*);
    83     void drawLayersAndPresentOnImplThread();
     84    void drawLayersAndSwapOnImplThread();
    8485    void drawLayersOnImplThread();
    8586    void drawLayersAndReadbackOnImplThread(CCCompletionEvent*, bool* success, void* pixels, const IntRect&);

  • trunk/Source/WebKit/chromium/ChangeLog

    r98036 r98039  
     12011-10-20  Nat Duca  <nduca@chromium.org>
     2
     3        [chromium] Route onSwapBuffersComplete from LayerRenderer to CCScheduler.
     4
     5        Reviewed by James Robinson.
     6
     7        * src/GraphicsContext3DChromium.cpp:
     8        (WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::~GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
     9        (WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
     10        (WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::onSwapBuffersComplete):
     11        (WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::create):
     12        (WebCore::GraphicsContext3DPrivate::setSwapBuffersCompleteCallbackCHROMIUM):
     13        * src/GraphicsContext3DPrivate.h:
     14        * tests/CCLayerTreeHostImplTest.cpp:
     15        (WebCore::CCLayerTreeHostImplTest::onSwapBuffersCompleteOnImplThread):
     16        * tests/CCSchedulerTest.cpp:
     17        (WebCore::CCSchedulerTest::CCSchedulerTest):
     18        (WebCore::TEST_F):
     19
    1202011-10-20  Michal Mocny  <mmocny@google.com>
    221

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

    r97896 r98039  
    12761276}
    12771277
    1278 class SwapBuffersCompleteCallbackAdapter : public WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM {
     1278class GraphicsContext3DSwapBuffersCompleteCallbackAdapter : public WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM {
    12791279public:
    12801280    virtual void onSwapBuffersComplete();
    1281     static PassOwnPtr<SwapBuffersCompleteCallbackAdapter> create(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM>);
    1282     virtual ~SwapBuffersCompleteCallbackAdapter() { }
     1281    static PassOwnPtr<GraphicsContext3DSwapBuffersCompleteCallbackAdapter> create(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM>);
     1282    virtual ~GraphicsContext3DSwapBuffersCompleteCallbackAdapter() { }
     1283
    12831284private:
    1284     SwapBuffersCompleteCallbackAdapter(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> cb) : m_swapBuffersCompleteCallback(cb) { }
     1285    GraphicsContext3DSwapBuffersCompleteCallbackAdapter(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> cb) : m_swapBuffersCompleteCallback(cb) { }
    12851286    OwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> m_swapBuffersCompleteCallback;
    12861287};
    12871288
    1288 void SwapBuffersCompleteCallbackAdapter::onSwapBuffersComplete()
     1289void GraphicsContext3DSwapBuffersCompleteCallbackAdapter::onSwapBuffersComplete()
    12891290{
    12901291    if (m_swapBuffersCompleteCallback)
    … …  
    12921293}
    12931294
    1294 PassOwnPtr<SwapBuffersCompleteCallbackAdapter> SwapBuffersCompleteCallbackAdapter::create(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> cb)
    1295 {
    1296     return adoptPtr(cb.get() ? new SwapBuffersCompleteCallbackAdapter(cb) : 0);
     1295PassOwnPtr<GraphicsContext3DSwapBuffersCompleteCallbackAdapter> GraphicsContext3DSwapBuffersCompleteCallbackAdapter::create(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> cb)
     1296{
     1297    return adoptPtr(cb.get() ? new GraphicsContext3DSwapBuffersCompleteCallbackAdapter(cb) : 0);
    12971298}
    12981299
    12991300void GraphicsContext3DPrivate::setSwapBuffersCompleteCallbackCHROMIUM(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> cb)
    13001301{
    1301     m_swapBuffersCompleteCallbackAdapter = SwapBuffersCompleteCallbackAdapter::create(cb);
     1302    m_swapBuffersCompleteCallbackAdapter = GraphicsContext3DSwapBuffersCompleteCallbackAdapter::create(cb);
    13021303    m_impl->setSwapBuffersCompleteCallbackCHROMIUM(m_swapBuffersCompleteCallbackAdapter.get());
    13031304}

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

    r97896 r98039  
    5252#endif
    5353class GraphicsContextLostCallbackAdapter;
    54 class SwapBuffersCompleteCallbackAdapter;
     54class GraphicsContext3DSwapBuffersCompleteCallbackAdapter;
    5555
    5656class GraphicsContext3DPrivate {
    … …  
    313313    OwnPtr<Extensions3DChromium> m_extensions;
    314314    OwnPtr<GraphicsContextLostCallbackAdapter> m_contextLostCallbackAdapter;
    315     OwnPtr<SwapBuffersCompleteCallbackAdapter> m_swapBuffersCompleteCallbackAdapter;
     315    OwnPtr<GraphicsContext3DSwapBuffersCompleteCallbackAdapter> m_swapBuffersCompleteCallbackAdapter;
    316316    WebKit::WebViewImpl* m_webViewImpl;
    317317    bool m_initializedAvailableExtensions;

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

    r98025 r98039  
    4545    }
    4646
     47    virtual void onSwapBuffersCompleteOnImplThread() { }
    4748    virtual void setNeedsRedrawOnImplThread() { m_didRequestRedraw = true; }
    4849    virtual void setNeedsCommitOnImplThread() { m_didRequestCommit = true; }

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

    r96655 r98039  
    3939public:
    4040    MOCK_METHOD0(scheduleBeginFrameAndCommit, void());
    41     MOCK_METHOD0(scheduleDrawAndPresent, void());
     41    MOCK_METHOD0(scheduleDrawAndSwap, void());
    4242};
    4343
    … …  
    4949    {
    5050        EXPECT_CALL(*m_client, scheduleBeginFrameAndCommit()).Times(0);
    51         EXPECT_CALL(*m_client, scheduleDrawAndPresent()).Times(0);
     51        EXPECT_CALL(*m_client, scheduleDrawAndSwap()).Times(0);
    5252    }
    5353
    … …  
    7676TEST_F(CCSchedulerTest, RequestRedraw)
    7777{
    78     EXPECT_CALL(*m_client, scheduleDrawAndPresent()).Times(1);
     78    EXPECT_CALL(*m_client, scheduleDrawAndSwap()).Times(1);
    7979    m_scheduler->requestRedraw();
    8080}
    8181
    8282}
    83 
Note: See TracChangeset for help on using the changeset viewer.