diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-05 09:37:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-05 09:37:59 -0700 |
| commit | cc7f27228a13f253de0651478d67245e240a9dc6 (patch) | |
| tree | 000c38a2e744e9ea29a1e35f269c466091e940ba | |
| parent | 6452300d47d77d78e874862c5f7908746b04c1f8 (diff) | |
| parent | da713c0266664dc15b021e99cca31cadc5bd2bdc (diff) | |
| download | external_webkit-cc7f27228a13f253de0651478d67245e240a9dc6.zip external_webkit-cc7f27228a13f253de0651478d67245e240a9dc6.tar.gz external_webkit-cc7f27228a13f253de0651478d67245e240a9dc6.tar.bz2 | |
am da713c02: Fix a crash caused by navigating away from a page with your finger still down (when the old and new pages have touch event handlers installed) and then releasing your finger on the new page after WebCore has performed a garbage collection.
Merge commit 'da713c0266664dc15b021e99cca31cadc5bd2bdc' into froyo-plus-aosp
* commit 'da713c0266664dc15b021e99cca31cadc5bd2bdc':
Fix a crash caused by navigating away from a page with your finger still down (when the old and new pages have
| -rw-r--r-- | WebCore/page/EventHandler.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp index 6082cfe..5904934 100644 --- a/WebCore/page/EventHandler.cpp +++ b/WebCore/page/EventHandler.cpp @@ -221,6 +221,9 @@ void EventHandler::clear() m_capturingMouseEventsNode = 0; m_latchedWheelEventNode = 0; m_previousWheelScrolledNode = 0; +#if ENABLE(TOUCH_EVENTS) + m_originatingTouchPointTargets.clear(); +#endif } void EventHandler::selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults& result) |