don't combine single image bitmaps

Anchors and other links often contain multiple bitmaps, which must
be stitched together when analyzing the picture data to determine
if the anchor is fully visible, partially occluded, or fully hidden.
For instance, nine-patches in WebKit appear as adjacent bitmaps.

If a website design has two or more bitmaps adjacent to each other,
these may be mistakenly joined. By tracking whether the original
node contained exactly one img element, combining bitmaps based
on their location is avoided unncessarily.

bug:3373743
Change-Id: I5bcbdaec3097a2b839ee2444e512a0def6a016d0

1 files changed, 3 insertions, 2 deletions

diff --git a/WebKit/android/nav/CachedNode.cpp b/WebKit/android/nav/CachedNode.cpp
index 4ba7b48..e3ba34d 100644
--- a/WebKit/android/nav/CachedNode.cpp
+++ b/WebKit/android/nav/CachedNode.cpp
@@ -110,7 +110,7 @@ void CachedNode::fixUpCursorRects(const CachedFrame* frame)
     mFixedUpCursorRects = true;
     // if the hit-test rect doesn't intersect any other rect, use it
     if (mHitBounds != mBounds && mHitBounds.contains(mBounds) &&
-            frame->checkRings(this, mCursorRing, mBounds, mHitBounds)) {
+            frame->checkRings(this, mHitBounds)) {
         DBG_NAV_LOGD("use mHitBounds (%d,%d,%d,%d)", mHitBounds.x(),
             mHitBounds.y(), mHitBounds.width(), mHitBounds.height());
         mUseHitBounds = true;
@@ -122,7 +122,7 @@ void CachedNode::fixUpCursorRects(const CachedFrame* frame)
     // any other cursor ring bounds, use it
     IntRect sloppyBounds = mBounds;
     sloppyBounds.inflate(2); // give it a couple of extra pixels
-    if (frame->checkRings(this, mCursorRing, mBounds, sloppyBounds)) {
+    if (frame->checkRings(this, sloppyBounds)) {
         DBG_NAV_LOGD("use mBounds (%d,%d,%d,%d)", mBounds.x(),
             mBounds.y(), mBounds.width(), mBounds.height());
         mUseBounds = true;
@@ -424,6 +424,7 @@ void CachedNode::Debug::print() const
     DEBUG_PRINT_BOOL(mLast);
     DEBUG_PRINT_BOOL(mUseBounds);
     DEBUG_PRINT_BOOL(mUseHitBounds);
+    DEBUG_PRINT_BOOL(mSingleImage);
 }
 
 #endif