diff options
| author | Cary Clark <cary@android.com> | 2010-11-03 07:46:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-03 07:46:49 -0700 |
| commit | 2689b38c74169006cadfbce7184976223bc13afc (patch) | |
| tree | 43ebcc133fb31412ffa4cef33c300927c6c04ead | |
| parent | 84a759f5d5df9e3ddf35bbda737027017fc5114b (diff) | |
| parent | d17b63fd154fc79d6c6b99a04fe1a2c42ced4a2f (diff) | |
| download | external_webkit-2689b38c74169006cadfbce7184976223bc13afc.zip external_webkit-2689b38c74169006cadfbce7184976223bc13afc.tar.gz external_webkit-2689b38c74169006cadfbce7184976223bc13afc.tar.bz2 | |
Merge "Unref the picture instead of deleting it"
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index 8720c44..06b5422 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -376,6 +376,15 @@ bool drawCursorPreamble(CachedRoot* root) m_viewImpl->m_hasCursorBounds = false; return false; } +#if USE(ACCELERATED_COMPOSITING) + if (node->isInLayer()) { + LayerAndroid* layer = const_cast<LayerAndroid*>(root->rootLayer()); + SkRect visible; + calcOurContentVisibleRect(&visible); + layer->updateFixedLayersPositions(visible); + layer->updatePositions(); + } +#endif setVisibleRect(root); m_ring.m_root = root; m_ring.m_frame = frame; @@ -632,7 +641,7 @@ CachedRoot* getFrameCache(FrameCachePermission allowNewer) } m_viewImpl->gFrameCacheMutex.lock(); delete m_frameCacheUI; - delete m_navPictureUI; + m_navPictureUI->safeUnref(); m_viewImpl->m_updatedFrameCache = false; m_frameCacheUI = m_viewImpl->m_frameCacheKit; m_navPictureUI = m_viewImpl->m_navPictureKit; |