Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(426)

Side by Side Diff: sky/engine/core/animation/animatable/AnimatableLength.h

Issue 711203002: Remove zoom() and effectiveZoom(). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 20 matching lines...) Expand all
31 #ifndef AnimatableLength_h 31 #ifndef AnimatableLength_h
32 #define AnimatableLength_h 32 #define AnimatableLength_h
33 33
34 #include "core/animation/animatable/AnimatableValue.h" 34 #include "core/animation/animatable/AnimatableValue.h"
35 #include "platform/Length.h" 35 #include "platform/Length.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class AnimatableLength final : public AnimatableValue { 39 class AnimatableLength final : public AnimatableValue {
40 public: 40 public:
41 static PassRefPtr<AnimatableLength> create(const Length& length, float zoom) 41 static PassRefPtr<AnimatableLength> create(const Length& length)
42 { 42 {
43 return adoptRef(new AnimatableLength(length, zoom)); 43 return adoptRef(new AnimatableLength(length));
44 } 44 }
45 Length length(float zoom, ValueRange) const; 45 Length length(ValueRange) const;
46 46
47 protected: 47 protected:
48 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, do uble fraction) const override; 48 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, do uble fraction) const override;
49 49
50 private: 50 private:
51 static PassRefPtr<AnimatableLength> create(double pixels, double percent, bo ol hasPixels, bool hasPercent) 51 static PassRefPtr<AnimatableLength> create(double pixels, double percent, bo ol hasPixels, bool hasPercent)
52 { 52 {
53 return adoptRef(new AnimatableLength(pixels, percent, hasPixels, hasPerc ent)); 53 return adoptRef(new AnimatableLength(pixels, percent, hasPixels, hasPerc ent));
54 } 54 }
55 AnimatableLength(const Length&, float zoom); 55 AnimatableLength(const Length&);
56 AnimatableLength(double pixels, double percent, bool hasPixels, bool hasPerc ent) 56 AnimatableLength(double pixels, double percent, bool hasPixels, bool hasPerc ent)
57 : m_pixels(pixels) 57 : m_pixels(pixels)
58 , m_percent(percent) 58 , m_percent(percent)
59 , m_hasPixels(hasPixels) 59 , m_hasPixels(hasPixels)
60 , m_hasPercent(hasPercent) 60 , m_hasPercent(hasPercent)
61 { 61 {
62 ASSERT(m_hasPixels || m_hasPercent); 62 ASSERT(m_hasPixels || m_hasPercent);
63 } 63 }
64 virtual AnimatableType type() const override { return TypeLength; } 64 virtual AnimatableType type() const override { return TypeLength; }
65 virtual bool equalTo(const AnimatableValue*) const override; 65 virtual bool equalTo(const AnimatableValue*) const override;
66 66
67 virtual void trace(Visitor* visitor) override { AnimatableValue::trace(visit or); } 67 virtual void trace(Visitor* visitor) override { AnimatableValue::trace(visit or); }
68 68
69 double m_pixels; 69 double m_pixels;
70 double m_percent; 70 double m_percent;
71 bool m_hasPixels; 71 bool m_hasPixels;
72 bool m_hasPercent; 72 bool m_hasPercent;
73 }; 73 };
74 74
75 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableLength, isLength()); 75 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableLength, isLength());
76 76
77 } // namespace blink 77 } // namespace blink
78 78
79 #endif // AnimatableLength_h 79 #endif // AnimatableLength_h
OLDNEW
« no previous file with comments | « sky/engine/core/animation/KeyframeEffectModelTest.cpp ('k') | sky/engine/core/animation/animatable/AnimatableLength.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698