diff options
author | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 23:19:05 +0000 |
---|---|---|
committer | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 23:19:05 +0000 |
commit | 868a991423fb2212a2cbc750dded5c8593ef21b8 (patch) | |
tree | fc291871750db0e0bdc84e41a0865e3da6188903 /ash/magnifier | |
parent | ef2aeebbda0eb9fbda2cb73c373ca84e9f59fecc (diff) | |
download | chromium_src-868a991423fb2212a2cbc750dded5c8593ef21b8.zip chromium_src-868a991423fb2212a2cbc750dded5c8593ef21b8.tar.gz chromium_src-868a991423fb2212a2cbc750dded5c8593ef21b8.tar.bz2 |
Magnification controller: fix incorrect point of interest.
MagnificationControllerImpl::OnMouseEvent() should not update
point of interest for mouse events of type ET_MOUSE_CAPTURE_CHANGED
because they do not contain valid coordinates.
BUG=312496
TEST=verified cursor no longer jumps
R=oshima@chromium.org
Review URL: https://codereview.chromium.org/160953002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
-rw-r--r-- | ash/magnifier/magnification_controller.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 8aa40a5..c17dbc5 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -554,7 +554,8 @@ void MagnificationControllerImpl::OnMouseEvent(ui::MouseEvent* event) { if (root_bounds.Contains(event->root_location())) { // This must be before |SwitchTargetRootWindow()|. - point_of_interest_ = event->root_location(); + if (event->type() != ui::ET_MOUSE_CAPTURE_CHANGED) + point_of_interest_ = event->root_location(); if (current_root != root_window_) { DCHECK(current_root); |