diff options
| author | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 19:24:13 +0000 |
|---|---|---|
| committer | tdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-19 19:24:13 +0000 |
| commit | 796a057a02bec4ab54177305e9f939b700f38cb7 (patch) | |
| tree | a67b6178a4a71728a1ff8efa5051c1b0e4d118bb /content/common | |
| parent | 8e9d06bde2ec44fe5a27b0eda6da933f170b92bc (diff) | |
| download | chromium_src-796a057a02bec4ab54177305e9f939b700f38cb7.zip chromium_src-796a057a02bec4ab54177305e9f939b700f38cb7.tar.gz chromium_src-796a057a02bec4ab54177305e9f939b700f38cb7.tar.bz2 | |
Pinch begin and pinch end gestures ignore their ack dispositions.
BUG=302852
TEST=ImmediateInputRouterTest.GestureTypesIgnoringAck
Review URL: https://codereview.chromium.org/73023003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
| -rw-r--r-- | content/common/input/web_input_event_traits.cc | 4 | ||||
| -rw-r--r-- | content/common/input/web_input_event_traits.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/content/common/input/web_input_event_traits.cc b/content/common/input/web_input_event_traits.cc index 08d66ba..53f1756 100644 --- a/content/common/input/web_input_event_traits.cc +++ b/content/common/input/web_input_event_traits.cc @@ -287,7 +287,9 @@ bool WebInputEventTraits::IgnoresAckDisposition( blink::WebInputEvent::Type type) { return type == WebInputEvent::GestureTapDown || type == WebInputEvent::GestureShowPress || - type == WebInputEvent::GestureTapCancel; + type == WebInputEvent::GestureTapCancel || + type == WebInputEvent::GesturePinchBegin || + type == WebInputEvent::GesturePinchEnd; } } // namespace content diff --git a/content/common/input/web_input_event_traits.h b/content/common/input/web_input_event_traits.h index efacee5..9751fc0 100644 --- a/content/common/input/web_input_event_traits.h +++ b/content/common/input/web_input_event_traits.h @@ -12,7 +12,7 @@ namespace content { // Utility class for performing operations on and with WebInputEvents. -class WebInputEventTraits { +class CONTENT_EXPORT WebInputEventTraits { public: static const char* GetName(blink::WebInputEvent::Type type); static size_t GetSize(blink::WebInputEvent::Type type); |