diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-01-12 14:21:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-12 14:21:37 -0800 |
| commit | ddd2f469835ed5402cb3edfa6c2865536011fbab (patch) | |
| tree | 363034aba6a0078901b59b49bdf566464ad4bf28 | |
| parent | 8752c4d3c7d623f1f6314e8b662d3626c849ca97 (diff) | |
| parent | ab9c9800ae22385fd019e1f6a366fc5346d041aa (diff) | |
| download | external_webkit-ddd2f469835ed5402cb3edfa6c2865536011fbab.zip external_webkit-ddd2f469835ed5402cb3edfa6c2865536011fbab.tar.gz external_webkit-ddd2f469835ed5402cb3edfa6c2865536011fbab.tar.bz2 | |
am ab9c9800: Merge "Compare Node pointers rather than CachedNode pointers." into eclair-mr2
Merge commit 'ab9c9800ae22385fd019e1f6a366fc5346d041aa' into eclair-mr2-plus-aosp
* commit 'ab9c9800ae22385fd019e1f6a366fc5346d041aa':
Compare Node pointers rather than CachedNode pointers.
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index e379a63..0426337 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -626,8 +626,8 @@ CachedRoot* getFrameCache(FrameCachePermission allowNewer) fixCursor(); if (oldFocus && m_frameCacheUI) { const CachedNode* newFocus = m_frameCacheUI->currentFocus(); - if (newFocus && oldFocus != newFocus && newFocus->isTextInput() - && oldFocus->isTextInput() + if (newFocus && oldFocus->nodePointer() != newFocus->nodePointer() + && oldFocus->isTextInput() && newFocus->isTextInput() && newFocus != m_frameCacheUI->currentCursor()) { // The focus has changed. We may need to update things. LOG_ASSERT(m_javaGlue.m_obj, "A java object was not associated with this native WebView!"); |