From 41ca040d7db923a179953baf91f30d539df6b055 Mon Sep 17 00:00:00 2001
From: Cary Clark <cary@android.com>
Date: Wed, 17 Feb 2010 17:04:56 -0500
Subject: 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
---
 WebKit/android/nav/CachedNode.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'WebKit/android/nav/CachedNode.h')

diff --git a/WebKit/android/nav/CachedNode.h b/WebKit/android/nav/CachedNode.h
index 825eab7..a5fc0da 100644
--- a/WebKit/android/nav/CachedNode.h
+++ b/WebKit/android/nav/CachedNode.h
@@ -88,7 +88,6 @@ public:
     }
 
     WebCore::IntRect bounds(const CachedFrame* ) const;
-    WebCore::IntRect* boundsPtr() { return &mBounds; } // CacheBuilder only
     int childFrameIndex() const { return isFrame() ? mDataIndex : -1; }
     void clearCondition() const { mCondition = NOT_REJECTED; }
     void clearCursor(CachedFrame* );
@@ -97,8 +96,6 @@ public:
     bool clip(const WebCore::IntRect& );
     bool clippedOut() { return mClippedOut; }
     WebCore::IntRect cursorRingBounds(const CachedFrame* ) const;
-    // cursorRingsPtr() only for CacheBuilder since it points to raw data
-    WTF::Vector<WebCore::IntRect>* cursorRingsPtr() { return &mCursorRing; }
     void cursorRings(const CachedFrame* , WTF::Vector<WebCore::IntRect>* ) const;
     bool disabled() const { return mDisabled; }
     const CachedNode* document() const { return &this[-mIndex]; }
@@ -172,6 +169,7 @@ public:
     bool useHitBounds() const { return mUseHitBounds; }
     bool wantsKeyEvents() const { return isTextInput() || isPlugin(); }
 private:
+    friend class CacheBuilder;
     WebCore::String mExport;
     WebCore::IntRect mBounds;
     WebCore::IntRect mHitBounds;
-- 
cgit v1.1