am f0bfe1d7: am 44c05fb6: exclude from cache nodes that are entirely clipped out

Merge commit 'f0bfe1d72ffee56a7753afc2ea101e7266853bc9'

* commit 'f0bfe1d72ffee56a7753afc2ea101e7266853bc9':
  exclude from cache nodes that are entirely clipped out

1 files changed, 3 insertions, 6 deletions

diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index 219e4c6..522d381 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -1197,12 +1197,9 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame,
         }
         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;
-            }
+                continue; // skip this node if clip prevents all drawing
+            else if (cachedNode.clip(clip) == false)
+                continue; // skip this node if outside of the clip
         }
         cachedNode.setNavableRects();
         cachedNode.setExport(exported);