Changeset 113350 in webkit

Timestamp:

Apr 5, 2012, 12:07:29 PM (13 years ago)

Author:

zmo@google.com

Message:

Unreviewed, rolling out r113241.
​http://trac.webkit.org/changeset/113241
​https://bugs.webkit.org/show_bug.cgi?id=83293

Requested by ​sievers@chromium.org (Requested by zhenyao on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-04-05

Source/WebCore:

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

(WebCore::CCLayerTreeHostImpl::canDraw):
(WebCore::CCLayerTreeHostImpl::prepareToDraw):

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

(CCLayerTreeHostImpl):

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

(WebCore::CCThreadProxy::scheduledActionDrawAndSwapInternal):

Source/WebKit/chromium:

• tests/CCLayerTreeHostImplTest.cpp:

(WebKitTests::TEST_F):

• tests/CCLayerTreeHostTest.cpp:

(WTF::CCLayerTreeHostTest::doBeginTest):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (modified) (2 diffs)
• WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h (modified) (2 diffs)
• WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp (modified) (4 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp (modified) (1 diff)
• WebKit/chromium/tests/CCLayerTreeHostTest.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-05  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r113241.
+        http://trac.webkit.org/changeset/113241
+        https://bugs.webkit.org/show_bug.cgi?id=83293
+
+        Requested by sievers@chromium.org (Requested by zhenyao on
+        #webkit).
+
+        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+        (WebCore::CCLayerTreeHostImpl::canDraw):
+        (WebCore::CCLayerTreeHostImpl::prepareToDraw):
+        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
+        (CCLayerTreeHostImpl):
+        * platform/graphics/chromium/cc/CCThreadProxy.cpp:
+        (WebCore::CCThreadProxy::scheduledActionDrawAndSwapInternal):
+
 2012-04-05  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -143 +143 @@
 bool CCLayerTreeHostImpl::canDraw()
 {
-    if (!rootLayer() || rootLayer()->bounds().isEmpty())
+    if (!rootLayer())
         return false;
     if (viewportSize().isEmpty())
@@ -378 +378 @@
     frame.renderSurfaceLayerList.clear();
 
+    if (!rootLayer())
+        return false;
+
     if (!calculateRenderPasses(frame.renderPasses, frame.renderSurfaceLayerList))
         return false;

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

@@ -89 +89 @@
     virtual void commitComplete();
     virtual void animate(double monotonicTime, double wallClockTime);
-    // Returns false if we should try to avoid displaying the frame, because it has visible checkerboard during an animation.
+    // Returns false if problems occured preparing the frame, and we should try to avoid displaying the frame.
     virtual bool prepareToDraw(FrameData&);
     virtual void drawLayers(const FrameData&);
@@ -103 +103 @@
 
     // Implementation
-
-    // Returns false if there is no valid root layer and thus no content that can be drawn.
     bool canDraw();
     GraphicsContext3D* context();

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

@@ -579 +579 @@
     m_layerTreeHostImpl->animate(monotonicTime, wallClockTime);
     CCLayerTreeHostImpl::FrameData frame;
-    bool drawFrame = m_layerTreeHostImpl->canDraw() && (m_layerTreeHostImpl->prepareToDraw(frame) || forcedDraw);
+    bool drawFrame = m_layerTreeHostImpl->prepareToDraw(frame) || forcedDraw;
     if (drawFrame) {
         m_layerTreeHostImpl->drawLayers(frame);
@@ -587 +587 @@
     // Check for a pending compositeAndReadback.
     if (m_readbackRequestOnImplThread) {
-        if (drawFrame)
-            m_layerTreeHostImpl->readback(m_readbackRequestOnImplThread->pixels, m_readbackRequestOnImplThread->rect);
-        m_readbackRequestOnImplThread->success = !m_layerTreeHostImpl->isContextLost() && drawFrame;
+        ASSERT(drawFrame); // This should be a forcedDraw
+        m_layerTreeHostImpl->readback(m_readbackRequestOnImplThread->pixels, m_readbackRequestOnImplThread->rect);
+        m_readbackRequestOnImplThread->success = !m_layerTreeHostImpl->isContextLost();
         m_readbackRequestOnImplThread->completion.signal();
         m_readbackRequestOnImplThread = 0;
@@ -599 +599 @@
     // Process any finish request
     if (m_finishAllRenderingCompletionEventOnImplThread) {
+        ASSERT(drawFrame); // This should be a forcedDraw
         m_layerTreeHostImpl->finishAllRendering();
         m_finishAllRenderingCompletionEventOnImplThread->signal();
@@ -610 +611 @@
     }
 
+    ASSERT(drawFrame || (!drawFrame && !forcedDraw));
     return result;
 }

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-04-05  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r113241.
+        http://trac.webkit.org/changeset/113241
+        https://bugs.webkit.org/show_bug.cgi?id=83293
+
+        Requested by sievers@chromium.org (Requested by zhenyao on
+        #webkit).
+
+        * tests/CCLayerTreeHostImplTest.cpp:
+        (WebKitTests::TEST_F):
+        * tests/CCLayerTreeHostTest.cpp:
+        (WTF::CCLayerTreeHostTest::doBeginTest):
+
 2012-04-05  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -249 +249 @@
 
     OwnPtr<CCLayerImpl> root = CCLayerImpl::create(0);
-    root->setBounds(IntSize(1, 1));
     root->setScrollable(true);
     root->setScrollPosition(IntPoint(0, 0));

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

@@ -535 +535 @@
 
     RefPtr<LayerChromium> rootLayer = LayerChromium::create();
-
-    // Only non-empty root layers will cause drawing to happen.
-    rootLayer->setBounds(IntSize(1, 1));
-
     m_layerTreeHost = MockLayerTreeHost::create(this, m_client.get(), rootLayer, m_settings);
     ASSERT_TRUE(m_layerTreeHost);
@@ -824 +820 @@
 
 TEST_F(CCLayerTreeHostTestSetNeedsRedraw, runMultiThread)
-{
-    runTestThreaded();
-}
-
-// If the root layer has no content bounds, we should see a commit, but should not be
-// pushing any frames as the contents will be undefined. Regardless, forced draws need
-// to always signal completion.
-class CCLayerTreeHostTestEmptyContentsShouldNotDraw : public CCLayerTreeHostTestThreadOnly {
-public:
-    CCLayerTreeHostTestEmptyContentsShouldNotDraw()
-        : m_numCommits(0)
-    {
-    }
-
-    virtual void beginTest()
-    {
-    }
-
-    virtual void drawLayersOnCCThread(CCLayerTreeHostImpl* impl)
-    {
-        // Only the initial draw should bring us here.
-        EXPECT_FALSE(impl->rootLayer()->bounds().isEmpty());
-    }
-
-    virtual void didCommitAndDrawFrame()
-    {
-        m_numCommits++;
-        if (m_numCommits == 1) {
-            // Put an empty root layer.
-            RefPtr<LayerChromium> rootLayer = LayerChromium::create();
-            m_layerTreeHost->setRootLayer(rootLayer);
-
-            OwnArrayPtr<char> pixels(adoptArrayPtr(new char[4]));
-            m_layerTreeHost->compositeAndReadback(static_cast<void*>(pixels.get()), IntRect(0, 0, 1, 1));
-        } else if (m_numCommits == 2) {
-            m_layerTreeHost->setNeedsCommit();
-            m_layerTreeHost->finishAllRendering();
-            endTest();
-        }
-    }
-
-    virtual void afterTest()
-    {
-    }
-
-private:
-    int m_numCommits;
-};
-
-TEST_F(CCLayerTreeHostTestEmptyContentsShouldNotDraw, runMultiThread)
 {
     runTestThreaded();