cc: Remove the software compositing bool from PrepareTextureMailbox

third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.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
@@ skipping 94 matching lines @@
     , m_isRegisteredTaskObserver(false)
     , m_renderingTaskCompletedForCurrentFrame(false)
     , m_softwareRenderingWhileHidden(false)
     , m_lastImageId(0)
     , m_lastFilter(GL_LINEAR)
     , m_accelerationMode(accelerationMode)
     , m_opacityMode(opacityMode)
     , 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();
 }
 
 Canvas2DLayerBridge::~Canvas2DLayerBridge()
 {
     DCHECK(m_destructionInProgress);
 #if USE_IOSURFACE_FOR_2D_CANVAS
     clearCHROMIUMImageCache();
@@ skipping 630 matching lines @@
         }
     }
     if (m_imageBuffer)
         m_imageBuffer->updateGPUMemoryUsage();
 
     return m_surface.get();
 }
 
 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.
         // 1. Canvas draws something.
         // 2. The compositor begins the frame.
         // 3. Javascript makes a context be lost.
         // 4. Here.
         return false;
     }
     DCHECK(isAccelerated() || isHibernating() || m_softwareRenderingWhileHidden);
 
     // if hibernating but not hidden, we want to wake up from
     // hibernation
     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.
-        return false;
-    }
-
     // 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;
 
     RefPtr<SkImage> image = newImageSnapshot(PreferAcceleration, SnapshotReasonUnknown);
     if (!image || !image->getTexture())
         return false;
 
@@ skipping 192 matching lines @@
 Canvas2DLayerBridge::MailboxInfo::MailboxInfo() = default;
 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other) = default;
 
 void Canvas2DLayerBridge::Logger::reportHibernationEvent(HibernationEvent event)
 {
     DEFINE_STATIC_LOCAL(EnumerationHistogram, hibernationHistogram, ("Canvas.HibernationEvents", HibernationEventCount));
     hibernationHistogram.count(event);
 }
 
 } // namespace blink