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

Unified Diff: ui/base/layout.cc

Issue 11301007: Load the resources for max scale factor first. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 6fef499542c57632fb6afc58a7d821309ce5d193..674f76f079b7ceecb9fa0aad953a3f68784d7889 100644
--- a/ui/base/layout.cc
+++ b/ui/base/layout.cc
@@ -64,7 +64,7 @@ bool UseTouchOptimizedUI() {
}
#endif // defined(OS_WIN)
-const float kScaleFactorScales[] = {1.0f, 1.4f, 1.8f, 2.0f};
+const float kScaleFactorScales[] = {1.0f, 1.0f, 1.4f, 1.8f, 2.0f};
COMPILE_ASSERT(NUM_SCALE_FACTORS == arraysize(kScaleFactorScales),
kScaleFactorScales_incorrect_size);
const size_t kScaleFactorScalesLength = arraysize(kScaleFactorScales);
@@ -134,6 +134,7 @@ ScaleFactor GetScaleFactorFromScale(float scale) {
smallest_diff = diff;
}
}
+ DCHECK_NE(closest_match, SCALE_FACTOR_NONE);
return closest_match;
}

Powered by Google App Engine
This is Rietveld 408576698