Index: third_party/WebKit/Source/core/css/CSSCalculationValue.cpp |
diff --git a/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp b/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp |
index b1be505ebfaf3ce21ec9261daa6006076807f662..9de26efb3b8b69efcb0af21140d3941d32058da3 100644 |
--- a/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp |
+++ b/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp |
@@ -288,38 +288,39 @@ static const CalculationCategory addSubtractResult[CalcOther][CalcOther] = { |
/* CalcNumber */ {CalcNumber, CalcLengthNumber, CalcPercentNumber, |
CalcPercentNumber, CalcOther, CalcOther, CalcOther, |
CalcOther, CalcLengthNumber, CalcPercentLengthNumber}, |
- /* CalcLength */ {CalcLengthNumber, CalcLength, CalcPercentLength, |
- CalcOther, CalcPercentLength, CalcOther, CalcOther, |
- CalcOther, CalcLengthNumber, CalcPercentLengthNumber}, |
- /* CalcPercent */ {CalcPercentNumber, CalcPercentLength, CalcPercent, |
- CalcPercentNumber, CalcPercentLength, CalcOther, |
- CalcOther, CalcOther, CalcPercentLengthNumber, |
- CalcPercentLengthNumber}, |
- /* CalcPercentNumber */ {CalcPercentNumber, CalcPercentLengthNumber, |
- CalcPercentNumber, CalcPercentNumber, |
- CalcPercentLengthNumber, CalcOther, CalcOther, |
- CalcOther, CalcOther, CalcPercentLengthNumber}, |
- /* CalcPercentLength */ {CalcPercentLengthNumber, CalcPercentLength, |
- CalcPercentLength, CalcPercentLengthNumber, |
- CalcPercentLength, CalcOther, CalcOther, CalcOther, |
- CalcOther, CalcPercentLengthNumber}, |
- /* CalcAngle */ {CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, |
- CalcAngle, CalcOther, CalcOther, CalcOther, CalcOther}, |
- /* CalcTime */ {CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, |
- CalcOther, CalcTime, CalcOther, CalcOther, CalcOther}, |
- /* CalcFrequency */ {CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, |
- CalcOther, CalcOther, CalcFrequency, CalcOther, |
- CalcOther}, |
- /* CalcLengthNumber */ {CalcLengthNumber, CalcLengthNumber, |
- CalcPercentLengthNumber, CalcPercentLengthNumber, |
- CalcPercentLengthNumber, CalcOther, CalcOther, |
- CalcOther, CalcLengthNumber, |
- CalcPercentLengthNumber}, |
- /* CalcPercentLengthNumber */ { |
- CalcPercentLengthNumber, CalcPercentLengthNumber, |
- CalcPercentLengthNumber, CalcPercentLengthNumber, |
- CalcPercentLengthNumber, CalcOther, CalcOther, CalcOther, |
- CalcPercentLengthNumber, CalcPercentLengthNumber}}; |
+ /* CalcLength */ |
+ {CalcLengthNumber, CalcLength, CalcPercentLength, CalcOther, |
+ CalcPercentLength, CalcOther, CalcOther, CalcOther, CalcLengthNumber, |
+ CalcPercentLengthNumber}, |
+ /* CalcPercent */ |
+ {CalcPercentNumber, CalcPercentLength, CalcPercent, CalcPercentNumber, |
+ CalcPercentLength, CalcOther, CalcOther, CalcOther, |
+ CalcPercentLengthNumber, CalcPercentLengthNumber}, |
+ /* CalcPercentNumber */ |
+ {CalcPercentNumber, CalcPercentLengthNumber, CalcPercentNumber, |
+ CalcPercentNumber, CalcPercentLengthNumber, CalcOther, CalcOther, |
+ CalcOther, CalcOther, CalcPercentLengthNumber}, |
+ /* CalcPercentLength */ |
+ {CalcPercentLengthNumber, CalcPercentLength, CalcPercentLength, |
+ CalcPercentLengthNumber, CalcPercentLength, CalcOther, CalcOther, |
+ CalcOther, CalcOther, CalcPercentLengthNumber}, |
+ /* CalcAngle */ |
+ {CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, CalcAngle, |
+ CalcOther, CalcOther, CalcOther, CalcOther}, |
+ /* CalcTime */ |
+ {CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, CalcTime, |
+ CalcOther, CalcOther, CalcOther}, |
+ /* CalcFrequency */ |
+ {CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, CalcOther, |
+ CalcOther, CalcFrequency, CalcOther, CalcOther}, |
+ /* CalcLengthNumber */ |
+ {CalcLengthNumber, CalcLengthNumber, CalcPercentLengthNumber, |
+ CalcPercentLengthNumber, CalcPercentLengthNumber, CalcOther, CalcOther, |
+ CalcOther, CalcLengthNumber, CalcPercentLengthNumber}, |
+ /* CalcPercentLengthNumber */ |
+ {CalcPercentLengthNumber, CalcPercentLengthNumber, CalcPercentLengthNumber, |
+ CalcPercentLengthNumber, CalcPercentLengthNumber, CalcOther, CalcOther, |
+ CalcOther, CalcPercentLengthNumber, CalcPercentLengthNumber}}; |
static CalculationCategory determineCategory( |
const CSSCalcExpressionNode& leftSide, |