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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSCalculationValue.cpp

Issue 1376573004: Split out Color from CSSPrimitiveValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_property
Patch Set: Rebase and review feedback Created 5 years, 2 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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 case CSSPrimitiveValue::UnitType::ViewportHeight: 113 case CSSPrimitiveValue::UnitType::ViewportHeight:
114 case CSSPrimitiveValue::UnitType::ViewportMin: 114 case CSSPrimitiveValue::UnitType::ViewportMin:
115 case CSSPrimitiveValue::UnitType::ViewportMax: 115 case CSSPrimitiveValue::UnitType::ViewportMax:
116 case CSSPrimitiveValue::UnitType::DotsPerPixel: 116 case CSSPrimitiveValue::UnitType::DotsPerPixel:
117 case CSSPrimitiveValue::UnitType::DotsPerInch: 117 case CSSPrimitiveValue::UnitType::DotsPerInch:
118 case CSSPrimitiveValue::UnitType::DotsPerCentimeter: 118 case CSSPrimitiveValue::UnitType::DotsPerCentimeter:
119 case CSSPrimitiveValue::UnitType::Fraction: 119 case CSSPrimitiveValue::UnitType::Fraction:
120 case CSSPrimitiveValue::UnitType::Integer: 120 case CSSPrimitiveValue::UnitType::Integer:
121 return true; 121 return true;
122 case CSSPrimitiveValue::UnitType::Unknown: 122 case CSSPrimitiveValue::UnitType::Unknown:
123 case CSSPrimitiveValue::UnitType::RGBColor:
124 case CSSPrimitiveValue::UnitType::Calc: 123 case CSSPrimitiveValue::UnitType::Calc:
125 case CSSPrimitiveValue::UnitType::CalcPercentageWithNumber: 124 case CSSPrimitiveValue::UnitType::CalcPercentageWithNumber:
126 case CSSPrimitiveValue::UnitType::CalcPercentageWithLength: 125 case CSSPrimitiveValue::UnitType::CalcPercentageWithLength:
127 case CSSPrimitiveValue::UnitType::ValueID: 126 case CSSPrimitiveValue::UnitType::ValueID:
128 case CSSPrimitiveValue::UnitType::QuirkyEms: 127 case CSSPrimitiveValue::UnitType::QuirkyEms:
129 return false; 128 return false;
130 }; 129 };
131 ASSERT_NOT_REACHED(); 130 ASSERT_NOT_REACHED();
132 return false; 131 return false;
133 } 132 }
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 736
738 return expression ? adoptRefWillBeNoop(new CSSCalcValue(expression, range)) : nullptr; 737 return expression ? adoptRefWillBeNoop(new CSSCalcValue(expression, range)) : nullptr;
739 } 738 }
740 739
741 PassRefPtrWillBeRawPtr<CSSCalcValue> CSSCalcValue::create(PassRefPtrWillBeRawPtr <CSSCalcExpressionNode> expression, ValueRange range) 740 PassRefPtrWillBeRawPtr<CSSCalcValue> CSSCalcValue::create(PassRefPtrWillBeRawPtr <CSSCalcExpressionNode> expression, ValueRange range)
742 { 741 {
743 return adoptRefWillBeNoop(new CSSCalcValue(expression, range)); 742 return adoptRefWillBeNoop(new CSSCalcValue(expression, range));
744 } 743 }
745 744
746 } // namespace blink 745 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/core.gypi ('k') | third_party/WebKit/Source/core/css/CSSColorValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698