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

Unified Diff: ui/base/layout.cc

Issue 10946019: Don't return unsupported scales frrom GetScaleFactorFromScale() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix a typo in naming 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
Index: ui/base/layout.cc
diff --git a/ui/base/layout.cc b/ui/base/layout.cc
index 48bdab67de386a4dd7298d0a11ac4bee0f3e3e15..4ae7805f2a5328f2675c20ca32818b997df69472 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -110,16 +110,19 @@ DisplayLayout GetDisplayLayout() {
}
ScaleFactor GetScaleFactorFromScale(float scale) {
- size_t closest_match = 0;
+ ScaleFactor closest_match = SCALE_FACTOR_100P;
float smallest_diff = std::numeric_limits<float>::max();
- for (size_t i = 0; i < kScaleFactorScalesLength; ++i) {
- float diff = std::abs(kScaleFactorScales[i] - scale);
+ 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);
if (diff < smallest_diff) {
- closest_match = i;
+ closest_match = scale_factor;
smallest_diff = diff;
}
}
- return static_cast<ui::ScaleFactor>(closest_match);
+ return closest_match;
}
float GetScaleFactorScale(ScaleFactor scale_factor) {
« no previous file with comments | « ui/base/layout.h ('k') | ui/base/layout_unittest.cc » ('j') | ui/base/layout_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698