diff options
| author | Leon Scroggins <scroggo@google.com> | 2011-01-12 10:54:47 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-12 10:54:47 -0800 |
| commit | c3ba040482a80ec39b5d1d391f367adbfd3f84e4 (patch) | |
| tree | 5d5c960c16fc9e826459ba769e878aa268ea914e /WebKit/android | |
| parent | 20b2d50821e99e931dc574a7348af84c63ac5988 (diff) | |
| parent | 0a506c68f4ad915ee62e7bf4f22f58b24d078d56 (diff) | |
| download | external_webkit-c3ba040482a80ec39b5d1d391f367adbfd3f84e4.zip external_webkit-c3ba040482a80ec39b5d1d391f367adbfd3f84e4.tar.gz external_webkit-c3ba040482a80ec39b5d1d391f367adbfd3f84e4.tar.bz2 | |
Merge "Make sure there is a focus before derefing it." into honeycomb
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 08508e0..76feacd 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -841,8 +841,8 @@ bool moveCursor(int keyCode, int count, bool ignoreScroll) root->setCursor(const_cast<CachedFrame*>(cachedFrame), const_cast<CachedNode*>(cachedNode)); const CachedNode* focus = root->currentFocus(); - bool clearTextEntry = cachedNode != focus - && focus->isTextInput(); + bool clearTextEntry = cachedNode != focus && focus + && cachedNode->nodePointer() != focus->nodePointer() && focus->isTextInput(); sendMoveMouseIfLatest(clearTextEntry); sendMoveSelection((WebCore::Frame*) cachedFrame->framePointer(), (WebCore::Node*) cachedNode->nodePointer()); |