diff options
| author | Cary Clark <cary@android.com> | 2010-04-22 13:24:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-22 13:24:19 -0700 |
| commit | 68b8e349574b5d6db35108cbb5236133b99eeaa6 (patch) | |
| tree | 7c08fce0e3ae0295ddde48b7ce578025db7f52d1 /WebKit/android/nav/CachedRoot.cpp | |
| parent | 3c27e79b9a94ccd27938cffbf5abcef20f5716f5 (diff) | |
| parent | 0f92e845ed6499088958acf229f196ad67965f63 (diff) | |
| download | external_webkit-68b8e349574b5d6db35108cbb5236133b99eeaa6.zip external_webkit-68b8e349574b5d6db35108cbb5236133b99eeaa6.tar.gz external_webkit-68b8e349574b5d6db35108cbb5236133b99eeaa6.tar.bz2 | |
am 0f92e845: am 55ab51c0: Merge "nextTextField may walk off the end or try invalid frames" into froyo
Merge commit '0f92e845ed6499088958acf229f196ad67965f63' into kraken
* commit '0f92e845ed6499088958acf229f196ad67965f63':
nextTextField may walk off the end or try invalid frames
Diffstat (limited to 'WebKit/android/nav/CachedRoot.cpp')
| -rw-r--r-- | WebKit/android/nav/CachedRoot.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp index 71c0993..115a0f9 100644 --- a/WebKit/android/nav/CachedRoot.cpp +++ b/WebKit/android/nav/CachedRoot.cpp @@ -1288,6 +1288,13 @@ const CachedNode* CachedRoot::moveCursor(Direction direction, const CachedFrame* return const_cast<CachedNode*>(bestData.mNode); } +const CachedNode* CachedRoot::nextTextField(const CachedNode* start, + const CachedFrame** framePtr) const +{ + bool startFound = false; + return CachedFrame::nextTextField(start, framePtr, &startFound); +} + SkPicture* CachedRoot::pictureAt(int x, int y) const { #if USE(ACCELERATED_COMPOSITING) |