Fix double comparisons for Media Queries

third_party/WebKit/Source/core/css/MediaValues.cpp

Index: third_party/WebKit/Source/core/css/MediaValues.cpp
diff --git a/third_party/WebKit/Source/core/css/MediaValues.cpp b/third_party/WebKit/Source/core/css/MediaValues.cpp
index 6f7cbc2e76af5ac3df02db59c7f97d62cad15fd9..8068834b03a6aa5a6cb37658f407f2cb5f265e8e 100644
--- a/third_party/WebKit/Source/core/css/MediaValues.cpp
+++ b/third_party/WebKit/Source/core/css/MediaValues.cpp
@@ -159,60 +159,54 @@ bool MediaValues::computeLengthImpl(double value, CSSPrimitiveValue::UnitType ty
     // CSSToLengthConversionData::zoomedComputedPixels() more generic (to solve both cases) without hurting performance.
 
     // FIXME - Unite the logic here with CSSToLengthConversionData in a performant way.
-    double factor = 0;
     switch (type) {
     case CSSPrimitiveValue::UnitType::Ems:
     case CSSPrimitiveValue::UnitType::Rems:
-        factor = defaultFontSize;
-        break;
+        result = value * defaultFontSize;
+        return true;
     case CSSPrimitiveValue::UnitType::Pixels:
     case CSSPrimitiveValue::UnitType::UserUnits:
-        factor = 1;
-        break;
+        result = value;
+        return true;
     case CSSPrimitiveValue::UnitType::Exs:
         // FIXME: We have a bug right now where the zoom will be applied twice to EX units.
-        // FIXME: We don't seem to be able to cache fontMetrics related values.
-        // Trying to access them is triggering some sort of microtask. Serving the spec's default instead.
-        factor = defaultFontSize / 2.0;
-        break;
     case CSSPrimitiveValue::UnitType::Chs:
         // FIXME: We don't seem to be able to cache fontMetrics related values.
-        // Trying to access them is triggering some sort of microtask. Serving the (future) spec default instead.
-        factor = defaultFontSize / 2.0;
-        break;
+        // Trying to access them is triggering some sort of microtask. Serving the spec's default instead.
+        result = (value * defaultFontSize) / 2.0;
+        return true;
     case CSSPrimitiveValue::UnitType::ViewportWidth:
-        factor = viewportWidth / 100.0;
-        break;
+        result = (value * viewportWidth) / 100.0;
+        return true;
     case CSSPrimitiveValue::UnitType::ViewportHeight:
-        factor = viewportHeight / 100.0;
-        break;
+        result = (value * viewportHeight) / 100.0;
+        return true;
     case CSSPrimitiveValue::UnitType::ViewportMin:
-        factor = std::min(viewportWidth, viewportHeight) / 100.0;
-        break;
+        result = (value * std::min(viewportWidth, viewportHeight)) / 100.0;
+        return true;
     case CSSPrimitiveValue::UnitType::ViewportMax:
-        factor = std::max(viewportWidth, viewportHeight) / 100.0;
-        break;
+        result = (value * std::max(viewportWidth, viewportHeight)) / 100.0;
+        return true;
     case CSSPrimitiveValue::UnitType::Centimeters:
-        factor = cssPixelsPerCentimeter;
-        break;
+        result = value * cssPixelsPerCentimeter;
+        return true;
     case CSSPrimitiveValue::UnitType::Millimeters:
-        factor = cssPixelsPerMillimeter;
-        break;
+        result = value * cssPixelsPerMillimeter;
+        return true;
     case CSSPrimitiveValue::UnitType::Inches:
-        factor = cssPixelsPerInch;
-        break;
+        result = value * cssPixelsPerInch;
+        return true;
     case CSSPrimitiveValue::UnitType::Points:
-        factor = cssPixelsPerPoint;
-        break;
+        result = value * cssPixelsPerPoint;
+        return true;
     case CSSPrimitiveValue::UnitType::Picas:
-        factor = cssPixelsPerPica;
-        break;
+        result = value * cssPixelsPerPica;
+        return true;
     default:
         return false;
     }
 
-    ASSERT(factor >= 0);
-    result = value * factor;
+    NOTREACHED();
     return true;

[rune, 2016/04/20 07:39:25]

If you just remove NOTREACHED() and the return statement, the compiler will take
care of the NOTREACHED() part.

[Yoav Weiss, 2016/04/20 09:50:23]

done

 }