minor fixes to layer nav

- get rid of the FloatPoint interface in LayerAndroid;
use (x, y) instead
- make CachedFrame a friend of CachedRoot and CacheBuilder
a friend of CachedNode so they alone can access private fields.
- assume the LayerAndroid picture can sometimes be null.
If it is, use the main page's picture instead.

http://b/2369549

1 files changed, 3 insertions, 3 deletions

diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp
index 8fb335e..44f19c2 100644
--- a/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -205,16 +205,16 @@ void LayerAndroid::clipInner(SkTDArray<SkRect>* region,
         getChild(i)->clipInner(region, m_haveClip ? localBounds : local);
 }
 
-const LayerAndroid* LayerAndroid::find(FloatPoint pos) const
+const LayerAndroid* LayerAndroid::find(int x, int y) const
 {
     for (int i = 0; i < countChildren(); i++) {
-        const LayerAndroid* found = getChild(i)->find(pos);
+        const LayerAndroid* found = getChild(i)->find(x, y);
         if (found)
             return found;
     }
     SkRect localBounds;
     bounds(&localBounds);
-    if (localBounds.contains(pos))
+    if (localBounds.contains(x, y))
         return this;
     return 0;
 }