diff options
author | John Reck <jreck@google.com> | 2011-10-13 17:06:17 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2011-10-13 17:07:38 -0700 |
commit | 32a0e726914a659afb4a9a1fedf99fa80df0d54b (patch) | |
tree | 38b14668f619e7824da166bc64c3c6cf27238819 /Source/WebKit/android | |
parent | 0557c56c5b00819cf14bf29948b6d9edd1e937f2 (diff) | |
download | external_webkit-32a0e726914a659afb4a9a1fedf99fa80df0d54b.zip external_webkit-32a0e726914a659afb4a9a1fedf99fa80df0d54b.tar.gz external_webkit-32a0e726914a659afb4a9a1fedf99fa80df0d54b.tar.bz2 |
Fix navcache to work with layers for rings
Bug: 5453034
Change-Id: I426aa4ca1b1c253f99c32aaf8cad597c09144af0
Diffstat (limited to 'Source/WebKit/android')
-rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index d062db3..90ab365 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -570,24 +570,6 @@ bool drawGL(WebCore::IntRect& viewRect, WebCore::IntRect* invalRect, WebCore::In } unsigned int pic = m_glWebViewState->currentPictureCounter(); - - if (extra == &m_ring) { - if (m_ring.m_isButton || root != m_ring.m_frame) { - // TODO: Fix the navcache to work with layers correctly - // In the meantime, this works around the bug. However, the rings - // it produces are not as nice for some reason, thus we use - // m_ring.rings() as produced by navcache for the base layer and - // for layers we generate a new ring set - m_ring.rings().clear(); - for (size_t i = 0; i < m_ring.m_node->rings().size(); i++) { - IntRect rect = m_ring.m_node->rings().at(i); - rect = m_ring.m_frame->adjustBounds(m_ring.m_node, rect); - if (!m_ring.m_isButton) - rect.inflate(4); - m_ring.rings().append(rect); - } - } - } m_glWebViewState->glExtras()->setDrawExtra(extra); LayerAndroid* compositeLayer = compositeRoot(); |