diff options
author | Cary Clark <cary@android.com> | 2009-06-16 11:52:34 -0400 |
---|---|---|
committer | Cary Clark <cary@android.com> | 2009-06-16 11:52:34 -0400 |
commit | 6a43648b5e4b2aabf05b77e03601b8c7b70c0db8 (patch) | |
tree | ed96c62699b1215ada7a9016af941ea0c03c8bc9 /WebKit/android/nav | |
parent | 90bd422df8e04c486d29c4041acf1c4cf7c3b155 (diff) | |
download | external_webkit-6a43648b5e4b2aabf05b77e03601b8c7b70c0db8.zip external_webkit-6a43648b5e4b2aabf05b77e03601b8c7b70c0db8.tar.gz external_webkit-6a43648b5e4b2aabf05b77e03601b8c7b70c0db8.tar.bz2 |
fix webkit hidden cursor, address crash
http://b/issue?id=1918891
set cursor node hidden to 'true' to hide it
also fixing crash if detecting text address
runs out of text to look at
Diffstat (limited to 'WebKit/android/nav')
-rw-r--r-- | WebKit/android/nav/CacheBuilder.cpp | 2 | ||||
-rw-r--r-- | WebKit/android/nav/CachedNode.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp index d8d8076..7644873 100644 --- a/WebKit/android/nav/CacheBuilder.cpp +++ b/WebKit/android/nav/CacheBuilder.cpp @@ -2884,7 +2884,7 @@ bool CacheBuilder::ConstructTextRects(Text* node, int start, if ((int) textBox->end() >= start) break; } while ((textBox = textBox->nextTextBox()) != NULL); - if (ConstructTextRect(node, textBox, start, relEnd, + if (textBox && ConstructTextRect(node, textBox, start, relEnd, x, y, focusBounds, clipBounds, result) == false) return false; } diff --git a/WebKit/android/nav/CachedNode.cpp b/WebKit/android/nav/CachedNode.cpp index e7cab9e..cab1f15 100644 --- a/WebKit/android/nav/CachedNode.cpp +++ b/WebKit/android/nav/CachedNode.cpp @@ -211,7 +211,7 @@ void CachedNode::hideCursor(CachedFrame* parent) CachedFrame* child = const_cast<CachedFrame*>(parent->hasFrame(this)); child->hideCursor(); } - mIsHidden = false; + mIsHidden = true; } void CachedNode::init(WebCore::Node* node) |