3 files changed, 7 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.h b/WebCore/platform/graphics/android/LayerAndroid.h
index b74a8c8..712d699 100644
--- a/WebCore/platform/graphics/android/LayerAndroid.h
+++ b/WebCore/platform/graphics/android/LayerAndroid.h
@@ -135,6 +135,10 @@ public:
     void setForegroundClip(const SkRect& clip) {
         m_foregroundClip = clip;
     }
+
+    // Return the foreground clip offset by the position of the layer.
+    SkRect foregroundClip() const { return m_foregroundClip; }
+
     bool contentIsScrollable() const;
 
     // Returns true if the content position has changed.
diff --git a/WebCore/platform/graphics/android/android_graphics.cpp b/WebCore/platform/graphics/android/android_graphics.cpp
index fafd3df..a5dafda 100644
--- a/WebCore/platform/graphics/android/android_graphics.cpp
+++ b/WebCore/platform/graphics/android/android_graphics.cpp
@@ -140,7 +140,9 @@ bool CursorRing::setup()
         m_rings.clear();
         m_rings.append(m_bounds);
     }
+    m_absBounds = m_node->bounds(m_frame);
     m_bounds.inflate(SkScalarCeil(CURSOR_RING_OUTER_DIAMETER));
+    m_absBounds.inflate(SkScalarCeil(CURSOR_RING_OUTER_DIAMETER));
     if (!m_node->hasCursorRing() || (m_node->isPlugin() && m_node->isFocus()))
         return false;
     m_flavor = NORMAL_FLAVOR;
diff --git a/WebCore/platform/graphics/android/android_graphics.h b/WebCore/platform/graphics/android/android_graphics.h
index dbf1978..46c60e8 100644
--- a/WebCore/platform/graphics/android/android_graphics.h
+++ b/WebCore/platform/graphics/android/android_graphics.h
@@ -71,6 +71,7 @@ private:
     WebViewCore* m_viewImpl; // copy for convenience
     WTF::Vector<IntRect> m_rings;
     IntRect m_bounds;
+    IntRect m_absBounds;
     const CachedRoot* m_root;
     const CachedFrame* m_frame;
     const CachedNode* m_node;