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 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
385 | 385 |
386 m_timing.playbackRate = 0.0; | 386 m_timing.playbackRate = 0.0; |
387 EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 387 EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
388 | 388 |
389 m_timing.playbackRate = -2.0; | 389 m_timing.playbackRate = -2.0; |
390 EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 390 EXPECT_FALSE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
391 } | 391 } |
392 | 392 |
393 TEST_F(AnimationCompositorAnimationsTest, ConvertTimingForCompositorDirection) | 393 TEST_F(AnimationCompositorAnimationsTest, ConvertTimingForCompositorDirection) |
394 { | 394 { |
| 395 m_timing.direction = Timing::PlaybackDirectionNormal; |
| 396 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
| 397 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionNormal); |
| 398 |
395 m_timing.direction = Timing::PlaybackDirectionAlternate; | 399 m_timing.direction = Timing::PlaybackDirectionAlternate; |
396 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 400 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
397 EXPECT_TRUE(m_compositorTiming.alternate); | 401 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionAlternate); |
398 EXPECT_FALSE(m_compositorTiming.reverse); | |
399 | 402 |
400 m_timing.direction = Timing::PlaybackDirectionAlternateReverse; | 403 m_timing.direction = Timing::PlaybackDirectionAlternateReverse; |
401 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 404 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
402 EXPECT_TRUE(m_compositorTiming.alternate); | 405 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionAlternateRe
verse); |
403 EXPECT_TRUE(m_compositorTiming.reverse); | |
404 | 406 |
405 m_timing.direction = Timing::PlaybackDirectionReverse; | 407 m_timing.direction = Timing::PlaybackDirectionReverse; |
406 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 408 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
407 EXPECT_FALSE(m_compositorTiming.alternate); | 409 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionReverse); |
408 EXPECT_TRUE(m_compositorTiming.reverse); | |
409 } | 410 } |
410 | 411 |
411 TEST_F(AnimationCompositorAnimationsTest, ConvertTimingForCompositorDirectionIte
rationsAndStartDelay) | 412 TEST_F(AnimationCompositorAnimationsTest, ConvertTimingForCompositorDirectionIte
rationsAndStartDelay) |
412 { | 413 { |
413 m_timing.direction = Timing::PlaybackDirectionAlternate; | 414 m_timing.direction = Timing::PlaybackDirectionAlternate; |
414 m_timing.iterationCount = 4.0; | 415 m_timing.iterationCount = 4.0; |
415 m_timing.iterationDuration = 5.0; | 416 m_timing.iterationDuration = 5.0; |
416 m_timing.startDelay = -6.0; | 417 m_timing.startDelay = -6.0; |
417 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 418 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
418 EXPECT_DOUBLE_EQ(6.0, m_compositorTiming.scaledTimeOffset); | 419 EXPECT_DOUBLE_EQ(6.0, m_compositorTiming.scaledTimeOffset); |
419 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); | 420 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); |
420 EXPECT_TRUE(m_compositorTiming.alternate); | 421 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionAlternate); |
421 EXPECT_FALSE(m_compositorTiming.reverse); | |
422 | 422 |
423 m_timing.direction = Timing::PlaybackDirectionAlternate; | 423 m_timing.direction = Timing::PlaybackDirectionAlternate; |
424 m_timing.iterationCount = 4.0; | 424 m_timing.iterationCount = 4.0; |
425 m_timing.iterationDuration = 5.0; | 425 m_timing.iterationDuration = 5.0; |
426 m_timing.startDelay = -11.0; | 426 m_timing.startDelay = -11.0; |
427 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 427 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
428 EXPECT_DOUBLE_EQ(11.0, m_compositorTiming.scaledTimeOffset); | 428 EXPECT_DOUBLE_EQ(11.0, m_compositorTiming.scaledTimeOffset); |
429 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); | 429 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); |
430 EXPECT_TRUE(m_compositorTiming.alternate); | 430 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionAlternate); |
431 EXPECT_FALSE(m_compositorTiming.reverse); | |
432 | 431 |
433 m_timing.direction = Timing::PlaybackDirectionAlternateReverse; | 432 m_timing.direction = Timing::PlaybackDirectionAlternateReverse; |
434 m_timing.iterationCount = 4.0; | 433 m_timing.iterationCount = 4.0; |
435 m_timing.iterationDuration = 5.0; | 434 m_timing.iterationDuration = 5.0; |
436 m_timing.startDelay = -6.0; | 435 m_timing.startDelay = -6.0; |
437 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 436 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
438 EXPECT_DOUBLE_EQ(6.0, m_compositorTiming.scaledTimeOffset); | 437 EXPECT_DOUBLE_EQ(6.0, m_compositorTiming.scaledTimeOffset); |
439 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); | 438 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); |
440 EXPECT_TRUE(m_compositorTiming.alternate); | 439 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionAlternateRe
verse); |
441 EXPECT_TRUE(m_compositorTiming.reverse); | |
442 | 440 |
443 m_timing.direction = Timing::PlaybackDirectionAlternateReverse; | 441 m_timing.direction = Timing::PlaybackDirectionAlternateReverse; |
444 m_timing.iterationCount = 4.0; | 442 m_timing.iterationCount = 4.0; |
445 m_timing.iterationDuration = 5.0; | 443 m_timing.iterationDuration = 5.0; |
446 m_timing.startDelay = -11.0; | 444 m_timing.startDelay = -11.0; |
447 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); | 445 EXPECT_TRUE(convertTimingForCompositor(m_timing, m_compositorTiming)); |
448 EXPECT_DOUBLE_EQ(11.0, m_compositorTiming.scaledTimeOffset); | 446 EXPECT_DOUBLE_EQ(11.0, m_compositorTiming.scaledTimeOffset); |
449 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); | 447 EXPECT_EQ(4, m_compositorTiming.adjustedIterationCount); |
450 EXPECT_TRUE(m_compositorTiming.alternate); | 448 EXPECT_EQ(m_compositorTiming.direction, Timing::PlaybackDirectionAlternateRe
verse); |
451 EXPECT_TRUE(m_compositorTiming.reverse); | |
452 } | 449 } |
453 | 450 |
454 TEST_F(AnimationCompositorAnimationsTest, isCandidateForAnimationOnCompositorTim
ingTimingFunctionPassThru) | 451 TEST_F(AnimationCompositorAnimationsTest, isCandidateForAnimationOnCompositorTim
ingTimingFunctionPassThru) |
455 { | 452 { |
456 m_timing.timingFunction = m_stepTimingFunction; | 453 m_timing.timingFunction = m_stepTimingFunction; |
457 EXPECT_FALSE(isCandidateForAnimationOnCompositor(m_timing, *m_keyframeAnimat
ionEffect2.get())); | 454 EXPECT_FALSE(isCandidateForAnimationOnCompositor(m_timing, *m_keyframeAnimat
ionEffect2.get())); |
458 } | 455 } |
459 | 456 |
460 TEST_F(AnimationCompositorAnimationsTest, isCandidateForAnimationOnCompositorTim
ingFunctionLinear) | 457 TEST_F(AnimationCompositorAnimationsTest, isCandidateForAnimationOnCompositorTim
ingFunctionLinear) |
461 { | 458 { |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
606 | 603 |
607 // Create animation | 604 // Create animation |
608 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); | 605 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); |
609 ExpectationSet usesMockAnimation; | 606 ExpectationSet usesMockAnimation; |
610 | 607 |
611 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) | 608 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) |
612 .WillOnce(Return(mockAnimationPtr)); | 609 .WillOnce(Return(mockAnimationPtr)); |
613 | 610 |
614 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1)); | 611 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1)); |
615 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); | 612 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); |
616 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(f
alse)); | 613 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebC
ompositorAnimation::DirectionNormal)); |
617 | 614 |
618 EXPECT_CALL(*mockAnimationPtr, delete_()) | 615 EXPECT_CALL(*mockAnimationPtr, delete_()) |
619 .Times(1) | 616 .Times(1) |
620 .After(usesMockAnimation); | 617 .After(usesMockAnimation); |
621 EXPECT_CALL(*mockCurvePtr, delete_()) | 618 EXPECT_CALL(*mockCurvePtr, delete_()) |
622 .Times(1) | 619 .Times(1) |
623 .After(usesMockCurve); | 620 .After(usesMockCurve); |
624 | 621 |
625 // Go! | 622 // Go! |
626 setCompositorForTesting(mockCompositor); | 623 setCompositorForTesting(mockCompositor); |
(...skipping 26 matching lines...) Expand all Loading... |
653 | 650 |
654 // Create animation | 651 // Create animation |
655 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); | 652 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); |
656 ExpectationSet usesMockAnimation; | 653 ExpectationSet usesMockAnimation; |
657 | 654 |
658 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) | 655 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) |
659 .WillOnce(Return(mockAnimationPtr)); | 656 .WillOnce(Return(mockAnimationPtr)); |
660 | 657 |
661 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1)); | 658 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(1)); |
662 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); | 659 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); |
663 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(f
alse)); | 660 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebC
ompositorAnimation::DirectionNormal)); |
664 | 661 |
665 EXPECT_CALL(*mockAnimationPtr, delete_()) | 662 EXPECT_CALL(*mockAnimationPtr, delete_()) |
666 .Times(1) | 663 .Times(1) |
667 .After(usesMockAnimation); | 664 .After(usesMockAnimation); |
668 EXPECT_CALL(*mockCurvePtr, delete_()) | 665 EXPECT_CALL(*mockCurvePtr, delete_()) |
669 .Times(1) | 666 .Times(1) |
670 .After(usesMockCurve); | 667 .After(usesMockCurve); |
671 | 668 |
672 // Go! | 669 // Go! |
673 setCompositorForTesting(mockCompositor); | 670 setCompositorForTesting(mockCompositor); |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
706 | 703 |
707 // Animation is created | 704 // Animation is created |
708 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); | 705 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); |
709 ExpectationSet usesMockAnimation; | 706 ExpectationSet usesMockAnimation; |
710 | 707 |
711 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) | 708 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) |
712 .WillOnce(Return(mockAnimationPtr)); | 709 .WillOnce(Return(mockAnimationPtr)); |
713 | 710 |
714 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5)); | 711 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5)); |
715 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); | 712 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); |
716 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(t
rue)); | 713 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebC
ompositorAnimation::DirectionAlternate)); |
717 | 714 |
718 EXPECT_CALL(*mockAnimationPtr, delete_()) | 715 EXPECT_CALL(*mockAnimationPtr, delete_()) |
719 .Times(1) | 716 .Times(1) |
720 .After(usesMockAnimation); | 717 .After(usesMockAnimation); |
721 EXPECT_CALL(*mockCurvePtr, delete_()) | 718 EXPECT_CALL(*mockCurvePtr, delete_()) |
722 .Times(1) | 719 .Times(1) |
723 .After(usesMockCurve); | 720 .After(usesMockCurve); |
724 | 721 |
725 // Go! | 722 // Go! |
726 setCompositorForTesting(mockCompositor); | 723 setCompositorForTesting(mockCompositor); |
(...skipping 28 matching lines...) Expand all Loading... |
755 | 752 |
756 // Create animation | 753 // Create animation |
757 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); | 754 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); |
758 ExpectationSet usesMockAnimation; | 755 ExpectationSet usesMockAnimation; |
759 | 756 |
760 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) | 757 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) |
761 .WillOnce(Return(mockAnimationPtr)); | 758 .WillOnce(Return(mockAnimationPtr)); |
762 | 759 |
763 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5)); | 760 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5)); |
764 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(-3.25)); | 761 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(-3.25)); |
765 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(f
alse)); | 762 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebC
ompositorAnimation::DirectionNormal)); |
766 | 763 |
767 EXPECT_CALL(*mockAnimationPtr, delete_()) | 764 EXPECT_CALL(*mockAnimationPtr, delete_()) |
768 .Times(1) | 765 .Times(1) |
769 .After(usesMockAnimation); | 766 .After(usesMockAnimation); |
770 EXPECT_CALL(*mockCurvePtr, delete_()) | 767 EXPECT_CALL(*mockCurvePtr, delete_()) |
771 .Times(1) | 768 .Times(1) |
772 .After(usesMockCurve); | 769 .After(usesMockCurve); |
773 | 770 |
774 // Go! | 771 // Go! |
775 setCompositorForTesting(mockCompositor); | 772 setCompositorForTesting(mockCompositor); |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
814 | 811 |
815 // Animation is created | 812 // Animation is created |
816 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); | 813 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); |
817 ExpectationSet usesMockAnimation; | 814 ExpectationSet usesMockAnimation; |
818 | 815 |
819 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) | 816 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) |
820 .WillOnce(Return(mockAnimationPtr)); | 817 .WillOnce(Return(mockAnimationPtr)); |
821 | 818 |
822 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10)); | 819 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10)); |
823 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); | 820 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); |
824 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(t
rue)); | 821 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebC
ompositorAnimation::DirectionAlternate)); |
825 | 822 |
826 EXPECT_CALL(*mockAnimationPtr, delete_()) | 823 EXPECT_CALL(*mockAnimationPtr, delete_()) |
827 .Times(1) | 824 .Times(1) |
828 .After(usesMockAnimation); | 825 .After(usesMockAnimation); |
829 EXPECT_CALL(*mockCurvePtr, delete_()) | 826 EXPECT_CALL(*mockCurvePtr, delete_()) |
830 .Times(1) | 827 .Times(1) |
831 .After(usesMockCurve); | 828 .After(usesMockCurve); |
832 | 829 |
833 // Go! | 830 // Go! |
834 setCompositorForTesting(mockCompositor); | 831 setCompositorForTesting(mockCompositor); |
(...skipping 25 matching lines...) Expand all Loading... |
860 | 857 |
861 WebCompositorSupportMock mockCompositor; | 858 WebCompositorSupportMock mockCompositor; |
862 | 859 |
863 // Curve is created | 860 // Curve is created |
864 WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock(); | 861 WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock(); |
865 ExpectationSet usesMockCurve; | 862 ExpectationSet usesMockCurve; |
866 | 863 |
867 EXPECT_CALL(mockCompositor, createFloatAnimationCurve()) | 864 EXPECT_CALL(mockCompositor, createFloatAnimationCurve()) |
868 .WillOnce(Return(mockCurvePtr)); | 865 .WillOnce(Return(mockCurvePtr)); |
869 | 866 |
870 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.0, 5.0),
1.0, 0.0, 1.0, 1.0)); | 867 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0,
2.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeEaseIn)); |
871 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.5, 20.0),
WebCompositorAnimationCurve::TimingFunctionTypeLinear)); | 868 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.25
, -1.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeLinear)); |
872 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.75, -1.0)
, WebCompositorAnimationCurve::TimingFunctionTypeEaseOut)); | 869 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.5,
20.0), 0.0, 0.0, 0.0, 1.0)); |
873 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(1.0, 2.0)))
; | 870 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.0,
5.0))); |
874 | 871 |
875 // Create the animation | 872 // Create the animation |
876 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); | 873 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); |
877 ExpectationSet usesMockAnimation; | 874 ExpectationSet usesMockAnimation; |
878 | 875 |
879 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) | 876 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) |
880 .WillOnce(Return(mockAnimationPtr)); | 877 .WillOnce(Return(mockAnimationPtr)); |
881 | 878 |
882 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10)); | 879 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(10)); |
883 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); | 880 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(0.0)); |
884 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(t
rue)); | 881 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebC
ompositorAnimation::DirectionAlternateReverse)); |
885 | 882 |
886 EXPECT_CALL(*mockAnimationPtr, delete_()) | 883 EXPECT_CALL(*mockAnimationPtr, delete_()) |
887 .Times(1) | 884 .Times(1) |
888 .After(usesMockAnimation); | 885 .After(usesMockAnimation); |
889 EXPECT_CALL(*mockCurvePtr, delete_()) | 886 EXPECT_CALL(*mockCurvePtr, delete_()) |
890 .Times(1) | 887 .Times(1) |
891 .After(usesMockCurve); | 888 .After(usesMockCurve); |
892 | 889 |
893 // Go! | 890 // Go! |
894 setCompositorForTesting(mockCompositor); | 891 setCompositorForTesting(mockCompositor); |
(...skipping 17 matching lines...) Expand all Loading... |
912 // -- | 909 // -- |
913 | 910 |
914 WebCompositorSupportMock mockCompositor; | 911 WebCompositorSupportMock mockCompositor; |
915 | 912 |
916 // Curve is created | 913 // Curve is created |
917 WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock; | 914 WebFloatAnimationCurveMock* mockCurvePtr = new WebFloatAnimationCurveMock; |
918 ExpectationSet usesMockCurve; | 915 ExpectationSet usesMockCurve; |
919 EXPECT_CALL(mockCompositor, createFloatAnimationCurve()) | 916 EXPECT_CALL(mockCompositor, createFloatAnimationCurve()) |
920 .WillOnce(Return(mockCurvePtr)); | 917 .WillOnce(Return(mockCurvePtr)); |
921 | 918 |
922 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(0.0, 5.0),
WebCompositorAnimationCurve::TimingFunctionTypeLinear)); | 919 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(0.0,
2.0), blink::WebCompositorAnimationCurve::TimingFunctionTypeLinear)); |
923 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(WebFloatKeyframe(1.5, 2.0)))
; | 920 usesMockCurve += EXPECT_CALL(*mockCurvePtr, add(blink::WebFloatKeyframe(1.5,
5.0))); |
924 | 921 |
925 // Create animation | 922 // Create animation |
926 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); | 923 WebCompositorAnimationMock* mockAnimationPtr = new WebCompositorAnimationMoc
k(WebCompositorAnimation::TargetPropertyOpacity); |
927 ExpectationSet usesMockAnimation; | 924 ExpectationSet usesMockAnimation; |
928 | 925 |
929 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) | 926 usesMockCurve += EXPECT_CALL(mockCompositor, createAnimation(Ref(*mockCurveP
tr), WebCompositorAnimation::TargetPropertyOpacity, _)) |
930 .WillOnce(Return(mockAnimationPtr)); | 927 .WillOnce(Return(mockAnimationPtr)); |
931 | 928 |
932 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5)); | 929 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setIterations(5)); |
933 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(3.0)); | 930 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setTimeOffset(3.0)); |
934 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setAlternatesDirection(t
rue)); | 931 usesMockAnimation += EXPECT_CALL(*mockAnimationPtr, setDirection(blink::WebC
ompositorAnimation::DirectionAlternateReverse)); |
935 | 932 |
936 EXPECT_CALL(*mockAnimationPtr, delete_()) | 933 EXPECT_CALL(*mockAnimationPtr, delete_()) |
937 .Times(1) | 934 .Times(1) |
938 .After(usesMockAnimation); | 935 .After(usesMockAnimation); |
939 EXPECT_CALL(*mockCurvePtr, delete_()) | 936 EXPECT_CALL(*mockCurvePtr, delete_()) |
940 .Times(1) | 937 .Times(1) |
941 .After(usesMockCurve); | 938 .After(usesMockCurve); |
942 | 939 |
943 // Go! | 940 // Go! |
944 setCompositorForTesting(mockCompositor); | 941 setCompositorForTesting(mockCompositor); |
945 Vector<OwnPtr<WebCompositorAnimation> > result; | 942 Vector<OwnPtr<WebCompositorAnimation> > result; |
946 getAnimationOnCompositor(m_timing, *effect.get(), result); | 943 getAnimationOnCompositor(m_timing, *effect.get(), result); |
947 EXPECT_EQ(1U, result.size()); | 944 EXPECT_EQ(1U, result.size()); |
948 result[0].clear(); | 945 result[0].clear(); |
949 } | 946 } |
950 | 947 |
951 | 948 |
952 } // namespace blink | 949 } // namespace blink |
OLD | NEW |