cc: Remove the software compositing bool from PrepareTextureMailbox

third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp

Index: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp
index 6f67537b926fb7ccafd374d4c73c038d0ac7a91b..ade92c167ffa93f77f1eb8cb5878dc3ff10af438 100644
--- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp
+++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp
@@ -112,6 +112,7 @@ Canvas2DLayerBridge::Canvas2DLayerBridge(std::unique_ptr<WebGraphicsContext3DPro
     , m_size(size)
 {
     DCHECK(m_contextProvider);
+    DCHECK(!m_contextProvider->isSoftwareRendering());
     // Used by browser tests to detect the use of a Canvas2DLayerBridge.
     TRACE_EVENT_INSTANT0("test_gpu", "Canvas2DLayerBridgeCreation", TRACE_EVENT_SCOPE_GLOBAL);
     startRecording();
@@ -762,8 +763,7 @@ bool Canvas2DLayerBridge::restoreSurface()
 
 bool Canvas2DLayerBridge::PrepareTextureMailbox(
     cc::TextureMailbox* outMailbox,
-    std::unique_ptr<cc::SingleReleaseCallback>* outReleaseCallback,
-    bool useSharedMemory)
+    std::unique_ptr<cc::SingleReleaseCallback>* outReleaseCallback)
 {
     if (m_destructionInProgress) {
         // It can be hit in the following sequence.
@@ -780,17 +780,11 @@ bool Canvas2DLayerBridge::PrepareTextureMailbox(
     if ((isHibernating() || m_softwareRenderingWhileHidden) && isHidden())
         return false;
 
-    // TODO(danakj): This means the compositor has dropped to software
-    // compositing. Our context should already be lost if cc can't make a
-    // context that it can use (each time it tries it loses our context).
-    // But checkSurfaceValid() returns true even tho there is a GL error
-    // sometimes.. so not sure if just checking for a GL error is right here
-    // or what.
-    if (useSharedMemory) {
-        // Since we're going to software compositing, this class will soon be
-        // destroyed for software mode canvas.
+    // If the context is lost, we don't know if we should be producing GPU or
+    // software frames, until we get a new context, since the compositor will
+    // be trying to get a new context and may change modes.
+    if (m_contextProvider->contextGL()->GetGraphicsResetStatusKHR() != GL_NO_ERROR)
         return false;

[piman, 2016/08/23 00:52:40]

Nit: this code is dupe of the same right below.

[danakj, 2016/08/23 00:54:44]

Oops thanks, bad merging.

-    }
 
     // If the context is lost, we don't know if we should be producing GPU or
     // software frames, until we get a new context, since the compositor will