Merge 118276 - [chromium] Enable the CCLayerTreeHostTestCanDrawBlocksDrawing test in single-threade…

Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 55 matching lines @@
     virtual void beginCommitOnCCThread(CCLayerTreeHostImpl*) { }
     virtual void commitCompleteOnCCThread(CCLayerTreeHostImpl*) { }
     virtual void prepareToDrawOnCCThread(CCLayerTreeHostImpl*) { }
     virtual void drawLayersOnCCThread(CCLayerTreeHostImpl*) { }
     virtual void animateLayers(CCLayerTreeHostImpl*, double monotonicTime) { }
     virtual void willAnimateLayers(CCLayerTreeHostImpl*, double monotonicTime) { }
     virtual void applyScrollAndScale(const IntSize&, float) { }
     virtual void updateAnimations(double monotonicTime) { }
     virtual void layout() { }
     virtual void didRecreateContext(bool succeded) { }
+    virtual void didCommit() { }
     virtual void didCommitAndDrawFrame() { }
 
     // Implementation of CCLayerAnimationDelegate
     virtual void notifyAnimationStarted(double time) { }
     virtual void notifyAnimationFinished(double time) { }
 };
 
 // Adapts CCLayerTreeHostImpl for test. Runs real code, then invokes test hooks.
 class MockLayerTreeHostImpl : public CCLayerTreeHostImpl {
 public:
@@ skipping 163 matching lines @@
         GraphicsContext3D::Attributes attrs;
         WebGraphicsContext3D::Attributes webAttrs;
         webAttrs.alpha = attrs.alpha;
 
         OwnPtr<WebGraphicsContext3D> webContext = CompositorFakeWebGraphicsContext3DWithTextureTracking::create(webAttrs);
         return GraphicsContext3DPrivate::createGraphicsContextFromWebContext(webContext.release(), GraphicsContext3D::RenderDirectlyToHostWindow);
     }
 
     virtual void didCommit() OVERRIDE
     {
+        m_testHooks->didCommit();
     }
 
     virtual void didCommitAndDrawFrame() OVERRIDE
     {
         m_testHooks->didCommitAndDrawFrame();
     }
 
     virtual void didCompleteSwapBuffers() OVERRIDE
     {
     }
@@ skipping 565 matching lines @@
     int m_numCommits;
     int m_numDraws;
 };
 
 TEST_F(CCLayerTreeHostTestSetNeedsRedraw, runMultiThread)
 {
     runTestThreaded();
 }
 
 // If the layerTreeHost says it can't draw, then we should not try to draw.
-// FIXME: Make this run in single threaded mode too. http://crbug.com/127481
 class CCLayerTreeHostTestCanDrawBlocksDrawing : public CCLayerTreeHostTestThreadOnly {
 public:
     CCLayerTreeHostTestCanDrawBlocksDrawing()
         : m_numCommits(0)
     {
     }
 
     virtual void beginTest()
     {
     }
 
     virtual void drawLayersOnCCThread(CCLayerTreeHostImpl* impl)
     {
         // Only the initial draw should bring us here.
         EXPECT_TRUE(impl->canDraw());
         EXPECT_EQ(0, impl->sourceFrameNumber());
     }
 
     virtual void commitCompleteOnCCThread(CCLayerTreeHostImpl* impl)
     {
         if (m_numCommits >= 1) {
             // After the first commit, we should not be able to draw.
             EXPECT_FALSE(impl->canDraw());
         }
     }
 
-    virtual void didCommitAndDrawFrame()
+    virtual void didCommit()
     {
         m_numCommits++;
         if (m_numCommits == 1) {
             // Make the viewport empty so the host says it can't draw.
             m_layerTreeHost->setViewportSize(IntSize(0, 0));
 
             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->setNeedsRedraw();
             m_layerTreeHost->setNeedsCommit();
-            m_layerTreeHost->finishAllRendering();
+        } else
             endTest();
-        }
     }
 
     virtual void afterTest()
     {
     }
 
 private:
     int m_numCommits;
 };
 
-TEST_F(CCLayerTreeHostTestCanDrawBlocksDrawing, runMultiThread)
-{
-    runTestThreaded();
-}
+SINGLE_AND_MULTI_THREAD_TEST_F(CCLayerTreeHostTestCanDrawBlocksDrawing)
 
 // beginLayerWrite should prevent draws from executing until a commit occurs
 class CCLayerTreeHostTestWriteLayersRedraw : public CCLayerTreeHostTestThreadOnly {
 public:
     CCLayerTreeHostTestWriteLayersRedraw()
         : m_numCommits(0)
         , m_numDraws(0)
     {
     }
 
@@ skipping 1583 matching lines @@
 private:
     FloatSize m_scrollAmount;
 };
 
 TEST_F(CCLayerTreeHostTestFractionalScroll, runMultiThread)
 {
     runTestThreaded();
 }
 
 } // namespace