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

Unified Diff: ash/display/multi_display_manager.cc

Issue 11081007: Remove implicit flooring Scale() method from Point and Size. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git try -b win_rel,mac_rel,linux_rel,linux_aura Created 8 years, 2 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 | « no previous file | ash/touch/touch_uma.cc » ('j') | content/browser/renderer_host/dip_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/multi_display_manager.cc
diff --git a/ash/display/multi_display_manager.cc b/ash/display/multi_display_manager.cc
index be5897c90e14893e1c93dace962d68a36e2ca8fa..828907024fc85a24cbcd21188245d31480c04b34 100644
--- a/ash/display/multi_display_manager.cc
+++ b/ash/display/multi_display_manager.cc
@@ -20,7 +20,9 @@
#include "ui/aura/window_property.h"
#include "ui/gfx/display.h"
#include "ui/gfx/screen.h"
+#include "ui/gfx/point_conversions.h"
#include "ui/gfx/rect.h"
+#include "ui/gfx/size_conversions.h"
#if defined(USE_X11)
#include "ui/base/x/x11_util.h"
@@ -406,7 +408,7 @@ void MultiDisplayManager::ScaleDisplayImpl() {
float factor = display.device_scale_factor() == 1.0f ? 2.0f : 1.0f;
display.SetScaleAndBounds(
factor, gfx::Rect(display.bounds_in_pixel().origin(),
- display.size().Scale(factor)));
+ gfx::ToFlooredSize(display.size().Scale(factor))));
new_displays.push_back(display);
}
OnNativeDisplaysChanged(new_displays);
« no previous file with comments | « no previous file | ash/touch/touch_uma.cc » ('j') | content/browser/renderer_host/dip_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698