Fixing crash of AnimationCompositorAnimationsTest.ConvertTimingForCompositorIterationCount on Andro…

Source/core/animation/CompositorAnimationsTest.cpp

 /*
  * Copyright (c) 2013, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 344 matching lines @@
     EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
     EXPECT_DOUBLE_EQ(-2.0, m_compositorTiming.scaledTimeOffset);
 }
 
 TEST_F(AnimationCompositorAnimationsTest, ConvertTimingForCompositorIterationStart)
 {
     m_timing.iterationStart = 2.2;
     EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming));
 }
 
-TEST_F(AnimationCompositorAnimationsTest, DISABLED_ConvertTimingForCompositorIterationCount)
+TEST_F(AnimationCompositorAnimationsTest, ConvertTimingForCompositorIterationCount)
 {
     m_timing.iterationCount = 5.0;
     EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
     EXPECT_EQ(5, m_compositorTiming.adjustedIterationCount);
 
     m_timing.iterationCount = 5.5;
     EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming));
 
-    m_timing.iterationCount = std::numeric_limits<double>::infinity();
-    EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming));
-
-#ifndef NDEBUG
+    // Asserts will only trigger on DEBUG build.
+    // EXPECT_DEATH tests are flaky on Android.

[Steve Block, 2013/11/22 02:56:35]

So does this mean all EXPECT_DEATH() tests are skipped on Android? Is there a
bug for this that you can link to here?

+#if !defined(NDEBUG) && !OS(ANDROID)
     m_timing.iterationCount = -1;
     EXPECT_DEATH(convertTimingForCompositor(m_timing, m_compositorTiming), "");
 #endif
+
+    m_timing.iterationCount = std::numeric_limits<double>::infinity();
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_EQ(-1, m_compositorTiming.adjustedIterationCount);
+
+    m_timing.iterationCount = std::numeric_limits<double>::infinity();
+    m_timing.iterationDuration = 5.0;
+    m_timing.startDelay = -6.0;
+    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
+    EXPECT_DOUBLE_EQ(-1.0, m_compositorTiming.scaledTimeOffset);
+    EXPECT_EQ(-1, m_compositorTiming.adjustedIterationCount);
 }
 
 TEST_F(AnimationCompositorAnimationsTest, ConvertTimingForCompositorIterationsAndStartDelay)
 {
     m_timing.iterationCount = 4.0;
     m_timing.iterationDuration = 5.0;
 
     m_timing.startDelay = -6.0;
     EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
     EXPECT_DOUBLE_EQ(-1.0, m_compositorTiming.scaledTimeOffset);
@@ skipping 77 matching lines @@
     m_timing.iterationCount = 4.0;
     m_timing.iterationDuration = 5.0;
     m_timing.startDelay = -11.0;
     EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
     EXPECT_DOUBLE_EQ(-1.0, m_compositorTiming.scaledTimeOffset);
     EXPECT_EQ(2, m_compositorTiming.adjustedIterationCount);
     EXPECT_TRUE(m_compositorTiming.alternate);
     EXPECT_TRUE(m_compositorTiming.reverse);
 }
 
-TEST_F(AnimationCompositorAnimationsTest, ConvertTimingForCompositorInfinite)
-{
-    m_timing.iterationCount = std::numeric_limits<double>::infinity();
-    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
-    EXPECT_EQ(-1, m_compositorTiming.adjustedIterationCount);
-
-    m_timing.iterationCount = std::numeric_limits<double>::infinity();
-    m_timing.iterationDuration = 5.0;
-    m_timing.startDelay = -6.0;
-    EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming));
-    EXPECT_DOUBLE_EQ(-1.0, m_compositorTiming.scaledTimeOffset);
-    EXPECT_EQ(-1, m_compositorTiming.adjustedIterationCount);
-}
-
 TEST_F(AnimationCompositorAnimationsTest, isCandidateForCompositorTiming)
 {
     EXPECT_TRUE(isCandidateForCompositor(m_timing, m_keyframeVector2));
 
     m_timing.startDelay = 2.0;
     EXPECT_FALSE(isCandidateForCompositor(m_timing, m_keyframeVector2));
 }
 
 TEST_F(AnimationCompositorAnimationsTest, isCandidateForCompositorTimingTimingFunctionPassThru)
 {
@@ skipping 587 matching lines @@
     // Go!
     setCompositorForTesting(mockCompositor);
     Vector<OwnPtr<blink::WebAnimation> > result;
     getAnimationOnCompositor(m_timing, *effect.get(), result);
     EXPECT_EQ(1U, result.size());
     result[0].clear();
 }
 
 
 } // namespace WebCore