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

Side by Side Diff: Source/core/animation/animatable/AnimatableValueTestHelper.cpp

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 4 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
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 void PrintTo(const AnimatableColor& animColor, ::std::ostream* os) 47 void PrintTo(const AnimatableColor& animColor, ::std::ostream* os)
48 { 48 {
49 *os << "AnimatableColor(" 49 *os << "AnimatableColor("
50 << animColor.color().serialized().utf8().data() << ", " 50 << animColor.color().serialized().utf8().data() << ", "
51 << animColor.visitedLinkColor().serialized().utf8().data() << ")"; 51 << animColor.visitedLinkColor().serialized().utf8().data() << ")";
52 } 52 }
53 53
54 void PrintTo(const AnimatableImage& animImage, ::std::ostream* os) 54 void PrintTo(const AnimatableImage& animImage, ::std::ostream* os)
55 { 55 {
56 PrintTo(*(animImage.toCSSValue()), os, "AnimatableImage"); 56 PrintTo(animImage.toCSSValue(), os, "AnimatableImage");
57 } 57 }
58 58
59 void PrintTo(const AnimatableNeutral& animValue, ::std::ostream* os) 59 void PrintTo(const AnimatableNeutral& animValue, ::std::ostream* os)
60 { 60 {
61 *os << "AnimatableNeutral@" << &animValue; 61 *os << "AnimatableNeutral@" << &animValue;
62 } 62 }
63 63
64 void PrintTo(const AnimatableRepeatable& animValue, ::std::ostream* os) 64 void PrintTo(const AnimatableRepeatable& animValue, ::std::ostream* os)
65 { 65 {
66 *os << "AnimatableRepeatable("; 66 *os << "AnimatableRepeatable(";
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 } 141 }
142 *os << "]"; 142 *os << "]";
143 if (i < ops.size() - 1) 143 if (i < ops.size() - 1)
144 *os << ", "; 144 *os << ", ";
145 } 145 }
146 *os << ")"; 146 *os << ")";
147 } 147 }
148 148
149 void PrintTo(const AnimatableUnknown& animUnknown, ::std::ostream* os) 149 void PrintTo(const AnimatableUnknown& animUnknown, ::std::ostream* os)
150 { 150 {
151 PrintTo(*(animUnknown.toCSSValue().get()), os, "AnimatableUnknown"); 151 PrintTo(animUnknown.toCSSValue(), os, "AnimatableUnknown");
152 } 152 }
153 153
154 void PrintTo(const AnimatableVisibility& animVisibility, ::std::ostream* os) 154 void PrintTo(const AnimatableVisibility& animVisibility, ::std::ostream* os)
155 { 155 {
156 *os << "AnimatableVisibility("; 156 *os << "AnimatableVisibility(";
157 switch (animVisibility.visibility()) { 157 switch (animVisibility.visibility()) {
158 case VISIBLE: 158 case VISIBLE:
159 *os << "VISIBLE"; 159 *os << "VISIBLE";
160 break; 160 break;
161 case HIDDEN: 161 case HIDDEN:
(...skipping 30 matching lines...) Expand all
192 PrintTo(toAnimatableTransform(animValue), os); 192 PrintTo(toAnimatableTransform(animValue), os);
193 else if (animValue.isUnknown()) 193 else if (animValue.isUnknown())
194 PrintTo(toAnimatableUnknown(animValue), os); 194 PrintTo(toAnimatableUnknown(animValue), os);
195 else if (animValue.isVisibility()) 195 else if (animValue.isVisibility())
196 PrintTo(toAnimatableVisibility(animValue), os); 196 PrintTo(toAnimatableVisibility(animValue), os);
197 else 197 else
198 *os << "Unknown AnimatableValue - update ifelse chain in AnimatableValue TestHelper.h"; 198 *os << "Unknown AnimatableValue - update ifelse chain in AnimatableValue TestHelper.h";
199 } 199 }
200 200
201 } // namespace blink 201 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698