blink/images: Respect both the repetition count and animation policy.

Use the conservative of the repetition count specified by the image and
the animation policy when selecting the final repetition count for
animated images.

R=chrishtr@chromium.org

Bug: 892683
Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I32507feca552302cca43db4ccbbb0ba9c82ca152
Reviewed-on: https://chromium-review.googlesource.com/c/1265080Reviewed-by: Chris Harrelson <chrishtr@chromium.org>
Commit-Queue: Khushal <khushalsagar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#597344}

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

@@ -53,19 +53,16 @@ namespace blink {
 
 int GetRepetitionCountWithPolicyOverride(int actual_count,
                                          ImageAnimationPolicy policy) {
-  switch (policy) {
-    case kImageAnimationPolicyAllowed:
-      // Default policy, no count override.
-      return actual_count;
-    case kImageAnimationPolicyAnimateOnce:
-      // Only a single loop allowed.
-      return kAnimationLoopOnce;
-    case kImageAnimationPolicyNoAnimation:
-      // Dont animate.
-      return kAnimationNone;
+  if (actual_count == kAnimationNone ||
+      policy == kImageAnimationPolicyNoAnimation) {
+    return kAnimationNone;
+  }
+
+  if (actual_count == kAnimationLoopOnce ||
+      policy == kImageAnimationPolicyAnimateOnce) {
+    return kAnimationLoopOnce;
   }
 
-  NOTREACHED();
   return actual_count;
 }
 

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

@@ -652,7 +652,65 @@ TEST_F(BitmapImageTestWithMockDecoder, ImageMetadataTracking) {
   }
 };
 
-TEST_F(BitmapImageTestWithMockDecoder, AnimationPolicyOverride) {
+TEST_F(BitmapImageTestWithMockDecoder,
+       AnimationPolicyOverrideOriginalRepetitionNone) {
+  repetition_count_ = kAnimationNone;
+  frame_count_ = 4u;
+  last_frame_complete_ = true;
+  image_->SetData(SharedBuffer::Create("data", sizeof("data")), false);
+
+  PaintImage image = image_->PaintImageForCurrentFrame();
+  EXPECT_EQ(image.repetition_count(), repetition_count_);
+
+  // In all cases, the image shouldn't animate.
+
+  // Only one loop allowed.
+  image_->SetAnimationPolicy(kImageAnimationPolicyAnimateOnce);
+  image = image_->PaintImageForCurrentFrame();
+  EXPECT_EQ(image.repetition_count(), kAnimationNone);
+
+  // No animation allowed.
+  image_->SetAnimationPolicy(kImageAnimationPolicyNoAnimation);
+  image = image_->PaintImageForCurrentFrame();
+  EXPECT_EQ(image.repetition_count(), kAnimationNone);
+
+  // Default policy.
+  image_->SetAnimationPolicy(kImageAnimationPolicyAllowed);
+  image = image_->PaintImageForCurrentFrame();
+  EXPECT_EQ(image.repetition_count(), kAnimationNone);
+}
+
+TEST_F(BitmapImageTestWithMockDecoder,
+       AnimationPolicyOverrideOriginalRepetitionOnce) {
+  repetition_count_ = kAnimationLoopOnce;
+  frame_count_ = 4u;
+  last_frame_complete_ = true;
+  image_->SetData(SharedBuffer::Create("data", sizeof("data")), false);
+
+  PaintImage image = image_->PaintImageForCurrentFrame();
+  EXPECT_EQ(image.repetition_count(), repetition_count_);
+
+  // If the policy is no animation, then the repetition count is none. In all
+  // other cases, it remains loop once.
+
+  // Only one loop allowed.
+  image_->SetAnimationPolicy(kImageAnimationPolicyAnimateOnce);
+  image = image_->PaintImageForCurrentFrame();
+  EXPECT_EQ(image.repetition_count(), kAnimationLoopOnce);
+
+  // No animation allowed.
+  image_->SetAnimationPolicy(kImageAnimationPolicyNoAnimation);
+  image = image_->PaintImageForCurrentFrame();
+  EXPECT_EQ(image.repetition_count(), kAnimationNone);
+
+  // Default policy.
+  image_->SetAnimationPolicy(kImageAnimationPolicyAllowed);
+  image = image_->PaintImageForCurrentFrame();
+  EXPECT_EQ(image.repetition_count(), kAnimationLoopOnce);
+}
+
+TEST_F(BitmapImageTestWithMockDecoder,
+       AnimationPolicyOverrideOriginalRepetitionInfinite) {
   repetition_count_ = kAnimationLoopInfinite;
   frame_count_ = 4u;
   last_frame_complete_ = true;
@@ -661,6 +719,8 @@ TEST_F(BitmapImageTestWithMockDecoder, AnimationPolicyOverride) {
   PaintImage image = image_->PaintImageForCurrentFrame();
   EXPECT_EQ(image.repetition_count(), repetition_count_);
 
+  // The repetition count is determined by the animation policy.
+
   // Only one loop allowed.
   image_->SetAnimationPolicy(kImageAnimationPolicyAnimateOnce);
   image = image_->PaintImageForCurrentFrame();