diff options
| author | John Reck <jreck@google.com> | 2011-10-13 17:41:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-13 17:41:10 -0700 |
| commit | a5abb7ff976eee1d07331bafc8a1055569490351 (patch) | |
| tree | e696abe114530970a363cba1cb01ab08d73ce2c4 /Source/WebCore | |
| parent | e980d86d4ac320af372e8d14d20b4351321cf462 (diff) | |
| parent | 9f5d6eac13414011f6c0e5aac6a921b0bd777a95 (diff) | |
| download | external_webkit-a5abb7ff976eee1d07331bafc8a1055569490351.zip external_webkit-a5abb7ff976eee1d07331bafc8a1055569490351.tar.gz external_webkit-a5abb7ff976eee1d07331bafc8a1055569490351.tar.bz2 | |
am 9f5d6eac: Merge "Fix navcache to work with layers for rings" into ics-mr0
* commit '9f5d6eac13414011f6c0e5aac6a921b0bd777a95':
Fix navcache to work with layers for rings
Diffstat (limited to 'Source/WebCore')
| -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); |