From 620ba4ee88cc673af864c38ac3ca10ed3984c7ea Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Thu, 23 Dec 2010 14:47:34 -0500 Subject: [PATCH] use text slop for ring test The mTextSlop contains the cursor ring test area. The mTestBounds contains the total test area. Use the former when checking to see if text is drawn outside of the cursor rings, but inside the bounds. bug:3307120 Change-Id: Ice69ce3d70aabb435890a0fd8848ef3fe2de9796 --- WebKit/android/nav/CachedRoot.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp index 7bedd4fe4..0c92498e3 100644 --- a/WebKit/android/nav/CachedRoot.cpp +++ b/WebKit/android/nav/CachedRoot.cpp @@ -876,11 +876,11 @@ public: layers->getBounds().fRight, layers->getBounds().fBottom, collectGlyphs ? "true" : "false", mTestBounds.intersects(*layers) ? "true" : "false", - mTestBounds.contains(*layers) ? "true" : "false"); + mTextSlop.contains(*layers) ? "true" : "false"); if (collectGlyphs && layerType == kDrawGlyph_Type) { if (!mTestBounds.intersects(*layers)) continue; - if (!mTestBounds.contains(*layers)) + if (!mTextSlop.contains(*layers)) return false; foundGlyph = true; } -- 2.11.0