diff options
| author | John Reck <jreck@google.com> | 2012-05-24 18:15:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-24 18:15:40 -0700 |
| commit | e0d7d53d0af7715347bc694de7b140773174149e (patch) | |
| tree | c423f0dbde9d6ec9d60495d4096a04f94059b369 /Source/WebCore/page | |
| parent | 3551374e25ca65d153ff3c3ffe7f7c79095d6025 (diff) | |
| parent | 8959907b97e269d7183d4817f295234718b41365 (diff) | |
| download | external_webkit-e0d7d53d0af7715347bc694de7b140773174149e.zip external_webkit-e0d7d53d0af7715347bc694de7b140773174149e.tar.gz external_webkit-e0d7d53d0af7715347bc694de7b140773174149e.tar.bz2 | |
am 8959907b: am 91f41286: Support skipping a touch stream due to lack of handlers
* commit '8959907b97e269d7183d4817f295234718b41365':
Support skipping a touch stream due to lack of handlers
Diffstat (limited to 'Source/WebCore/page')
| -rw-r--r-- | Source/WebCore/page/EventHandler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp index 45450b5..cbe01ed 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -3239,6 +3239,10 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event) ExceptionCode ec = 0; touchEventTarget->dispatchEvent(touchEvent.get(), ec); defaultPrevented |= touchEvent->defaultPrevented(); +#if PLATFORM(ANDROID) + if (touchEvent->hitTouchHandler()) + const_cast<PlatformTouchEvent&>(event).setHitTouchHandler(); +#endif } } |