diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-20 19:01:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-20 19:01:48 -0800 |
| commit | bfcc13fc3ee6845e9f78ca7c5313d483c9fd56c9 (patch) | |
| tree | a1d95d8615b64e0d3f9a98c6eed1e20a24f27f0e | |
| parent | 67c90537fc70147ad8943f0a2cd02def405bcf8f (diff) | |
| parent | 0a3f01ac5e5855c3563694671091d4c1ce89cac5 (diff) | |
| download | external_webkit-bfcc13fc3ee6845e9f78ca7c5313d483c9fd56c9.zip external_webkit-bfcc13fc3ee6845e9f78ca7c5313d483c9fd56c9.tar.gz external_webkit-bfcc13fc3ee6845e9f78ca7c5313d483c9fd56c9.tar.bz2 | |
am 0a3f01ac: Merge "DO NOT MERGE" into eclair-mr2
Merge commit '0a3f01ac5e5855c3563694671091d4c1ce89cac5' into eclair-mr2-plus-aosp
* commit '0a3f01ac5e5855c3563694671091d4c1ce89cac5':
DO NOT MERGE
| -rw-r--r-- | WebCore/dom/Document.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index 85966d7..f146761 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -1489,7 +1489,8 @@ void Document::detach() #if ENABLE(TOUCH_EVENTS) // Android // clean up for the top document - if (!m_frame->ownerElement()) { + Page* ownerPage = page(); + if (ownerPage && (m_frame == ownerPage->mainFrame())) { m_touchEventListeners.clear(); #if PLATFORM(ANDROID) if (view) |