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

Side by Side Diff: Source/core/css/CSSCalculationValueTest.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: Some small fixes to (hopefully) fix some broken tests Created 5 years, 6 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 lengthArray.resize(CSSPrimitiveValue::LengthUnitTypeCount); 67 lengthArray.resize(CSSPrimitiveValue::LengthUnitTypeCount);
68 for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; ++i) 68 for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; ++i)
69 lengthArray.at(i) = 0; 69 lengthArray.at(i) = 0;
70 } 70 }
71 71
72 CSSLengthArray& setLengthArray(CSSLengthArray& lengthArray, String text) 72 CSSLengthArray& setLengthArray(CSSLengthArray& lengthArray, String text)
73 { 73 {
74 initLengthArray(lengthArray); 74 initLengthArray(lengthArray);
75 RefPtrWillBeRawPtr<MutableStylePropertySet> propertySet = MutableStyleProper tySet::create(); 75 RefPtrWillBeRawPtr<MutableStylePropertySet> propertySet = MutableStyleProper tySet::create();
76 propertySet->setProperty(CSSPropertyLeft, text); 76 propertySet->setProperty(CSSPropertyLeft, text);
77 toCSSPrimitiveValue(propertySet->getPropertyCSSValue(CSSPropertyLeft).get()) ->accumulateLengthArray(lengthArray); 77 toCSSPrimitiveValue(propertySet->getPropertyCSSValue(CSSPropertyLeft))->accu mulateLengthArray(lengthArray);
78 return lengthArray; 78 return lengthArray;
79 } 79 }
80 80
81 bool lengthArraysEqual(CSSLengthArray& a, CSSLengthArray& b) 81 bool lengthArraysEqual(CSSLengthArray& a, CSSLengthArray& b)
82 { 82 {
83 for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; ++i) { 83 for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; ++i) {
84 if (a.at(i) != b.at(i)) 84 if (a.at(i) != b.at(i))
85 return false; 85 return false;
86 } 86 }
87 return true; 87 return true;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 expectation.at(CSSPrimitiveValue::UnitTypePercentage) = 10; 189 expectation.at(CSSPrimitiveValue::UnitTypePercentage) = 10;
190 EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc(1in + 10% - 6px)"))); 190 EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc(1in + 10% - 6px)")));
191 191
192 expectation.at(CSSPrimitiveValue::UnitTypePixels) = 15; 192 expectation.at(CSSPrimitiveValue::UnitTypePixels) = 15;
193 expectation.at(CSSPrimitiveValue::UnitTypeFontSize) = 20; 193 expectation.at(CSSPrimitiveValue::UnitTypeFontSize) = 20;
194 expectation.at(CSSPrimitiveValue::UnitTypePercentage) = -40; 194 expectation.at(CSSPrimitiveValue::UnitTypePercentage) = -40;
195 EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc((1 * 2) * (5px + 20em / 2) - 80% / (3 - 1) + 5px)"))); 195 EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc((1 * 2) * (5px + 20em / 2) - 80% / (3 - 1) + 5px)")));
196 } 196 }
197 197
198 } 198 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698