1 files changed, 10 insertions, 1 deletions
diff --git a/WebKit/android/nav/CachedFrame.h b/WebKit/android/nav/CachedFrame.h
index 9334707..bd47421 100644
--- a/WebKit/android/nav/CachedFrame.h
+++ b/WebKit/android/nav/CachedFrame.h
@@ -26,6 +26,7 @@
 #ifndef CachedFrame_H
 #define CachedFrame_H
 
+#include "CachedColor.h"
 #include "CachedInput.h"
 #include "CachedLayer.h"
 #include "CachedNode.h"
@@ -70,6 +71,7 @@ public:
         CURSOR_SET = 0
     };
     CachedFrame() {}
+    void add(CachedColor& color) { mCachedColors.append(color); }
     void add(CachedInput& input) { mCachedTextInputs.append(input); }
 #if USE(ACCELERATED_COMPOSITING)
     void add(CachedLayer& layer) { mCachedLayers.append(layer); }
@@ -78,12 +80,18 @@ public:
     void addFrame(CachedFrame& child) { mCachedFrames.append(child); }
     WebCore::IntRect adjustBounds(const CachedNode* ,
         const WebCore::IntRect& ) const;
+    WebCore::IntRect unadjustBounds(const CachedNode*,
+        const WebCore::IntRect& ) const;
     bool checkRings(const CachedNode* node,
         const WTF::Vector<WebCore::IntRect>& rings,
-        const WebCore::IntRect& bounds) const;
+        const WebCore::IntRect& nodeBounds,
+        const WebCore::IntRect& testBounds) const;
     bool checkVisited(const CachedNode* , CachedFrame::Direction ) const;
     size_t childCount() { return mCachedFrames.size(); }
     void clearCursor();
+    const CachedColor& color(const CachedNode* node) const {
+        return mCachedColors[node->colorIndex()];
+    }
     const CachedNode* currentCursor() const { return currentCursor(NULL); }
     const CachedNode* currentCursor(const CachedFrame** ) const;
     const CachedNode* currentFocus() const { return currentFocus(NULL); }
@@ -224,6 +232,7 @@ private: // since computing these is complicated, protect them so that the
     WebCore::IntRect mContents;
     WebCore::IntRect mLocalViewBounds;
     WebCore::IntRect mViewBounds;
+    WTF::Vector<CachedColor> mCachedColors;
     WTF::Vector<CachedNode> mCachedNodes;
     WTF::Vector<CachedFrame> mCachedFrames;
     WTF::Vector<CachedInput> mCachedTextInputs;