Change Monochrome media query evaluator

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

 /*
  * CSS Media Query Evaluator
  *
  * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 217 matching lines @@
   // Acording to spec, if the device does not use a color lookup table, the
   // value is zero.
   float number;
   return NumberValue(value, number) &&
          CompareValue(0, static_cast<int>(number), op);
 }
 
 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,
                                         MediaFeaturePrefix,
                                         const MediaValues& media_values) {
   // isValid() is false if there is no parameter. Without parameter we should
   // return true to indicate that displayModeMediaFeature is enabled in the
   // browser.
   if (!value.IsValid())
     return true;
@@ skipping 556 matching lines @@
   // Call the media feature evaluation function. Assume no prefix and let
   // trampoline functions override the prefix if prefix is used.
   EvalFunc func = g_function_map->at(expr.MediaFeature().Impl());
   if (func)
     return func(expr.ExpValue(), kNoPrefix, *media_values_);
 
   return false;
 }
 
 }  // namespace blink