diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-01-12 14:24:15 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-12 14:24:15 -0800 |
| commit | bff5134a8a9abe4932cf2a1a26b5d827f75d5e17 (patch) | |
| tree | afb96f1476bbfafc7d34d928f0b3890689708d42 /WebKit/android | |
| parent | b12e415358bcbd05620d883de6476579b46b1203 (diff) | |
| parent | ddd2f469835ed5402cb3edfa6c2865536011fbab (diff) | |
| download | external_webkit-bff5134a8a9abe4932cf2a1a26b5d827f75d5e17.zip external_webkit-bff5134a8a9abe4932cf2a1a26b5d827f75d5e17.tar.gz external_webkit-bff5134a8a9abe4932cf2a1a26b5d827f75d5e17.tar.bz2 | |
am ddd2f469: am ab9c9800: Merge "Compare Node pointers rather than CachedNode pointers." into eclair-mr2
Merge commit 'ddd2f469835ed5402cb3edfa6c2865536011fbab'
* commit 'ddd2f469835ed5402cb3edfa6c2865536011fbab':
Compare Node pointers rather than CachedNode pointers.
Diffstat (limited to 'WebKit/android')
| -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 60113b8..8931d72 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -622,8 +622,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!"); |