Don't return unsupported scales frrom GetScaleFactorFromScale()

ui/base/layout.cc

Index: ui/base/layout.cc
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index 48bdab67de386a4dd7298d0a11ac4bee0f3e3e15..581225b829ca82a0c83129c1a8eff7000d25711e 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -113,13 +113,15 @@ ScaleFactor GetScaleFactorFromScale(float scale) {
   size_t closest_match = 0;
   float smallest_diff =  std::numeric_limits<float>::max();
   for (size_t i = 0; i < kScaleFactorScalesLength; ++i) {
+    if (!IsScaleFactorSupported(static_cast<ScaleFactor>(i)))

[pkotwicz, 2012/09/19 21:05:17]

Nit: iterate through the scale factors you get from GetSupportedScaleFactors()
rather than doing this, it is more efficient.

[Xianzhu, 2012/09/19 21:38:23]

Oops I should have made that kind of change :)

+      continue;
     float diff = std::abs(kScaleFactorScales[i] - scale);
     if (diff < smallest_diff) {
       closest_match = i;
       smallest_diff = diff;
     }
   }
-  return static_cast<ui::ScaleFactor>(closest_match);
+  return static_cast<ScaleFactor>(closest_match);
 }
 
 float GetScaleFactorScale(ScaleFactor scale_factor) {