ChangeLog

112012-01-04 James Robinson <jamesr@chromium.org>

22

        [chromium] Route all animate calls through CCLayerTreeHost in composited mode to simplify rate limiting logic

        https://bugs.webkit.org/show_bug.cgi?id=75577

        Reviewed by NOBODY (OOPS!).

        This internalizes the animation rate limiting logic to CCLayerTreeHost and removes the setters/getters for the

        m_animating flag. This requires that all animation updates have to go through CCLayerTreeHost to get the right

        rate limiting behavior, regardless of which proxy is being used.

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

        (WebCore::CCLayerTreeHost::updateAnimations):

        (WebCore::CCLayerTreeHost::layout):

        (WebCore::CCLayerTreeHost::startRateLimiter):

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

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

        (WebCore::CCThreadProxy::beginFrameAndCommit):

2012-01-04  James Robinson  <jamesr@chromium.org>

        [chromium] Remove chromium compositor support for unused zoomAnimatorTransform

        https://bugs.webkit.org/show_bug.cgi?id=75585

Source/WebKit/chromium/ChangeLog

112012-01-04 James Robinson <jamesr@chromium.org>

22

        [chromium] Route all animate calls through CCLayerTreeHost in composited mode to simplify rate limiting logic

        https://bugs.webkit.org/show_bug.cgi?id=75577

        Reviewed by NOBODY (OOPS!).

        Routes WebWidget-initiated animate() calls through the CCLayerTreeHost in composited mode. CCLayerTreeHost's

        rate limiting logic needs to be aware of when requestAnimationFrame callbacks are run. In threaded mode, the

        animate calls are driven from CCThreadProxy and so the CCLayerTreeHost can set whatever state it needs. This

        makes the single-threaded mode where the animate calls are driven through the WebWidget interface outside of the

        CCProxy's control.

        This is a small step towards inverting the scheduling control from the WebWidget to the compositor.

        * src/WebViewImpl.cpp:

        (WebKit::WebViewImpl::animate):

        (WebKit::WebViewImpl::updateAnimations):

        * src/WebViewImpl.h:

2012-01-04  James Robinson  <jamesr@chromium.org>

        [chromium] Remove chromium compositor support for unused zoomAnimatorTransform

        https://bugs.webkit.org/show_bug.cgi?id=75585

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

@@void CCLayerTreeHost::deleteContentsTexturesOnImplThread(TextureAllocator* alloc

        m_contentsTextureManager->evictAndDeleteAllTextures(allocator);

}

121 void CCLayerTreeHost::animateA~~ndLayout~~(double frameBeginTime)

121void CCLayerTreeHost::updateAnimations(double frameBeginTime)

122122{

123123 m_animating = true;

124 m_client->animateA~~ndLayout~~(frameBeginTime);

124 m_client->updateAnimations(frameBeginTime);

    m_animating = false;

}

void CCLayerTreeHost::layout()

{

    m_client->layout();

}

void CCLayerTreeHost::beginCommitOnImplThread(CCLayerTreeHostImpl* hostImpl)

{

    ASSERT(CCProxy::isImplThread());

@@void CCLayerTreeHost::applyScrollAndScale(const CCScrollAndScaleSet& info)

void CCLayerTreeHost::startRateLimiter(GraphicsContext3D* context)

{

503 if (animating())

508 if (m_animating)

        return;

    ASSERT(context);

    RateLimiterMap::iterator it = m_rateLimiters.find(context);

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

@@class TextureManager;

class CCLayerTreeHostClient {

public:

56 virtual void animateAndLayout(double frameBeginTime) = 0;

56 virtual void updateAnimations(double frameBeginTime) = 0;

57 virtual void layout() = 0;

    virtual void applyScrollAndScale(const IntSize& scrollDelta, float pageScale) = 0;

    virtual PassRefPtr<GraphicsContext3D> createLayerTreeHostContext3D() = 0;

    virtual void didRecreateGraphicsContext(bool success) = 0;

@@public:

    static bool anyLayerTreeHostInstanceExists();

    // CCLayerTreeHost interface to CCProxy.

124 void animateAndLayout(double frameBeginTime);

125 void updateAnimations(double frameBeginTime);

126 void layout();

    void beginCommitOnImplThread(CCLayerTreeHostImpl*);

    void finishCommitOnImplThread(CCLayerTreeHostImpl*);

    void commitComplete();

@@public:

    void didCompleteSwapBuffers() { m_client->didCompleteSwapBuffers(); }

    void deleteContentsTexturesOnImplThread(TextureAllocator*);

    // CCLayerTreeHost interface to WebView.

    bool animating() const { return m_animating; }

    void setAnimating(bool animating) { m_animating = animating; } // Can be removed when non-threaded scheduling moves inside.

    CCLayerTreeHostClient* client() { return m_client; }

    int compositorIdentifier() const { return m_compositorIdentifier; }

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

@@void CCThreadProxy::beginFrameAndCommit(int sequenceNumber, double frameBeginTim

    // Re-do the commit flow so that we don't send the scrollInfo on the BFAC message.

    m_layerTreeHost->applyScrollAndScale(*scrollInfo);

    // FIXME: recreate the context if it was requested by the impl thread

    {

        TRACE_EVENT("CCLayerTreeHost::animateAndLayout", this, 0);

        m_layerTreeHost->animateAndLayout(frameBeginTime);

    }

    // FIXME: recreate the context if it was requested by the impl thread.

    m_layerTreeHost->updateAnimations(frameBeginTime);

    m_layerTreeHost->layout();

    ASSERT(m_lastExecutedBeginFrameAndCommitSequenceNumber == sequenceNumber);

374 // Clear the commit flag after animateA~~ndL~~ayout here --- objects that only

372 // Clear the commit flag after updating animations and layout here --- objects that only

    // layout when painted will trigger another setNeedsCommit inside

    // updateLayers.

    m_commitRequested = false;

Source/WebKit/chromium/public/platform/WebLayerTreeViewClient.h

@@class WebThread;

class WebLayerTreeViewClient {

public:

    // Updates animation and layout. This is called before the compositing pass

    // so that layers can be updated at the given frame time.

    virtual void animateAndLayout(double frameBeginTime) = 0;

    // Updates animation and layout. These are called before the compositing

    // pass so that layers can be updated at the given frame time.

    virtual void updateAnimations(double frameBeginTime) = 0;

    virtual void layout() = 0;

    // Applies a scroll delta to the root layer, which is bundled with a page

    // scale factor that may apply a CSS transform on the whole document (used

Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp

@@WebLayerTreeViewImpl::~WebLayerTreeViewImpl()

{

}

63 void WebLayerTreeViewImpl::animateA~~ndLayout~~(double frameBeginTime)

63void WebLayerTreeViewImpl::updateAnimations(double frameBeginTime)

6464{

6565 if (m_client)

66 m_client->animateAndLayout(frameBeginTime);

        m_client->updateAnimations(frameBeginTime);

}

void WebLayerTreeViewImpl::layout()

{

    if (m_client)

        m_client->layout();

}

void WebLayerTreeViewImpl::applyScrollAndScale(const WebCore::IntSize& scrollDelta, float pageScale)

Source/WebKit/chromium/src/WebLayerTreeViewImpl.h

@@public:

private:

    WebLayerTreeViewImpl(WebLayerTreeViewClient*, const WebLayerTreeView::Settings&);

    virtual ~WebLayerTreeViewImpl();

44 virtual void animateAndLayout(double frameBeginTime);

44 virtual void updateAnimations(double frameBeginTime);

45 virtual void layout();

    virtual void applyScrollAndScale(const WebCore::IntSize& scrollDelta, float pageScale);

    virtual PassRefPtr<WebCore::GraphicsContext3D> createLayerTreeHostContext3D();

    virtual void didRecreateGraphicsContext(bool success);

Source/WebKit/chromium/src/WebViewImpl.cpp

@@void WebViewImpl::didExitFullScreen()

void WebViewImpl::animate(double frameBeginTime)

{

#if ENABLE(REQUEST_ANIMATION_FRAME)

1131 TRACE_EVENT("WebViewImpl::animate", this, 0);

    // FIXME: remove this zero-check once render_widget has been modified to

    // pass in a frameBeginTime.

    if (!frameBeginTime)

        frameBeginTime = currentTime();

    WebFrameImpl* webframe = mainFrameImpl();

    if (webframe) {

        FrameView* view = webframe->frameView();

        if (view) {

            if (!CCProxy::hasImplThread() && m_layerTreeHost)

                m_layerTreeHost->setAnimating(true);

11421135

1143 view->serviceScriptedAnimations(convertSecondsToDOMTimeStamp(frameBeginTime));

#if USE(ACCELERATED_COMPOSITING)

    // In composited mode, we always go through the compositor so it can apply

    // appropriate flow-control mechanisms.

    if (isAcceleratedCompositingActive())

        m_layerTreeHost->updateAnimations(frameBeginTime);

    else

#endif

        updateAnimations(frameBeginTime);

#endif

}

11441146

            if (!CCProxy::hasImplThread() && m_layerTreeHost)

                m_layerTreeHost->setAnimating(false);

        }

    }

void WebViewImpl::updateAnimations(double frameBeginTime)

{

#if ENABLE(REQUEST_ANIMATION_FRAME)

    TRACE_EVENT("WebViewImpl::updateAnimations", this, 0);

    WebFrameImpl* webframe = mainFrameImpl();

    if (!webframe)

        return;

    FrameView* view = webframe->frameView();

    if (!view)

        return;

    view->serviceScriptedAnimations(convertSecondsToDOMTimeStamp(frameBeginTime));

#endif

}

@@PassRefPtr<GraphicsContext3D> WebViewImpl::createLayerTreeHostContext3D()

    return context;

}

void WebViewImpl::animateAndLayout(double frameBeginTime)

{

    animate(frameBeginTime);

    layout();

}

void WebViewImpl::applyScrollAndScale(const IntSize& scrollDelta, float pageScaleDelta)

{

    if (!mainFrameImpl() || !mainFrameImpl()->frameView())

Source/WebKit/chromium/src/WebViewImpl.h

@@public:

    virtual void willExitFullScreen();

    virtual void didExitFullScreen();

    virtual void animate(double frameBeginTime);

112 // This also implements WebCore::CCLayerTreeHostClient::layout()

    virtual void layout();

    virtual void paint(WebCanvas*, const WebRect&);

    virtual void themeChanged();

@@public:

    virtual void removePageOverlay(WebPageOverlay*);

    // CCLayerTreeHostClient

239 virtual void animateA~~ndLayout~~(double frameBeginTime);

240 virtual void updateAnimations(double frameBeginTime);

    virtual void applyScrollAndScale(const WebCore::IntSize&, float);

    virtual PassRefPtr<WebCore::GraphicsContext3D> createLayerTreeHostContext3D();

    virtual void didCommitAndDrawFrame();

Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp

@@public:

    virtual void commitCompleteOnCCThread(CCLayerTreeHostImpl*) { }

    virtual void drawLayersOnCCThread(CCLayerTreeHostImpl*) { }

    virtual void applyScrollAndScale(const IntSize&, float) { }

62 virtual void animateAndLayout(double frameBeginTime) { }

62 virtual void updateAnimations(double frameBeginTime) { }

63 virtual void layout() { }

};

// Adapts CCLayerTreeHostImpl for test. Runs real code, then invokes test hooks.

@@public:

        return adoptPtr(new MockLayerTreeHostClient(testHooks));

    }

140 virtual void animateA~~ndLayout~~(double frameBeginTime)

141 virtual void updateAnimations(double frameBeginTime)

141142 {

142 m_testHooks->animateAndLayout(frameBeginTime);

        m_testHooks->updateAnimations(frameBeginTime);

    }

    virtual void layout()

    {

        m_testHooks->layout();

    }

    virtual void applyScrollAndScale(const IntSize& scrollDelta, float scale)

@@public:

        postSetNeedsAnimateToMainThread();

    }

699 virtual void animateA~~ndLayout~~(double)

705 virtual void updateAnimations(double)

    {

        if (!m_numAnimates) {

            m_layerTreeHost->setNeedsAnimate();

@@public:

        postSetNeedsCommitToMainThread();

    }

739 virtual void ~~animateAndL~~ayout(~~double frameBeginTime~~)

745 virtual void layout()

    {

        LayerChromium* root = m_layerTreeHost->rootLayer();

        if (!m_layerTreeHost->frameNumber())

Source/WebKit/chromium/tests/LayerChromiumTest.cpp

@@namespace {

class FakeCCLayerTreeHostClient : public CCLayerTreeHostClient {

public:

55 virtual void animateAndLayout(double frameBeginTime) { }

55 virtual void updateAnimations(double frameBeginTime) { }

56 virtual void layout() { }

    virtual void applyScrollAndScale(const IntSize& scrollDelta, float pageScale) { }

    virtual PassRefPtr<GraphicsContext3D> createLayerTreeHostContext3D() { return 0; }

    virtual void didRecreateGraphicsContext(bool success) { }

Source/WebKit/chromium/tests/WebLayerTest.cpp

@@class MockWebLayerTreeViewClient : public WebLayerTreeViewClient {

public:

    MOCK_METHOD0(scheduleComposite, void());

55 virtual void animateAndLayout(double frameBeginTime) { }

55 virtual void updateAnimations(double frameBeginTime) { }

56 virtual void layout() { }

    virtual void applyScrollAndScale(const WebSize& scrollDelta, float scaleFactor) { }

    virtual WebGraphicsContext3D* createContext3D() { return CompositorFakeWebGraphicsContext3D::create(WebGraphicsContext3D::Attributes()).leakPtr(); }

    virtual void didRebindGraphicsContext(bool success) { }