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

Unified Diff: content/browser/renderer_host/render_widget_host_view_win.cc

Issue 12379040: Revert 185474 -- speculative. browser_tests stopped starting up on all (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | ui/base/win/dpi.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_win.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_view_win.cc (revision 185501)
+++ content/browser/renderer_host/render_widget_host_view_win.cc (working copy)
@@ -2072,9 +2072,8 @@
bool WebTouchState::UpdateTouchPoint(
WebKit::WebTouchPoint* touch_point,
TOUCHINPUT* touch_input) {
- CPoint coordinates(
- TOUCH_COORD_TO_PIXEL(touch_input->x) / ui::win::GetDPIScaleFromRegistry(),
- TOUCH_COORD_TO_PIXEL(touch_input->y) / ui::win::GetDPIScaleFromRegistry());
+ CPoint coordinates(TOUCH_COORD_TO_PIXEL(touch_input->x),
+ TOUCH_COORD_TO_PIXEL(touch_input->y));
int radius_x = 1;
int radius_y = 1;
if (touch_input->dwMask & TOUCHINPUTMASKF_CONTACTAREA) {
@@ -2141,8 +2140,8 @@
if (total == 1 && (points[0].dwFlags & TOUCHEVENTF_DOWN)) {
pointer_down_context_ = true;
last_touch_location_ = gfx::Point(
- TOUCH_COORD_TO_PIXEL(points[0].x) / ui::win::GetDPIScaleFromRegistry(),
- TOUCH_COORD_TO_PIXEL(points[0].y) / ui::win::GetDPIScaleFromRegistry());
+ TOUCH_COORD_TO_PIXEL(points[0].x),
+ TOUCH_COORD_TO_PIXEL(points[0].y));
}
bool should_forward = render_widget_host_->ShouldForwardTouchEvent() &&
« no previous file with comments | « no previous file | ui/base/win/dpi.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698