diff options
author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 22:20:34 +0000 |
---|---|---|
committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 22:20:34 +0000 |
commit | 983aa814985278db960d7186b1c39c3615d48870 (patch) | |
tree | 8244ad254061ff9abd0feeaf12785d28987c7ff1 /ui/base/events | |
parent | 4fe7a6cadfd1c9e988ba50e08a626c8f2a52a171 (diff) | |
download | chromium_src-983aa814985278db960d7186b1c39c3615d48870.zip chromium_src-983aa814985278db960d7186b1c39c3615d48870.tar.gz chromium_src-983aa814985278db960d7186b1c39c3615d48870.tar.bz2 |
Revert 185344 (horrible CL description)
> patch from issue 12321090
TBR=sadrul@chromium.org
Review URL: https://codereview.chromium.org/12382029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/events')
-rw-r--r-- | ui/base/events/event.cc | 11 | ||||
-rw-r--r-- | ui/base/events/event.h | 4 |
2 files changed, 0 insertions, 15 deletions
diff --git a/ui/base/events/event.cc b/ui/base/events/event.cc index ad26a24..079e5f7 100644 --- a/ui/base/events/event.cc +++ b/ui/base/events/event.cc @@ -679,17 +679,6 @@ void ScrollEvent::Scale(const float factor) { y_offset_ordinal_ *= factor; } -void ScrollEvent::UpdateForRootTransform(const gfx::Transform& root_transform) { - LocatedEvent::UpdateForRootTransform(root_transform); - gfx::DecomposedTransform decomp; - bool success = gfx::DecomposeTransform(&decomp, root_transform); - DCHECK(success); - if (decomp.scale[0]) - x_offset_ordinal_ /= decomp.scale[0]; - if (decomp.scale[1]) - y_offset_ordinal_ /= decomp.scale[1]; -} - //////////////////////////////////////////////////////////////////////////////// // GestureEvent diff --git a/ui/base/events/event.h b/ui/base/events/event.h index 95e34ce..a50823a 100644 --- a/ui/base/events/event.h +++ b/ui/base/events/event.h @@ -655,10 +655,6 @@ class UI_EXPORT ScrollEvent : public MouseEvent { float y_offset_ordinal() const { return y_offset_ordinal_; } int finger_count() const { return finger_count_; } - // Overridden from LocatedEvent. - virtual void UpdateForRootTransform( - const gfx::Transform& root_transform) OVERRIDE; - private: // Potential accelerated offsets. float x_offset_; |