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

Side by Side Diff: Source/core/animation/animatable/AnimatableLength.h

Issue 986633002: Oilpan: fix build after r191432 (5bc98fff). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/css/resolver/FilterOperationResolver.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 26 matching lines...) Expand all
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 PassRefPtrWillBeRawPtr<AnimatableLength> create(const Length& length, float zoom) 41 static PassRefPtrWillBeRawPtr<AnimatableLength> create(const Length& length, float zoom)
42 { 42 {
43 return adoptRefWillBeNoop(new AnimatableLength(length, zoom)); 43 return adoptRefWillBeNoop(new AnimatableLength(length, zoom));
44 } 44 }
45 Length length(float zoom, ValueRange) const; 45 Length length(float zoom, ValueRange) const;
46 46
47 DEFINE_INLINE_VIRTUAL_TRACE() { AnimatableValue::trace(visitor); }
48
47 protected: 49 protected:
48 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab leValue*, double fraction) const override; 50 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab leValue*, double fraction) const override;
49 51
50 private: 52 private:
51 static PassRefPtrWillBeRawPtr<AnimatableLength> create(double pixels, double percent, bool hasPixels, bool hasPercent) 53 static PassRefPtrWillBeRawPtr<AnimatableLength> create(double pixels, double percent, bool hasPixels, bool hasPercent)
52 { 54 {
53 return adoptRefWillBeNoop(new AnimatableLength(pixels, percent, hasPixel s, hasPercent)); 55 return adoptRefWillBeNoop(new AnimatableLength(pixels, percent, hasPixel s, hasPercent));
54 } 56 }
55 AnimatableLength(const Length&, float zoom); 57 AnimatableLength(const Length&, float zoom);
56 AnimatableLength(double pixels, double percent, bool hasPixels, bool hasPerc ent) 58 AnimatableLength(double pixels, double percent, bool hasPixels, bool hasPerc ent)
57 : m_pixels(pixels) 59 : m_pixels(pixels)
58 , m_percent(percent) 60 , m_percent(percent)
59 , m_hasPixels(hasPixels) 61 , m_hasPixels(hasPixels)
60 , m_hasPercent(hasPercent) 62 , m_hasPercent(hasPercent)
61 { 63 {
62 ASSERT(m_hasPixels || m_hasPercent); 64 ASSERT(m_hasPixels || m_hasPercent);
63 } 65 }
64 virtual AnimatableType type() const override { return TypeLength; } 66 virtual AnimatableType type() const override { return TypeLength; }
65 virtual bool equalTo(const AnimatableValue*) const override; 67 virtual bool equalTo(const AnimatableValue*) const override;
66 68
67 DEFINE_INLINE_VIRTUAL_TRACE() { AnimatableValue::trace(visitor); }
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 | « no previous file | Source/core/css/resolver/FilterOperationResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698