cc: Remove the software compositing bool from PrepareTextureMailbox

third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.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 164 matching lines @@
         bridge->canvas()->drawRect(SkRect::MakeXYWH(0, 0, 1, 1), paint);
         EXPECT_EQ(genID, bridge->getOrCreateSurface()->generationID());
         // This results in the internal surface being torn down in response to the context loss.
         EXPECT_FALSE(bridge->checkSurfaceValid());
         EXPECT_EQ(nullptr, bridge->getOrCreateSurface());
         // The following passes by not crashing
         bridge->canvas()->drawRect(SkRect::MakeXYWH(0, 0, 1, 1), paint);
         bridge->flush();
     }
 
-    void prepareMailboxSoftwareTest()
+    void prepareMailboxWhenContextIsLost()
     {
         FakeGLES2Interface gl;
         std::unique_ptr<FakeWebGraphicsContext3DProvider> contextProvider = wrapUnique(new FakeWebGraphicsContext3DProvider(&gl));
         Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(std::move(contextProvider), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::ForceAccelerationForTesting)));
 
+        // TODO(junov): The PrepareTextureMailbox() method will fail a DCHECK if we don't
+        // do this before calling it the first time when the context is lost.
+        bridge->prepareSurfaceForPaintingIfNeeded();
+
+        // When the context is lost we are not sure if we should be producing GL frames for the
+        // compositor still or not, so fail to generate frames.
+        gl.setIsContextLost(true);
+
         cc::TextureMailbox textureMailbox;
         std::unique_ptr<cc::SingleReleaseCallback> releaseCallback;
-        bool useSharedMemory = true;
-        EXPECT_FALSE(bridge->PrepareTextureMailbox(&textureMailbox, &releaseCallback, useSharedMemory));
+        EXPECT_FALSE(bridge->PrepareTextureMailbox(&textureMailbox, &releaseCallback));
     }
 
     void prepareMailboxAndLoseResourceTest()
     {
         // Prepare a mailbox, then report the resource as lost.
         // This test passes by not crashing and not triggering assertions.
         {
             FakeGLES2Interface gl;
             std::unique_ptr<FakeWebGraphicsContext3DProvider> contextProvider = wrapUnique(new FakeWebGraphicsContext3DProvider(&gl));
             Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(std::move(contextProvider), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::ForceAccelerationForTesting)));
 
             cc::TextureMailbox textureMailbox;
             std::unique_ptr<cc::SingleReleaseCallback> releaseCallback;
-            bool useSharedMemory = false;
-            EXPECT_TRUE(bridge->PrepareTextureMailbox(&textureMailbox, &releaseCallback, useSharedMemory));
+            EXPECT_TRUE(bridge->PrepareTextureMailbox(&textureMailbox, &releaseCallback));
 
             bool lostResource = true;
             releaseCallback->Run(gpu::SyncToken(), lostResource);
         }
 
         // Retry with mailbox released while bridge destruction is in progress.
         {
             FakeGLES2Interface gl;
             std::unique_ptr<FakeWebGraphicsContext3DProvider> contextProvider = wrapUnique(new FakeWebGraphicsContext3DProvider(&gl));
 
             cc::TextureMailbox textureMailbox;
             std::unique_ptr<cc::SingleReleaseCallback> releaseCallback;
-            bool useSharedMemory = false;
 
             {
                 Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(std::move(contextProvider), IntSize(300, 150), 0, NonOpaque, Canvas2DLayerBridge::ForceAccelerationForTesting)));
-                bridge->PrepareTextureMailbox(&textureMailbox, &releaseCallback, useSharedMemory);
+                bridge->PrepareTextureMailbox(&textureMailbox, &releaseCallback);
                 // |bridge| goes out of scope and would normally be destroyed, but object is kept alive by self references.
             }
 
             // Before fixing crbug.com/411864, the following line you cause a memory use after free
             // that sometimes causes a crash in normal builds and crashes consistently with ASAN.
             // This should cause the bridge to be destroyed.
             bool lostResource = true;
             releaseCallback->Run(gpu::SyncToken(), lostResource);
         }
     }
@@ skipping 27 matching lines @@
 TEST_F(Canvas2DLayerBridgeTest, FullLifecycleSingleThreaded)
 {
     fullLifecycleTest();
 }
 
 TEST_F(Canvas2DLayerBridgeTest, NoDrawOnContextLost)
 {
     noDrawOnContextLostTest();
 }
 
-TEST_F(Canvas2DLayerBridgeTest, PrepareMailboxSoftware)
+TEST_F(Canvas2DLayerBridgeTest, PrepareMailboxWhenContextIsLost)
 {
-    prepareMailboxSoftwareTest();
+    prepareMailboxWhenContextIsLost();
 }
 
 TEST_F(Canvas2DLayerBridgeTest, PrepareMailboxAndLoseResource)
 {
     prepareMailboxAndLoseResourceTest();
 }
 
 TEST_F(Canvas2DLayerBridgeTest, AccelerationHint)
 {
     accelerationHintTest();
@@ skipping 711 matching lines @@
     EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
     EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
         .WillOnce(testing::Invoke(hibernationStartedEvent.get(), &WaitableEvent::signal));
     postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
     hibernationStartedEvent->wait();
     ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
 
     // Test prepareMailbox while hibernating
     cc::TextureMailbox textureMailbox;
     std::unique_ptr<cc::SingleReleaseCallback> releaseCallback;
-    bool useSharedMemory = false;
-    EXPECT_FALSE(bridge->PrepareTextureMailbox(&textureMailbox, &releaseCallback, useSharedMemory));
+    EXPECT_FALSE(bridge->PrepareTextureMailbox(&textureMailbox, &releaseCallback));
     EXPECT_TRUE(bridge->checkSurfaceValid());
 
     // Tear down the bridge on the thread so that 'bridge' can go out of scope
     // without crashing due to thread checks
     EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(Canvas2DLayerBridge::HibernationEndedWithTeardown));
     postAndWaitDestroyBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge);
 }
 
 #if CANVAS2D_HIBERNATION_ENABLED && CANVAS2D_BACKGROUND_RENDER_SWITCH_TO_CPU
 TEST_F(Canvas2DLayerBridgeTest, PrepareMailboxWhileBackgroundRendering)
@@ skipping 27 matching lines @@
     EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(Canvas2DLayerBridge::HibernationEndedWithSwitchToBackgroundRendering));
     postAndWaitRenderingTask(BLINK_FROM_HERE, testThread.get(), bridge.get());
     ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
     EXPECT_FALSE(bridge->isAccelerated());
     EXPECT_FALSE(bridge->isHibernating());
     EXPECT_TRUE(bridge->checkSurfaceValid());
 
     // Test prepareMailbox while background rendering
     cc::TextureMailbox textureMailbox;
     std::unique_ptr<cc::SingleReleaseCallback> releaseCallback;
-    bool useSharedMemory = false;
-    EXPECT_FALSE(bridge->PrepareTextureMailbox(&textureMailbox, &releaseCallback, useSharedMemory));
+    EXPECT_FALSE(bridge->PrepareTextureMailbox(&textureMailbox, &releaseCallback));
     EXPECT_TRUE(bridge->checkSurfaceValid());
 
     // Tear down the bridge on the thread so that 'bridge' can go out of scope
     // without crashing due to thread checks
     postAndWaitDestroyBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge);
 }
 
 } // namespace blink