diff options
| author | John Reck <jreck@google.com> | 2011-10-13 17:38:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-13 17:38:26 -0700 |
| commit | 9f5d6eac13414011f6c0e5aac6a921b0bd777a95 (patch) | |
| tree | 26e5dada88b654f8cf11a71e6f498dcff1d81a70 /Source/WebCore/platform | |
| parent | 530c83c6351e05a6939ad0b5bc291da073e77b5b (diff) | |
| parent | 32a0e726914a659afb4a9a1fedf99fa80df0d54b (diff) | |
| download | external_webkit-9f5d6eac13414011f6c0e5aac6a921b0bd777a95.zip external_webkit-9f5d6eac13414011f6c0e5aac6a921b0bd777a95.tar.gz external_webkit-9f5d6eac13414011f6c0e5aac6a921b0bd777a95.tar.bz2 | |
Merge "Fix navcache to work with layers for rings" into ics-mr0
Diffstat (limited to 'Source/WebCore/platform')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/android_graphics.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/android_graphics.cpp b/Source/WebCore/platform/graphics/android/android_graphics.cpp index e50cfec..e255d29 100644 --- a/Source/WebCore/platform/graphics/android/android_graphics.cpp +++ b/Source/WebCore/platform/graphics/android/android_graphics.cpp @@ -132,19 +132,19 @@ void CursorRing::setIsButton(const CachedNode* node) bool CursorRing::setup() { - m_node->localCursorRings(m_frame, &m_rings); + m_node->cursorRings(m_frame, &m_rings); if (!m_rings.size()) { DBG_NAV_LOG("!rings.size()"); m_viewImpl->m_hasCursorBounds = false; return false; } setIsButton(m_node); - m_bounds = m_node->localBounds(m_frame); + m_bounds = m_node->bounds(m_frame); m_viewImpl->updateCursorBounds(m_root, m_frame, m_node); bool useHitBounds = m_node->useHitBounds(); if (useHitBounds) - m_bounds = m_node->localHitBounds(m_frame); + m_bounds = m_node->hitBounds(m_frame); if (useHitBounds || m_node->useBounds()) { m_rings.clear(); m_rings.append(m_bounds); |