am ac94ea1b: am 5f1379c6: Merge change I3aa3fc5b into eclair-mr2

Merge commit 'ac94ea1b6a7f61d693151647c572f1c33b2cdbf6'

* commit 'ac94ea1b6a7f61d693151647c572f1c33b2cdbf6':
  skip nodes when building nav cache if parents are clipped out

1 files changed, 8 insertions, 4 deletions

diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index 58be0e8..c77f7fc 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -1194,10 +1194,14 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame,
                 clip.intersect(parentClip);
             hasClip = true;
         }
-        if (hasClip && !clip.isEmpty() && cachedNode.clip(clip) == false) {
-            cachedNode.setBounds(clip);
-            cachedNode.cursorRings().append(clip);
-            isUnclipped = true;
+        if (hasClip) {
+            if (clip.isEmpty())
+                continue; // skip this node if completely clipped out
+            else if (cachedNode.clip(clip) == false) {
+                cachedNode.setBounds(clip);
+                cachedNode.cursorRings().append(clip);
+                isUnclipped = true;
+            }
         }
         cachedNode.setNavableRects();
         cachedNode.setChildFrameIndex(-1);