diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-25 16:39:27 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-25 16:39:27 -0400 |
| commit | 5ca6cb36d22a6a75bc18215b53ebc58d39ae4dd8 (patch) | |
| tree | 063631d5e8c1ab18f16b2d8029e7b65ee1bea4fb /WebCore | |
| parent | 01eae5621621a976f228f5f41c49967a356209cd (diff) | |
| parent | 9abf45709677b84106fec0215d84b4a65562cff3 (diff) | |
| download | external_webkit-5ca6cb36d22a6a75bc18215b53ebc58d39ae4dd8.zip external_webkit-5ca6cb36d22a6a75bc18215b53ebc58d39ae4dd8.tar.gz external_webkit-5ca6cb36d22a6a75bc18215b53ebc58d39ae4dd8.tar.bz2 | |
Merge change 27080 into eclair
* changes:
When detach the top Document, clean up the touch listeners and reset needTouchEvents.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/dom/Document.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index e86cbc0..e4c5741 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -1394,6 +1394,17 @@ void Document::detach() FrameView* view = m_frame->view(); if (view) view->detachCustomScrollbars(); + +#if ENABLE(TOUCH_EVENTS) // Android + // clean up for the top document + if (!m_frame->ownerElement()) { + m_touchEventListeners.clear(); +#if PLATFORM(ANDROID) + if (view) + android::WebViewCore::getWebViewCore(view)->needTouchEvents(false); +#endif + } +#endif } // indicate destruction mode, i.e. attached() but renderer == 0 |