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

Unified Diff: services/ui/ws/touch_controller.cc

Issue 2497303002: Fix ws::Display initialization order. (Closed)
Patch Set: Fix method name. Created 4 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: services/ui/ws/touch_controller.cc
diff --git a/services/ui/ws/touch_controller.cc b/services/ui/ws/touch_controller.cc
index 2037b6fa5a151b5ced13a7b3dea5e5dabf9e659f..9f8e6d0f96c67406d495a464aa0cb6429f7ba5cf 100644
--- a/services/ui/ws/touch_controller.cc
+++ b/services/ui/ws/touch_controller.cc
@@ -23,7 +23,7 @@ namespace {
// Computes the scale ratio for the TouchEvent's radius.
double ComputeTouchResolutionScale(const Display* touch_display,
const ui::TouchscreenDevice& touch_device) {
- gfx::Size touch_display_size = touch_display->GetSize();
+ gfx::Size touch_display_size = touch_display->GetPixelSize();
if (touch_device.size.IsEmpty() || touch_display_size.IsEmpty())
return 1.0;
@@ -40,7 +40,7 @@ double ComputeTouchResolutionScale(const Display* touch_display,
gfx::Transform ComputeTouchTransform(
const Display* touch_display,
const ui::TouchscreenDevice& touch_device) {
- gfx::Size touch_display_size = touch_display->GetSize();
+ gfx::Size touch_display_size = touch_display->GetPixelSize();
gfx::SizeF current_size(touch_display_size);
gfx::SizeF touch_area(touch_device.size);

Powered by Google App Engine
This is Rietveld 408576698