Remove IsAnimated2D from Canvas

This was only used to disable deferral when a canvas gets updated
multiple times. We also removed the disable deferral reason.

TBR=juanmihd

Bug: 970325
Change-Id: I44167fbdd4638bdd9b492a76bed80a283383d0a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1642813Reviewed-by: Fernando Serboncini <fserb@chromium.org>
Commit-Queue: Fernando Serboncini <fserb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666375}

third_party/blink/renderer/core/html/canvas/html_canvas_element.cc

@@ -784,11 +784,6 @@ void HTMLCanvasElement::PaintInternal(GraphicsContext& context,
     context_->MarkLayerComposited();
 }
 
-bool HTMLCanvasElement::IsAnimated2d() const {
-  return Is2d() && canvas2d_bridge_ &&
-         canvas2d_bridge_->WasDrawnToAfterSnapshot();
-}
-
 void HTMLCanvasElement::SetSurfaceSize(const IntSize& size) {
   size_ = size;
   did_fail_to_create_resource_provider_ = false;

third_party/blink/renderer/core/html/canvas/html_canvas_element.h

@@ -168,8 +168,6 @@ class CORE_EXPORT HTMLCanvasElement final
   bool OriginClean() const override;
   void SetOriginTainted() override { origin_clean_ = false; }
 
-  bool IsAnimated2d() const;
-
   Canvas2DLayerBridge* GetCanvas2DLayerBridge() {
     return canvas2d_bridge_.get();
   }

third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc

@@ -1139,13 +1139,6 @@ bool ShouldDisableDeferral(CanvasImageSource* image_source,
     *reason = kDisableDeferralReasonDrawImageOfVideo;
     return true;
   }
-  if (image_source->IsCanvasElement()) {
-    HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(image_source);
-    if (canvas->IsAnimated2d()) {
-      *reason = kDisableDeferralReasonDrawImageOfAnimated2dCanvas;
-      return true;
-    }
-  }
   return false;
 }
 

third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge.cc

@@ -606,8 +606,6 @@ cc::Layer* Canvas2DLayerBridge::Layer() {
 }
 
 void Canvas2DLayerBridge::DidDraw(const FloatRect& rect) {
-  if (snapshot_state_ == kDidAcquireSnapshot)
-    snapshot_state_ = kDrawnToAfterSnapshot;
   if (!is_deferral_enabled_)
     return;
 

third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge.h

@@ -131,9 +131,6 @@ class PLATFORM_EXPORT Canvas2DLayerBridge : public cc::TextureLayerClient {
   bool HasRecordedDrawCommands() { return have_recorded_draw_commands_; }
 
   scoped_refptr<StaticBitmapImage> NewImageSnapshot(AccelerationHint);
-  bool WasDrawnToAfterSnapshot() const {
-    return snapshot_state_ == kDrawnToAfterSnapshot;
-  }
 
   // The values of the enum entries must not change because they are used for
   // usage metrics histograms. New values can be added to the end.
@@ -205,7 +202,6 @@ class PLATFORM_EXPORT Canvas2DLayerBridge : public cc::TextureLayerClient {
   enum SnapshotState {
     kInitialSnapshotState,
     kDidAcquireSnapshot,
-    kDrawnToAfterSnapshot,
   };
   mutable SnapshotState snapshot_state_;
 

third_party/blink/renderer/platform/graphics/graphics_types.h

@@ -131,7 +131,6 @@ enum DisableDeferralReason {
   kDisableDeferralReasonExpensiveOverdrawHeuristic = 1,
   kDisableDeferralReasonUsingTextureBackedPattern = 2,
   kDisableDeferralReasonDrawImageOfVideo = 3,
-  kDisableDeferralReasonDrawImageOfAnimated2dCanvas = 4,
   kDisableDeferralReasonSubPixelTextAntiAliasingSupport = 5,
   kDisableDeferralDrawImageWithTextureBackedSourceImage = 6,
   kDisableDeferralReasonLowEndDevice = 7,

third_party/blink/web_tests/TestExpectations

@@ -1719,8 +1719,8 @@ crbug.com/520194 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker
 
 crbug.com/771233 [ Win10 ] http/tests/devtools/audits/ [ Skip ]
 
-crbug.com/923269 virtual/gpu/fast/canvas/OffscreenCanvas-copyImage.html [ Failure ]
-crbug.com/923269 fast/canvas/OffscreenCanvas-copyImage.html [ Failure ]
+crbug.com/923269 virtual/gpu/fast/canvas/OffscreenCanvas-copyImage.html [ Pass Failure ]
+crbug.com/923269 fast/canvas/OffscreenCanvas-copyImage.html [ Pass Failure ]
 
 crbug.com/410974 fast/scroll-behavior/scroll-customization/scrollstate-basic.html [ Pass Failure ]
 crbug.com/410974 fast/scroll-behavior/scroll-customization/scrollstate-consume-deltas.html [ Pass Failure ]