summaryrefslogtreecommitdiffstats
path: root/WebKit/android/nav
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-03-11 12:25:40 -0500
committerCary Clark <cary@android.com>2010-03-11 12:25:40 -0500
commitce45177cce324ce221946a93ef5c10827a7cc682 (patch)
tree5cc22576fd89e89b7913d60ed91d8c54a744c14d /WebKit/android/nav
parentd9b61293c215024b9b0a6263c4ea87a5867b0826 (diff)
downloadexternal_webkit-ce45177cce324ce221946a93ef5c10827a7cc682.zip
external_webkit-ce45177cce324ce221946a93ef5c10827a7cc682.tar.gz
external_webkit-ce45177cce324ce221946a93ef5c10827a7cc682.tar.bz2
fix nav algorithm when node is clipped
A fix for http://b/2319610 incorrectly retried finding nodes if the node was clipped, possibly causing infinite recursion. Leave all of the prior fix but only try once. I tested the prior test case and ensured that it still works. Change-Id: Ib229b6fc0ba57c131a8c1f33350982ac22a445c0 http://b/2501914
Diffstat (limited to 'WebKit/android/nav')
-rw-r--r--WebKit/android/nav/CachedRoot.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp
index daacbab..0941c7c 100644
--- a/WebKit/android/nav/CachedRoot.cpp
+++ b/WebKit/android/nav/CachedRoot.cpp
@@ -1198,7 +1198,6 @@ bool CachedRoot::maskIfHidden(BestData* best) const
best->setMouseBounds(WebCore::IntRect(bounds.x() + base.fLeft - kMargin,
bounds.y() + base.fTop - kMargin, base.width(), base.height()));
node->clip(best->mouseBounds());
- return true;
}
return false;
}