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

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

Issue 1421533006: Make SVGLength wrap a CSSPrimitiveValue. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added expectation Created 5 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) 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 case CSSPrimitiveValue::UnitType::Percentage: 56 case CSSPrimitiveValue::UnitType::Percentage:
57 return CalcPercent; 57 return CalcPercent;
58 case CSSPrimitiveValue::UnitType::Ems: 58 case CSSPrimitiveValue::UnitType::Ems:
59 case CSSPrimitiveValue::UnitType::Exs: 59 case CSSPrimitiveValue::UnitType::Exs:
60 case CSSPrimitiveValue::UnitType::Pixels: 60 case CSSPrimitiveValue::UnitType::Pixels:
61 case CSSPrimitiveValue::UnitType::Centimeters: 61 case CSSPrimitiveValue::UnitType::Centimeters:
62 case CSSPrimitiveValue::UnitType::Millimeters: 62 case CSSPrimitiveValue::UnitType::Millimeters:
63 case CSSPrimitiveValue::UnitType::Inches: 63 case CSSPrimitiveValue::UnitType::Inches:
64 case CSSPrimitiveValue::UnitType::Points: 64 case CSSPrimitiveValue::UnitType::Points:
65 case CSSPrimitiveValue::UnitType::Picas: 65 case CSSPrimitiveValue::UnitType::Picas:
66 case CSSPrimitiveValue::UnitType::UserUnits:
66 case CSSPrimitiveValue::UnitType::Rems: 67 case CSSPrimitiveValue::UnitType::Rems:
67 case CSSPrimitiveValue::UnitType::Chs: 68 case CSSPrimitiveValue::UnitType::Chs:
68 case CSSPrimitiveValue::UnitType::ViewportWidth: 69 case CSSPrimitiveValue::UnitType::ViewportWidth:
69 case CSSPrimitiveValue::UnitType::ViewportHeight: 70 case CSSPrimitiveValue::UnitType::ViewportHeight:
70 case CSSPrimitiveValue::UnitType::ViewportMin: 71 case CSSPrimitiveValue::UnitType::ViewportMin:
71 case CSSPrimitiveValue::UnitType::ViewportMax: 72 case CSSPrimitiveValue::UnitType::ViewportMax:
72 return CalcLength; 73 return CalcLength;
73 case CSSPrimitiveValue::UnitType::Degrees: 74 case CSSPrimitiveValue::UnitType::Degrees:
74 case CSSPrimitiveValue::UnitType::Gradians: 75 case CSSPrimitiveValue::UnitType::Gradians:
75 case CSSPrimitiveValue::UnitType::Radians: 76 case CSSPrimitiveValue::UnitType::Radians:
(...skipping 18 matching lines...) Expand all
94 case CSSPrimitiveValue::UnitType::Ems: 95 case CSSPrimitiveValue::UnitType::Ems:
95 case CSSPrimitiveValue::UnitType::Exs: 96 case CSSPrimitiveValue::UnitType::Exs:
96 case CSSPrimitiveValue::UnitType::Chs: 97 case CSSPrimitiveValue::UnitType::Chs:
97 case CSSPrimitiveValue::UnitType::Rems: 98 case CSSPrimitiveValue::UnitType::Rems:
98 case CSSPrimitiveValue::UnitType::Pixels: 99 case CSSPrimitiveValue::UnitType::Pixels:
99 case CSSPrimitiveValue::UnitType::Centimeters: 100 case CSSPrimitiveValue::UnitType::Centimeters:
100 case CSSPrimitiveValue::UnitType::Millimeters: 101 case CSSPrimitiveValue::UnitType::Millimeters:
101 case CSSPrimitiveValue::UnitType::Inches: 102 case CSSPrimitiveValue::UnitType::Inches:
102 case CSSPrimitiveValue::UnitType::Points: 103 case CSSPrimitiveValue::UnitType::Points:
103 case CSSPrimitiveValue::UnitType::Picas: 104 case CSSPrimitiveValue::UnitType::Picas:
105 case CSSPrimitiveValue::UnitType::UserUnits:
104 case CSSPrimitiveValue::UnitType::Degrees: 106 case CSSPrimitiveValue::UnitType::Degrees:
105 case CSSPrimitiveValue::UnitType::Radians: 107 case CSSPrimitiveValue::UnitType::Radians:
106 case CSSPrimitiveValue::UnitType::Gradians: 108 case CSSPrimitiveValue::UnitType::Gradians:
107 case CSSPrimitiveValue::UnitType::Turns: 109 case CSSPrimitiveValue::UnitType::Turns:
108 case CSSPrimitiveValue::UnitType::Milliseconds: 110 case CSSPrimitiveValue::UnitType::Milliseconds:
109 case CSSPrimitiveValue::UnitType::Seconds: 111 case CSSPrimitiveValue::UnitType::Seconds:
110 case CSSPrimitiveValue::UnitType::Hertz: 112 case CSSPrimitiveValue::UnitType::Hertz:
111 case CSSPrimitiveValue::UnitType::Kilohertz: 113 case CSSPrimitiveValue::UnitType::Kilohertz:
112 case CSSPrimitiveValue::UnitType::ViewportWidth: 114 case CSSPrimitiveValue::UnitType::ViewportWidth:
113 case CSSPrimitiveValue::UnitType::ViewportHeight: 115 case CSSPrimitiveValue::UnitType::ViewportHeight:
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 738
737 return expression ? adoptRefWillBeNoop(new CSSCalcValue(expression, range)) : nullptr; 739 return expression ? adoptRefWillBeNoop(new CSSCalcValue(expression, range)) : nullptr;
738 } 740 }
739 741
740 PassRefPtrWillBeRawPtr<CSSCalcValue> CSSCalcValue::create(PassRefPtrWillBeRawPtr <CSSCalcExpressionNode> expression, ValueRange range) 742 PassRefPtrWillBeRawPtr<CSSCalcValue> CSSCalcValue::create(PassRefPtrWillBeRawPtr <CSSCalcExpressionNode> expression, ValueRange range)
741 { 743 {
742 return adoptRefWillBeNoop(new CSSCalcValue(expression, range)); 744 return adoptRefWillBeNoop(new CSSCalcValue(expression, range));
743 } 745 }
744 746
745 } // namespace blink 747 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698