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

2 files changed, 4 insertions, 6 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;
 }
diff --git a/WebCore/platform/graphics/android/LayerAndroid.h b/WebCore/platform/graphics/android/LayerAndroid.h
index deb51bc..841eeb8 100644
--- a/WebCore/platform/graphics/android/LayerAndroid.h
+++ b/WebCore/platform/graphics/android/LayerAndroid.h
@@ -19,7 +19,6 @@
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "FloatPoint.h"
 #include "RefPtr.h"
 #include "SkColor.h"
 #include "SkLayer.h"
@@ -54,7 +53,6 @@ public:
     void setIsRootLayer(bool isRootLayer) { m_isRootLayer = isRootLayer; }
 
     virtual void draw(SkCanvas*, const SkRect* viewPort);
-//    GraphicsContext* paintContext();
     bool prepareContext(bool force = false);
     void startRecording();
     void stopRecording();
@@ -74,7 +72,7 @@ public:
     void bounds(SkRect* ) const;
     bool calcPosition(const SkRect* viewPort, SkMatrix*);
     void clipArea(SkTDArray<SkRect>* region) const;
-    const LayerAndroid* find(FloatPoint position) const;
+    const LayerAndroid* find(int x, int y) const;
     const LayerAndroid* findById(int uniqueID) const;
     LayerAndroid* getChild(int index) const { return
         static_cast<LayerAndroid*>(m_children[index]); }