summaryrefslogtreecommitdiffstats
path: root/WebKit/android/nav/CachedRoot.cpp
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-04-22 13:37:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-22 13:37:01 -0700
commit3b7070b872ef123bcdd7e8798ff589f98cf37b2e (patch)
treec136ff260779db2af89250388b27765b227e00ad /WebKit/android/nav/CachedRoot.cpp
parentbde97c75e1086d7904ae93649c04111b80b87b8e (diff)
parent68b8e349574b5d6db35108cbb5236133b99eeaa6 (diff)
downloadexternal_webkit-3b7070b872ef123bcdd7e8798ff589f98cf37b2e.zip
external_webkit-3b7070b872ef123bcdd7e8798ff589f98cf37b2e.tar.gz
external_webkit-3b7070b872ef123bcdd7e8798ff589f98cf37b2e.tar.bz2
am 68b8e349: am 0f92e845: am 55ab51c0: Merge "nextTextField may walk off the end or try invalid frames" into froyo
Diffstat (limited to 'WebKit/android/nav/CachedRoot.cpp')
-rw-r--r--WebKit/android/nav/CachedRoot.cpp7
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)