Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Unified Diff: ui/base/layout.cc

Issue 10959035: Revert 157906 - Don't return unsupported scales frrom GetScaleFactorFromScale() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/layout.h ('k') | ui/base/layout_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/layout.cc
===================================================================
--- ui/base/layout.cc (revision 157908)
+++ ui/base/layout.cc (working copy)
@@ -110,19 +110,16 @@
}
ScaleFactor GetScaleFactorFromScale(float scale) {
- ScaleFactor closest_match = SCALE_FACTOR_100P;
+ size_t closest_match = 0;
float smallest_diff = std::numeric_limits<float>::max();
- const std::vector<ScaleFactor>& supported =
- GetSupportedScaleFactorsInternal();
- for (size_t i = 0; i < supported.size(); ++i) {
- ScaleFactor scale_factor = supported[i];
- float diff = std::abs(kScaleFactorScales[scale_factor] - scale);
+ for (size_t i = 0; i < kScaleFactorScalesLength; ++i) {
+ float diff = std::abs(kScaleFactorScales[i] - scale);
if (diff < smallest_diff) {
- closest_match = scale_factor;
+ closest_match = i;
smallest_diff = diff;
}
}
- return closest_match;
+ return static_cast<ui::ScaleFactor>(closest_match);
}
float GetScaleFactorScale(ScaleFactor scale_factor) {
« no previous file with comments | « ui/base/layout.h ('k') | ui/base/layout_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698