diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-05 10:08:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-05 10:08:02 -0700 |
| commit | 4190ab2847d07e62176dda30b40d24218e3fb505 (patch) | |
| tree | 1f20cc64268c4cdbf511d3806cc0b1343605e599 | |
| parent | ce99ade669370938eb363705f1ee543f40035c6d (diff) | |
| parent | cc7f27228a13f253de0651478d67245e240a9dc6 (diff) | |
| download | external_webkit-4190ab2847d07e62176dda30b40d24218e3fb505.zip external_webkit-4190ab2847d07e62176dda30b40d24218e3fb505.tar.gz external_webkit-4190ab2847d07e62176dda30b40d24218e3fb505.tar.bz2 | |
am cc7f2722: 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 'cc7f27228a13f253de0651478d67245e240a9dc6' into kraken
* commit 'cc7f27228a13f253de0651478d67245e240a9dc6':
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) |