OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013, Google Inc. All rights reserved. | 2 * Copyright (c) 2013, Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
352 | 352 |
353 m_timing.playbackRate = 0.0; | 353 m_timing.playbackRate = 0.0; |
354 EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 354 EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
355 | 355 |
356 m_timing.playbackRate = -2.0; | 356 m_timing.playbackRate = -2.0; |
357 EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 357 EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
358 } | 358 } |
359 | 359 |
360 TEST_F(AnimationCompositorAnimationsTest, ConvertTimingForCompositorDirection) | 360 TEST_F(AnimationCompositorAnimationsTest, ConvertTimingForCompositorDirection) |
361 { | 361 { |
| 362 m_timing.direction = Timing::PlaybackDirectionNormal; |
| 363 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
| 364 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionNormal); |
| 365 |
362 m_timing.direction = Timing::PlaybackDirectionAlternate; | 366 m_timing.direction = Timing::PlaybackDirectionAlternate; |
363 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 367 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
364 EXPECT_TRUE(m_compositorTiming.alternate); | 368 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionAlternate); |
365 EXPECT_FALSE(m_compositorTiming.reverse); | |
366 | 369 |
367 m_timing.direction = Timing::PlaybackDirectionAlternateReverse; | 370 m_timing.direction = Timing::PlaybackDirectionAlternateReverse; |
368 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 371 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
369 EXPECT_TRUE(m_compositorTiming.alternate); | 372 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionAlternateRe
verse); |
370 EXPECT_TRUE(m_compositorTiming.reverse); | |
371 | 373 |
372 m_timing.direction = Timing::PlaybackDirectionReverse; | 374 m_timing.direction = Timing::PlaybackDirectionReverse; |
373 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 375 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
374 EXPECT_FALSE(m_compositorTiming.alternate); | 376 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionReverse); |
375 EXPECT_TRUE(m_compositorTiming.reverse); | |
376 } | 377 } |
377 | 378 |
378 TEST_F(AnimationCompositorAnimationsTest, ConvertTimingForCompositorDirectionIte
rationsAndStartDelay) | 379 TEST_F(AnimationCompositorAnimationsTest, ConvertTimingForCompositorDirectionIte
rationsAndStartDelay) |
379 { | 380 { |
380 m_timing.direction = Timing::PlaybackDirectionAlternate; | 381 m_timing.direction = Timing::PlaybackDirectionAlternate; |
381 m_timing.iterationCount = 4.0; | 382 m_timing.iterationCount = 4.0; |
382 m_timing.iterationDuration = 5.0; | 383 m_timing.iterationDuration = 5.0; |
383 m_timing.startDelay = -6.0; | 384 m_timing.startDelay = -6.0; |
384 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 385 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
385 EXPECT_DOUBLE_EQ(6.0, m_compositorTiming.scaledTimeOffset); | 386 EXPECT_DOUBLE_EQ(6.0, m_compositorTiming.scaledTimeOffset); |
386 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); | 387 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); |
387 EXPECT_TRUE(m_compositorTiming.alternate); | 388 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionAlternate); |
388 EXPECT_FALSE(m_compositorTiming.reverse); | |
389 | 389 |
390 m_timing.direction = Timing::PlaybackDirectionAlternate; | 390 m_timing.direction = Timing::PlaybackDirectionAlternate; |
391 m_timing.iterationCount = 4.0; | 391 m_timing.iterationCount = 4.0; |
392 m_timing.iterationDuration = 5.0; | 392 m_timing.iterationDuration = 5.0; |
393 m_timing.startDelay = -11.0; | 393 m_timing.startDelay = -11.0; |
394 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 394 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
395 EXPECT_DOUBLE_EQ(11.0, m_compositorTiming.scaledTimeOffset); | 395 EXPECT_DOUBLE_EQ(11.0, m_compositorTiming.scaledTimeOffset); |
396 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); | 396 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); |
397 EXPECT_TRUE(m_compositorTiming.alternate); | 397 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionAlternate); |
398 EXPECT_FALSE(m_compositorTiming.reverse); | |
399 | 398 |
400 m_timing.direction = Timing::PlaybackDirectionAlternateReverse; | 399 m_timing.direction = Timing::PlaybackDirectionAlternateReverse; |
401 m_timing.iterationCount = 4.0; | 400 m_timing.iterationCount = 4.0; |
402 m_timing.iterationDuration = 5.0; | 401 m_timing.iterationDuration = 5.0; |
403 m_timing.startDelay = -6.0; | 402 m_timing.startDelay = -6.0; |
404 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 403 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
405 EXPECT_DOUBLE_EQ(6.0, m_compositorTiming.scaledTimeOffset); | 404 EXPECT_DOUBLE_EQ(6.0, m_compositorTiming.scaledTimeOffset); |
406 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); | 405 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); |
407 EXPECT_TRUE(m_compositorTiming.alternate); | 406 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionAlternateRe
verse); |
408 EXPECT_TRUE(m_compositorTiming.reverse); | |
409 | 407 |
410 m_timing.direction = Timing::PlaybackDirectionAlternateReverse; | 408 m_timing.direction = Timing::PlaybackDirectionAlternateReverse; |
411 m_timing.iterationCount = 4.0; | 409 m_timing.iterationCount = 4.0; |
412 m_timing.iterationDuration = 5.0; | 410 m_timing.iterationDuration = 5.0; |
413 m_timing.startDelay = -11.0; | 411 m_timing.startDelay = -11.0; |
414 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 412 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
415 EXPECT_DOUBLE_EQ(11.0, m_compositorTiming.scaledTimeOffset); | 413 EXPECT_DOUBLE_EQ(11.0, m_compositorTiming.scaledTimeOffset); |
416 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); | 414 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); |
417 EXPECT_TRUE(m_compositorTiming.alternate); | 415 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionAlternateRe
verse); |
418 EXPECT_TRUE(m_compositorTiming.reverse); | |
419 } | 416 } |
420 | 417 |
421 TEST_F(AnimationCompositorAnimationsTest, isCandidateForAnimationOnCompositorTim
ingTimingFunctionPassThru) | 418 TEST_F(AnimationCompositorAnimationsTest, isCandidateForAnimationOnCompositorTim
ingTimingFunctionPassThru) |
422 { | 419 { |
423 m_timing.timingFunction = m_stepTimingFunction; | 420 m_timing.timingFunction = m_stepTimingFunction; |
424 EXPECT_FALSE(isCandidateForAnimationOnCompositor(m_timing, *m_keyframeAnimat
ionEffect2.get())); | 421 EXPECT_FALSE(isCandidateForAnimationOnCompositor(m_timing, *m_keyframeAnimat
ionEffect2.get())); |
425 } | 422 } |
426 | 423 |
427 TEST_F(AnimationCompositorAnimationsTest, isCandidateForAnimationOnCompositorTim
ingFunctionLinear) | 424 TEST_F(AnimationCompositorAnimationsTest, isCandidateForAnimationOnCompositorTim
ingFunctionLinear) |
428 { | 425 { |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
563 | 560 |
564 // Create animation | 561 // Create animation |
565 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); | 562 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); |
566 ExpectationSet usesMockAnimation; | 563 ExpectationSet usesMockAnimation; |
567 | 564 |
568 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) | 565 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) |
569 .WillOnce(Return(mockAnimationPtr)); | 566 .WillOnce(Return(mockAnimationPtr)); |
570 | 567 |
571 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1)); | 568 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1)); |
572 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); | 569 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); |
573 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(f
alse)); | 570 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebA
nimation::DirectionNormal)); |
574 | 571 |
575 EXPECT_CALL(*mockAnimationPtr, delete_()) | 572 EXPECT_CALL(*mockAnimationPtr, delete_()) |
576 .Times(1) | 573 .Times(1) |
577 .After(usesMockAnimation); | 574 .After(usesMockAnimation); |
578 EXPECT_CALL(*mockCurvePtr, delete_()) | 575 EXPECT_CALL(*mockCurvePtr, delete_()) |
579 .Times(1) | 576 .Times(1) |
580 .After(usesMockCurve); | 577 .After(usesMockCurve); |
581 | 578 |
582 // Go! | 579 // Go! |
583 setCompositorForTesting(mockCompositor); | 580 setCompositorForTesting(mockCompositor); |
(...skipping 26 matching lines...) Expand all Loading... |
610 | 607 |
611 // Create animation | 608 // Create animation |
612 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); | 609 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); |
613 ExpectationSet usesMockAnimation; | 610 ExpectationSet usesMockAnimation; |
614 | 611 |
615 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) | 612 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) |
616 .WillOnce(Return(mockAnimationPtr)); | 613 .WillOnce(Return(mockAnimationPtr)); |
617 | 614 |
618 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1)); | 615 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1)); |
619 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); | 616 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); |
620 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(f
alse)); | 617 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebA
nimation::DirectionNormal)); |
621 | 618 |
622 EXPECT_CALL(*mockAnimationPtr, delete_()) | 619 EXPECT_CALL(*mockAnimationPtr, delete_()) |
623 .Times(1) | 620 .Times(1) |
624 .After(usesMockAnimation); | 621 .After(usesMockAnimation); |
625 EXPECT_CALL(*mockCurvePtr, delete_()) | 622 EXPECT_CALL(*mockCurvePtr, delete_()) |
626 .Times(1) | 623 .Times(1) |
627 .After(usesMockCurve); | 624 .After(usesMockCurve); |
628 | 625 |
629 // Go! | 626 // Go! |
630 setCompositorForTesting(mockCompositor); | 627 setCompositorForTesting(mockCompositor); |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
663 | 660 |
664 // Animation is created | 661 // Animation is created |
665 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); | 662 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); |
666 ExpectationSet usesMockAnimation; | 663 ExpectationSet usesMockAnimation; |
667 | 664 |
668 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) | 665 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) |
669 .WillOnce(Return(mockAnimationPtr)); | 666 .WillOnce(Return(mockAnimationPtr)); |
670 | 667 |
671 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5)); | 668 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5)); |
672 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); | 669 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); |
673 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(t
rue)); | 670 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebA
nimation::DirectionAlternate)); |
674 | 671 |
675 EXPECT_CALL(*mockAnimationPtr, delete_()) | 672 EXPECT_CALL(*mockAnimationPtr, delete_()) |
676 .Times(1) | 673 .Times(1) |
677 .After(usesMockAnimation); | 674 .After(usesMockAnimation); |
678 EXPECT_CALL(*mockCurvePtr, delete_()) | 675 EXPECT_CALL(*mockCurvePtr, delete_()) |
679 .Times(1) | 676 .Times(1) |
680 .After(usesMockCurve); | 677 .After(usesMockCurve); |
681 | 678 |
682 // Go! | 679 // Go! |
683 setCompositorForTesting(mockCompositor); | 680 setCompositorForTesting(mockCompositor); |
(...skipping 28 matching lines...) Expand all Loading... |
712 | 709 |
713 // Create animation | 710 // Create animation |
714 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); | 711 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); |
715 ExpectationSet usesMockAnimation; | 712 ExpectationSet usesMockAnimation; |
716 | 713 |
717 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) | 714 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) |
718 .WillOnce(Return(mockAnimationPtr)); | 715 .WillOnce(Return(mockAnimationPtr)); |
719 | 716 |
720 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5)); | 717 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5)); |
721 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(-3.25)); | 718 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(-3.25)); |
722 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(f
alse)); | 719 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebA
nimation::DirectionNormal)); |
723 | 720 |
724 EXPECT_CALL(*mockAnimationPtr, delete_()) | 721 EXPECT_CALL(*mockAnimationPtr, delete_()) |
725 .Times(1) | 722 .Times(1) |
726 .After(usesMockAnimation); | 723 .After(usesMockAnimation); |
727 EXPECT_CALL(*mockCurvePtr, delete_()) | 724 EXPECT_CALL(*mockCurvePtr, delete_()) |
728 .Times(1) | 725 .Times(1) |
729 .After(usesMockCurve); | 726 .After(usesMockCurve); |
730 | 727 |
731 // Go! | 728 // Go! |
732 setCompositorForTesting(mockCompositor); | 729 setCompositorForTesting(mockCompositor); |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
771 | 768 |
772 // Animation is created | 769 // Animation is created |
773 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); | 770 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); |
774 ExpectationSet usesMockAnimation; | 771 ExpectationSet usesMockAnimation; |
775 | 772 |
776 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) | 773 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) |
777 .WillOnce(Return(mockAnimationPtr)); | 774 .WillOnce(Return(mockAnimationPtr)); |
778 | 775 |
779 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10)); | 776 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10)); |
780 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); | 777 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); |
781 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(t
rue)); | 778 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebA
nimation::DirectionAlternate)); |
782 | 779 |
783 EXPECT_CALL(*mockAnimationPtr, delete_()) | 780 EXPECT_CALL(*mockAnimationPtr, delete_()) |
784 .Times(1) | 781 .Times(1) |
785 .After(usesMockAnimation); | 782 .After(usesMockAnimation); |
786 EXPECT_CALL(*mockCurvePtr, delete_()) | 783 EXPECT_CALL(*mockCurvePtr, delete_()) |
787 .Times(1) | 784 .Times(1) |
788 .After(usesMockCurve); | 785 .After(usesMockCurve); |
789 | 786 |
790 // Go! | 787 // Go! |
791 setCompositorForTesting(mockCompositor); | 788 setCompositorForTesting(mockCompositor); |
(...skipping 25 matching lines...) Expand all Loading... |
817 | 814 |
818 WebCompositorSupportMock mockCompositor; | 815 WebCompositorSupportMock mockCompositor; |
819 | 816 |
820 // Curve is created | 817 // Curve is created |
821 blink::WebFloatAnimationCurveMock* mockCurvePtr = new blink::WebFloatAnimati
onCurveMock(); | 818 blink::WebFloatAnimationCurveMock* mockCurvePtr = new blink::WebFloatAnimati
onCurveMock(); |
822 ExpectationSet usesMockCurve; | 819 ExpectationSet usesMockCurve; |
823 | 820 |
824 EXPECT_CALL(mockCompositor, createFloatAnimationCurve()) | 821 EXPECT_CALL(mockCompositor, createFloatAnimationCurve()) |
825 .WillOnce(Return(mockCurvePtr)); | 822 .WillOnce(Return(mockCurvePtr)); |
826 | 823 |
827 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0,
5.0), 1.0, 0.0, 1.0, 1.0)); | 824 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0,
2.0), blink::WebAnimationCurve::TimingFunctionTypeEaseIn)); |
828 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.5,
20.0), blink::WebAnimationCurve::TimingFunctionTypeLinear)); | 825 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.25
, -1.0), blink::WebAnimationCurve::TimingFunctionTypeLinear)); |
829 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.75
, -1.0), blink::WebAnimationCurve::TimingFunctionTypeEaseOut)); | 826 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.5,
20.0), 0.0, 0.0, 0.0, 1.0)); |
830 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.0,
2.0))); | 827 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.0,
5.0))); |
831 | 828 |
832 // Create the animation | 829 // Create the animation |
833 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); | 830 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); |
834 ExpectationSet usesMockAnimation; | 831 ExpectationSet usesMockAnimation; |
835 | 832 |
836 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) | 833 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) |
837 .WillOnce(Return(mockAnimationPtr)); | 834 .WillOnce(Return(mockAnimationPtr)); |
838 | 835 |
839 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10)); | 836 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10)); |
840 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); | 837 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); |
841 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(t
rue)); | 838 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebA
nimation::DirectionAlternateReverse)); |
842 | 839 |
843 EXPECT_CALL(*mockAnimationPtr, delete_()) | 840 EXPECT_CALL(*mockAnimationPtr, delete_()) |
844 .Times(1) | 841 .Times(1) |
845 .After(usesMockAnimation); | 842 .After(usesMockAnimation); |
846 EXPECT_CALL(*mockCurvePtr, delete_()) | 843 EXPECT_CALL(*mockCurvePtr, delete_()) |
847 .Times(1) | 844 .Times(1) |
848 .After(usesMockCurve); | 845 .After(usesMockCurve); |
849 | 846 |
850 // Go! | 847 // Go! |
851 setCompositorForTesting(mockCompositor); | 848 setCompositorForTesting(mockCompositor); |
(...skipping 17 matching lines...) Expand all Loading... |
869 // -- | 866 // -- |
870 | 867 |
871 WebCompositorSupportMock mockCompositor; | 868 WebCompositorSupportMock mockCompositor; |
872 | 869 |
873 // Curve is created | 870 // Curve is created |
874 blink::WebFloatAnimationCurveMock* mockCurvePtr = new blink::WebFloatAnimati
onCurveMock; | 871 blink::WebFloatAnimationCurveMock* mockCurvePtr = new blink::WebFloatAnimati
onCurveMock; |
875 ExpectationSet usesMockCurve; | 872 ExpectationSet usesMockCurve; |
876 EXPECT_CALL(mockCompositor, createFloatAnimationCurve()) | 873 EXPECT_CALL(mockCompositor, createFloatAnimationCurve()) |
877 .WillOnce(Return(mockCurvePtr)); | 874 .WillOnce(Return(mockCurvePtr)); |
878 | 875 |
879 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0,
5.0), blink::WebAnimationCurve::TimingFunctionTypeLinear)); | 876 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0,
2.0), blink::WebAnimationCurve::TimingFunctionTypeLinear)); |
880 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.5,
2.0))); | 877 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.5,
5.0))); |
881 | 878 |
882 // Create animation | 879 // Create animation |
883 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); | 880 blink::WebAnimationMock* mockAnimationPtr = new blink::WebAnimationMock(blin
k::WebAnimation::TargetPropertyOpacity); |
884 ExpectationSet usesMockAnimation; | 881 ExpectationSet usesMockAnimation; |
885 | 882 |
886 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) | 883 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), blink::WebAnimation::TargetPropertyOpacity, _)) |
887 .WillOnce(Return(mockAnimationPtr)); | 884 .WillOnce(Return(mockAnimationPtr)); |
888 | 885 |
889 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5)); | 886 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5)); |
890 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(3.0)); | 887 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(3.0)); |
891 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(t
rue)); | 888 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebA
nimation::DirectionAlternateReverse)); |
892 | 889 |
893 EXPECT_CALL(*mockAnimationPtr, delete_()) | 890 EXPECT_CALL(*mockAnimationPtr, delete_()) |
894 .Times(1) | 891 .Times(1) |
895 .After(usesMockAnimation); | 892 .After(usesMockAnimation); |
896 EXPECT_CALL(*mockCurvePtr, delete_()) | 893 EXPECT_CALL(*mockCurvePtr, delete_()) |
897 .Times(1) | 894 .Times(1) |
898 .After(usesMockCurve); | 895 .After(usesMockCurve); |
899 | 896 |
900 // Go! | 897 // Go! |
901 setCompositorForTesting(mockCompositor); | 898 setCompositorForTesting(mockCompositor); |
902 Vector<OwnPtr<blink::WebAnimation> > result; | 899 Vector<OwnPtr<blink::WebAnimation> > result; |
903 getAnimationOnCompositor(m_timing, *effect.get(), result); | 900 getAnimationOnCompositor(m_timing, *effect.get(), result); |
904 EXPECT_EQ(1U, result.size()); | 901 EXPECT_EQ(1U, result.size()); |
905 result[0].clear(); | 902 result[0].clear(); |
906 } | 903 } |
907 | 904 |
908 | 905 |
909 } // namespace WebCore | 906 } // namespace WebCore |
OLD | NEW |