use one rectangle for browser focus ring

Check to see if the potentially larger hit-test bounds
can be used in place of the normal bounds, or if the
normal bounds can be used in place of the individual
text bounds.

Construct a region out of the individual focus ring
rectangles, then see if any text is drawn inside the
bounds but outside of the focus ring. If not, use one
rectangle instead of the rings.

1 files changed, 18 insertions, 2 deletions

diff --git a/WebKit/android/nav/CachedNode.cpp b/WebKit/android/nav/CachedNode.cpp
index b786677..07d3491 100644
--- a/WebKit/android/nav/CachedNode.cpp
+++ b/WebKit/android/nav/CachedNode.cpp
@@ -24,8 +24,8 @@
  */
 
 #include "CachedPrefix.h"
-#include "CachedFrame.h"
 #include "CachedHistory.h"
+#include "CachedRoot.h"
 #include "Node.h"
 #include "PlatformString.h"
 
@@ -78,13 +78,29 @@ bool CachedNode::clip(const WebCore::IntRect& bounds)
 
 #define OVERLAP 3
 
-void CachedNode::fixUpFocusRects()
+void CachedNode::fixUpFocusRects(const CachedRoot* root)
 {
     if (mFixedUpFocusRects)
         return;
     mFixedUpFocusRects = true;
+    // if the hit-test rect doesn't intersect any other rect, use it
+    if (mHitBounds != mBounds && mHitBounds.contains(mBounds) &&
+            root->checkRings(mFocusRing, mHitBounds)) {
+        DBG_NAV_LOGD("use mHitBounds (%d,%d,%d,%d)", mHitBounds.x(),
+            mHitBounds.y(), mHitBounds.width(), mHitBounds.height());
+        mUseHitBounds = true;
+        return;
+    }
     if (mNavableRects <= 1)
         return;
+    // if there is more than 1 rect, and the bounds doesn't intersect
+    // any other focus ring bounds, use it
+    if (root->checkRings(mFocusRing, mBounds)) {
+        DBG_NAV_LOGD("use mBounds (%d,%d,%d,%d)", mBounds.x(),
+            mBounds.y(), mBounds.width(), mBounds.height());
+        mUseBounds = true;
+        return;
+    }
 #if DEBUG_NAV_UI
     {
         WebCore::IntRect* boundsPtr = mFocusRing.begin() - 1;