Merge 112568 - [chromium] Ensure framebuffer exists at the start of beginDrawingFrame.

Source/WebKit/chromium/tests/LayerRendererChromiumTest.cpp

 /*
  * Copyright (C) 2012 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 45 matching lines @@
     int frameCount() { return m_frame; }
     void setMemoryAllocation(WebGraphicsMemoryAllocation allocation) { m_memoryAllocationChangedCallback->onMemoryAllocationChanged(allocation); }
 
 private:
     int m_frame;
     WebGraphicsMemoryAllocationChangedCallbackCHROMIUM* m_memoryAllocationChangedCallback;
 };
 
 class FakeLayerRendererChromiumClient : public LayerRendererChromiumClient {
 public:
-    FakeLayerRendererChromiumClient() : m_setFullRootLayerDamageCount(0) { }
+    FakeLayerRendererChromiumClient()
+        : m_setFullRootLayerDamageCount(0)
+        , m_rootLayer(CCLayerImpl::create(1))
+    {
+    }
 
     // LayerRendererChromiumClient methods.
     virtual const IntSize& viewportSize() const { static IntSize fakeSize; return fakeSize; }
     virtual const CCSettings& settings() const { static CCSettings fakeSettings; return fakeSettings; }
-    virtual CCLayerImpl* rootLayer() { return 0; }
-    virtual const CCLayerImpl* rootLayer() const { return 0; }
+    virtual CCLayerImpl* rootLayer() { return m_rootLayer.get(); }
+    virtual const CCLayerImpl* rootLayer() const { return m_rootLayer.get(); }
     virtual void didLoseContext() { }
     virtual void onSwapBuffersComplete() { }
     virtual void setFullRootLayerDamage() { m_setFullRootLayerDamageCount++; }
 
     // Methods added for test.
     int setFullRootLayerDamageCount() const { return m_setFullRootLayerDamageCount; }
 
 private:
     int m_setFullRootLayerDamageCount;
     DebugScopedSetImplThread m_implThread;
+    OwnPtr<CCLayerImpl> m_rootLayer;
 };
 
 class FakeLayerRendererChromium : public LayerRendererChromium {
 public:
     FakeLayerRendererChromium(LayerRendererChromiumClient* client, PassRefPtr<GraphicsContext3D> context) : LayerRendererChromium(client, context) { }
 
     // LayerRendererChromium methods.
 
     // Changing visibility to public.
     using LayerRendererChromium::initialize;
+    using LayerRendererChromium::isFramebufferDiscarded;
 };
 
 class LayerRendererChromiumTest : public testing::Test {
 protected:
     LayerRendererChromiumTest()
         : m_suggestHaveBackbufferYes(1, true)
         , m_suggestHaveBackbufferNo(1, false)
         , m_context(GraphicsContext3DPrivate::createGraphicsContextFromWebContext(adoptPtr(new FrameCountingMemoryAllocationSettingContext()), GraphicsContext3D::RenderDirectlyToHostWindow))
         , m_mockContext(*static_cast<FrameCountingMemoryAllocationSettingContext*>(GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_context.get())))
         , m_layerRendererChromium(&m_mockClient, m_context.release())
@@ skipping 68 matching lines @@
     swapBuffers();
     EXPECT_EQ(0, m_mockContext.frameCount());
     EXPECT_EQ(2, m_mockClient.setFullRootLayerDamageCount());
     
     swapBuffers();
     EXPECT_EQ(0, m_mockContext.frameCount());
     EXPECT_EQ(3, m_mockClient.setFullRootLayerDamageCount());
 }
 
 // Test LayerRendererChromium discardFramebuffer functionality:
-// Discard framebuffer, then set visibility to true.
-// Expected: recreates the framebuffer.
-TEST_F(LayerRendererChromiumTest, SetVisibilityTrueShouldRecreateBackbuffer)
-{
-    m_mockContext.setMemoryAllocation(m_suggestHaveBackbufferNo);
-    EXPECT_TRUE(m_layerRendererChromium.isFramebufferDiscarded());
-
-    m_layerRendererChromium.setVisible(true);
-    EXPECT_FALSE(m_layerRendererChromium.isFramebufferDiscarded());
-}
-
-// Test LayerRendererChromium discardFramebuffer functionality:
-// Create a ScopedEnsureFramebufferAllocation while a framebuffer was discarded and then swapBuffers.
-// Expected: will recreate framebuffer scope duration, during which swaps will work fine, and discard on scope exit.
+// Begin drawing a frame while a framebuffer is discarded.
+// Expected: will recreate framebuffer.
 TEST_F(LayerRendererChromiumTest, DiscardedBackbufferIsRecreatredForScopeDuration)
 {
     m_mockContext.setMemoryAllocation(m_suggestHaveBackbufferNo);
     EXPECT_TRUE(m_layerRendererChromium.isFramebufferDiscarded());
     EXPECT_EQ(1, m_mockClient.setFullRootLayerDamageCount());
-    {
-        ScopedEnsureFramebufferAllocation ensureFramebuffer(&m_layerRendererChromium);
-        EXPECT_FALSE(m_layerRendererChromium.isFramebufferDiscarded());
 
-        swapBuffers();
-        EXPECT_EQ(1, m_mockContext.frameCount());
-    }
-    EXPECT_TRUE(m_layerRendererChromium.isFramebufferDiscarded());
-    EXPECT_EQ(2, m_mockClient.setFullRootLayerDamageCount());
+    m_layerRendererChromium.beginDrawingFrame();
+    EXPECT_FALSE(m_layerRendererChromium.isFramebufferDiscarded());
+
+    swapBuffers();
+    EXPECT_EQ(1, m_mockContext.frameCount());
 }
-
-// Test LayerRendererChromium discardFramebuffer functionality:
-// Create a ScopedEnsureFramebufferAllocation while a framebuffer was not discarded and then swapBuffers.
-// Expected: will have no effect.
-TEST_F(LayerRendererChromiumTest, EnsuringBackbufferForScopeDurationDoesNothingIfAlreadyExists)
-{
-    EXPECT_FALSE(m_layerRendererChromium.isFramebufferDiscarded());
-    EXPECT_EQ(0, m_mockClient.setFullRootLayerDamageCount());
-    {
-        ScopedEnsureFramebufferAllocation ensureFramebuffer(&m_layerRendererChromium);
-        EXPECT_FALSE(m_layerRendererChromium.isFramebufferDiscarded());
-        EXPECT_EQ(0, m_mockClient.setFullRootLayerDamageCount());
-
-        swapBuffers();
-        EXPECT_EQ(1, m_mockContext.frameCount());
-    }
-    EXPECT_FALSE(m_layerRendererChromium.isFramebufferDiscarded());
-    EXPECT_EQ(0, m_mockClient.setFullRootLayerDamageCount());
-}