Removing AcceleratedResourceUsage from offscreen_canvas

Refactors the GetOrCreateResourceProvider of OffscreenCanvas
simplifying the logic and removing AcceleratedResourceUsage.

Also removes the usage parameter an metric capture, as in next
CLs this usage will be completely removed.

Part of a big refactor for CanvasResourceProvider.

Bug: 1035589
Change-Id: Icd46f812d312f56454205c6f23f70c72e6e44d5e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2103080
Commit-Queue: Juanmi Huertas <juanmihd@chromium.org>
Reviewed-by: Fernando Serboncini <fserb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751071}

third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.cc

@@ -377,40 +377,47 @@ CanvasResourceProvider* OffscreenCanvas::GetOrCreateResourceProvider() {
     }
 
     IntSize surface_size(width(), height());
-    CanvasResourceProvider::ResourceUsage usage;
-    if (can_use_gpu) {
-      if (HasPlaceholderCanvas()) {
-        usage = CanvasResourceProvider::ResourceUsage::
-            kAcceleratedCompositedResourceUsage;
-      } else {
-        usage =
-            CanvasResourceProvider::ResourceUsage::kAcceleratedResourceUsage;
-      }
-    } else {
-      if (HasPlaceholderCanvas()) {
-        usage = CanvasResourceProvider::ResourceUsage::
-            kSoftwareCompositedResourceUsage;
-      } else {
-        usage = CanvasResourceProvider::ResourceUsage::kSoftwareResourceUsage;
-      }
-    }
-
     base::WeakPtr<CanvasResourceDispatcher> dispatcher_weakptr =
         HasPlaceholderCanvas() ? GetOrCreateResourceDispatcher()->GetWeakPtr()
                                : nullptr;
-    base::UmaHistogramEnumeration("Blink.Canvas.ResourceProviderUsage", usage);
-
-    if (usage ==
-        CanvasResourceProvider::ResourceUsage::kSoftwareResourceUsage) {
-      ReplaceResourceProvider(CanvasResourceProvider::CreateBitmapProvider(
-          surface_size, FilterQuality(), context_->ColorParams()));
-    } else {
-      ReplaceResourceProvider(CanvasResourceProvider::Create(
-          surface_size, usage, SharedGpuContext::ContextProviderWrapper(), 0,
-          FilterQuality(), context_->ColorParams(), presentation_mode,
-          std::move(dispatcher_weakptr), false /* is_origin_top_left */));
+    std::unique_ptr<CanvasResourceProvider> provider;
+    // kAcceleratedCompositedResourceUsage and kSoftwareCompositedResourceUsage
+    // still need to use the Create method for CanvasResourceProvider.
+    // The former kAcceleratedResourceUsage and kSoftwareResourceUsage have been
+    // replaced by two different constructors (one of sharedImage witt the
+    // fallback to bitmap, and the other one to bitmap)
+    // This is still WIP and more changes will come in upcoming CLs.
+    if (can_use_gpu && HasPlaceholderCanvas()) {
+      provider = CanvasResourceProvider::Create(
+          surface_size,
+          CanvasResourceProvider::ResourceUsage::
+              kAcceleratedCompositedResourceUsage,
+          SharedGpuContext::ContextProviderWrapper(), 0, FilterQuality(),
+          context_->ColorParams(), presentation_mode,
+          std::move(dispatcher_weakptr), /*is_origin_top_left=*/false);
+    } else if (!can_use_gpu && HasPlaceholderCanvas()) {
+      provider = CanvasResourceProvider::Create(
+          surface_size,
+          CanvasResourceProvider::ResourceUsage::
+              kSoftwareCompositedResourceUsage,
+          SharedGpuContext::ContextProviderWrapper(), 0, FilterQuality(),
+          context_->ColorParams(), presentation_mode,
+          std::move(dispatcher_weakptr), /*is_origin_top_left=*/false);
+    } else if (can_use_gpu) {
+      provider = CanvasResourceProvider::CreateSharedImageProvider(
+          surface_size, SharedGpuContext::ContextProviderWrapper(),
+          FilterQuality(), context_->ColorParams(),
+          /*is_origin_top_left=*/false, /*shared_image_usage_flags*/ 0u);
+
+    }  // else will try the BitmapProvider
+
+    if (!provider) {
+      provider = CanvasResourceProvider::CreateBitmapProvider(
+          surface_size, FilterQuality(), context_->ColorParams());
     }
 
+    ReplaceResourceProvider(std::move(provider));
+
     if (ResourceProvider() && ResourceProvider()->IsValid()) {
       base::UmaHistogramBoolean("Blink.Canvas.ResourceProviderIsAccelerated",
                                 ResourceProvider()->IsAccelerated());