Change Monochrome media query evaluator

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

Index: third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
diff --git a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
index 5de5c47dbe03711ef477f3e10437fd0603ae84dc..99238ea20c383fbeaf1c5e31d106f8c513053c0d 100644
--- a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
+++ b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
@@ -235,16 +235,13 @@ static bool ColorIndexMediaFeatureEval(const MediaQueryExpValue& value,
 static bool MonochromeMediaFeatureEval(const MediaQueryExpValue& value,
                                        MediaFeaturePrefix op,
                                        const MediaValues& media_values) {
-  if (!media_values.MonochromeBitsPerComponent()) {
-    if (value.IsValid()) {
-      float number;
-      return NumberValue(value, number) &&
-             CompareValue(0, static_cast<int>(number), op);
-    }
-    return false;
+  float number;

[rune, 2017/05/04 20:52:37]

Nit: I think I'd put this declaration inside the if-block.

+  int bits_per_component = media_values.MonochromeBitsPerComponent();
+  if (value.IsValid()) {
+    return NumberValue(value, number) &&
+           CompareValue(bits_per_component, static_cast<int>(number), op);
   }
-
-  return ColorMediaFeatureEval(value, op, media_values);
+  return bits_per_component != 0;
 }
 
 static bool DisplayModeMediaFeatureEval(const MediaQueryExpValue& value,