Re-enable canvas optimization for getImageData with new codepath

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 443 matching lines @@
 {
     if (!m_surfaceCreationFailedAtLeastOnce) {
         // Only count the failure once per instance so that the histogram may
         // reflect the proportion of Canvas2DLayerBridge instances with surface
         // allocation failures.
         CanvasMetrics::countCanvasContextUsage(CanvasMetrics::GPUAccelerated2DCanvasSurfaceCreationFailed);
         m_surfaceCreationFailedAtLeastOnce = true;
     }
 }
 
-void Canvas2DLayerBridge::disableAcceleration()
-{
-    DCHECK(isAccelerated());
-    bool surfaceIsAccelerated;
-    RefPtr<SkSurface> newSurface = createSkSurface(nullptr, m_size, m_msaaSampleCount, m_opacityMode, &surfaceIsAccelerated);
-    if (newSurface) {
-        DCHECK(!surfaceIsAccelerated);
-        flush();
-        SkPaint copyPaint;
-        copyPaint.setXfermodeMode(SkXfermode::kSrc_Mode);
-        m_surface->draw(newSurface->getCanvas(), 0, 0, &copyPaint); // GPU readback here
-        m_accelerationMode = DisableAcceleration; // Acceleration gets permanently disabled
-        GraphicsLayer::unregisterContentsLayer(m_layer->layer());
-        m_layer->clearTexture();
-        m_layer->layer()->removeFromParent();
-        m_surface = newSurface;
-        if (m_imageBuffer)
-            m_imageBuffer->didDisableAcceleration();
-    }
-}
-
 SkSurface* Canvas2DLayerBridge::getOrCreateSurface(AccelerationHint hint)
 {
-    if (m_surface) {
-        // Note: in layout tests, canvas2dFixedRenderingMode is set to true to inhibit
-        // mode switching so that we continue to get test coverage for GPU acceleration
-        // despite the use of getImageData in tests
-        if (hint == ForceNoAcceleration && isAccelerated() && !RuntimeEnabledFeatures::canvas2dFixedRenderingModeEnabled())
-            disableAcceleration();
+    if (m_surface)
         return m_surface.get();
-    }
 
     if (m_layer && !isHibernating() && hint == PreferAcceleration && m_accelerationMode != DisableAcceleration) {
         return nullptr; // re-creation will happen through restore()
     }
 
     bool wantAcceleration = shouldAccelerate(hint);
     if (CANVAS2D_BACKGROUND_RENDER_SWITCH_TO_CPU && isHidden() && wantAcceleration) {
         wantAcceleration = false;
         m_softwareRenderingWhileHidden = true;
     }
@@ skipping 514 matching lines @@
 #endif // USE_IOSURFACE_FOR_2D_CANVAS
 }
 
 void Canvas2DLayerBridge::Logger::reportHibernationEvent(HibernationEvent event)
 {
     DEFINE_STATIC_LOCAL(EnumerationHistogram, hibernationHistogram, ("Canvas.HibernationEvents", HibernationEventCount));
     hibernationHistogram.count(event);
 }
 
 } // namespace blink