diff options
| author | Cary Clark <cary@android.com> | 2011-01-10 11:03:38 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-10 11:03:38 -0800 |
| commit | 477f2da81667d4c0ba02df53a357efede4d8dd1a (patch) | |
| tree | 1c8e064ba158b34e515dcb66a44065470293bc6f | |
| parent | 86d8710a3e4638511b66e912975ea3ea81c74b9b (diff) | |
| parent | b41f6483040a4269f2761648f5fa528ca602df5d (diff) | |
| download | external_webkit-477f2da81667d4c0ba02df53a357efede4d8dd1a.zip external_webkit-477f2da81667d4c0ba02df53a357efede4d8dd1a.tar.gz external_webkit-477f2da81667d4c0ba02df53a357efede4d8dd1a.tar.bz2 | |
Merge "selectBestAt missing another null check" into honeycomb
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index a7a48cb..390879a 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -910,8 +910,7 @@ void selectBestAt(const WebCore::IntRect& rect) if (!node) { DBG_NAV_LOGD("no nodes found root=%p", root); m_viewImpl->m_hasCursorBounds = false; - if (root) - root->setCursor(0, 0); + root->setCursor(0, 0); viewInvalidate(); } else { DBG_NAV_LOGD("CachedNode:%p (%d)", node, node->index()); @@ -923,6 +922,8 @@ void selectBestAt(const WebCore::IntRect& rect) const_cast<CachedNode*>(node)); } sendMoveMouseIfLatest(false); + if (!node) + return; sendMoveSelection((WebCore::Frame*) frame->framePointer(), (WebCore::Node*) node->nodePointer()); } |