Correct gesture scale and translation

Correct gesture scale and translation

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1996613002

Committed: https://skia.googlesource.com/skia/+/e46e4f075bfa8acf038aa68a8e7da282d4c1015b

[liyuqian, 2016-05-19 15:22:56]

Description was changed from

==========
Correct gesture scale and translation

BUG=skia:
==========

to

==========
Correct gesture scale and translation

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

[liyuqian, 2016-05-19 15:25:26]

Description was changed from

==========
Correct gesture scale and translation

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

to

==========
Correct gesture scale and translation

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

[liyuqian, 2016-05-19 15:25:27]

liyuqian@google.com changed reviewers:
+ djsollen@google.com, jvanverth@google.com

[liyuqian, 2016-05-19 15:28:00]

I've now corrected the gesture by:

1. Doing inverse transformation to the touch X/Y so our touch gesture would
follow our fingers.

2. Compensate X/Y translation offsets in case that the user swipe too far off
the canvas.

[djsollen, 2016-05-19 17:04:23]

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.cpp
File tools/viewer/Viewer.cpp (right):

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.cpp...
tools/viewer/Viewer.cpp:236: SkMatrix touchMatrixWithOffset;
I think you can do this computation by just applying the gesture matrix to m. 
Then just look at the current scale and translate on the matrix and if it would
cause the content to be scrolled off the screen then just translate it back onto
the screen.

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.cpp...
tools/viewer/Viewer.cpp:258: const SkRect contentRect =
fWindow->getContentRect();
on windows that don't return true for supportsContentRect() this will return an
empty rect.

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.cpp...
tools/viewer/Viewer.cpp:312: float castedY = (y -
fPreTouchMatrix.getTranslateY()) / fPreTouchMatrix.getScaleY();
SkPoint touchPoint = SkPoint::Make(x, y);
SkMatrix::mapPoints(&touchPoint, 1);

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.h
File tools/viewer/Viewer.h (right):

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.h#n...
tools/viewer/Viewer.h:60: SkMatrix               fPreTouchMatrix;
// identity unless the window initially scales the content to fit the screen.
fDefaultMatrix;

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.h#n...
tools/viewer/Viewer.h:64: };
I don't think we need to store this data.

[liyuqian, 2016-05-19 19:23:15]

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.cpp
File tools/viewer/Viewer.cpp (right):

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.cpp...
tools/viewer/Viewer.cpp:236: SkMatrix touchMatrixWithOffset;
On 2016/05/19 17:04:23, djsollen wrote:
> I think you can do this computation by just applying the gesture matrix to m. 
> Then just look at the current scale and translate on the matrix and if it
would
> cause the content to be scrolled off the screen then just translate it back
onto
> the screen.

Done.

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.cpp...
tools/viewer/Viewer.cpp:258: const SkRect contentRect =
fWindow->getContentRect();
On 2016/05/19 17:04:23, djsollen wrote:
> on windows that don't return true for supportsContentRect() this will return
an
> empty rect.

Done.

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.cpp...
tools/viewer/Viewer.cpp:312: float castedY = (y -
fPreTouchMatrix.getTranslateY()) / fPreTouchMatrix.getScaleY();
On 2016/05/19 17:04:23, djsollen wrote:
> SkPoint touchPoint = SkPoint::Make(x, y);
> SkMatrix::mapPoints(&touchPoint, 1);

Done.

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.h
File tools/viewer/Viewer.h (right):

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.h#n...
tools/viewer/Viewer.h:60: SkMatrix               fPreTouchMatrix;
On 2016/05/19 17:04:23, djsollen wrote:
> // identity unless the window initially scales the content to fit the screen.
> fDefaultMatrix;

Done.

https://codereview.chromium.org/1996613002/diff/20001/tools/viewer/Viewer.h#n...
tools/viewer/Viewer.h:64: };
On 2016/05/19 17:04:23, djsollen wrote:
> I don't think we need to store this data.

Done.

[djsollen, 2016-05-20 13:36:57]

lgtm with nit

https://codereview.chromium.org/1996613002/diff/40001/src/views/SkTouchGestur...
File src/views/SkTouchGesture.cpp (right):

https://codereview.chromium.org/1996613002/diff/40001/src/views/SkTouchGestur...
src/views/SkTouchGesture.cpp:346: SkPoint botRight =
fGlobalM.mapXY(fContentRect.fRight, fContentRect.fBottom);
SkRect scaledContent;
fGlobalM.mapRect(&scaledContent);

[liyuqian, 2016-05-20 14:10:57]

The CQ bit was checked by liyuqian@google.com

[liyuqian, 2016-05-20 14:10:57]

The patchset sent to the CQ was uploaded after l-g-t-m from djsollen@google.com
Link to the patchset: https://codereview.chromium.org/1996613002/#ps60001
(title: "nits")

[commit-bot: I haz the power, 2016-05-20 14:11:03]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1996613002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1996613002/60001

[commit-bot: I haz the power, 2016-05-20 14:32:22]

Description was changed from

==========
Correct gesture scale and translation

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...
==========

to

==========
Correct gesture scale and translation

BUG=skia:
GOLD_TRYBOT_URL=
https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&is...

Committed:
https://skia.googlesource.com/skia/+/e46e4f075bfa8acf038aa68a8e7da282d4c1015b
==========

[commit-bot: I haz the power, 2016-05-20 14:32:23]

Committed patchset #4 (id:60001) as
https://skia.googlesource.com/skia/+/e46e4f075bfa8acf038aa68a8e7da282d4c1015b