diff options
| author | Chris Craik <ccraik@google.com> | 2011-10-24 17:55:31 -0700 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2011-10-25 20:36:01 +0000 |
| commit | affc08488bcc3fc9ae25d5199890d8e2f0cdb8bb (patch) | |
| tree | 0875712e21f69d74c6bc333f3f7008880a126f7a | |
| parent | 9bcbd1be99f8033fe90e903b41a29a24dbf3616d (diff) | |
| download | external_webkit-affc08488bcc3fc9ae25d5199890d8e2f0cdb8bb.zip external_webkit-affc08488bcc3fc9ae25d5199890d8e2f0cdb8bb.tar.gz external_webkit-affc08488bcc3fc9ae25d5199890d8e2f0cdb8bb.tar.bz2 | |
SwapLayersTextures on all layer changes
bug:5507262
This restores behavior, and allows a single setBaseLayer to set content (such as
is used in browser saved pages).
Change-Id: Ifeda068ce5c22275553d0e1ec99ee74647806a6c
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index 7b43305..aa1c05b 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -164,11 +164,10 @@ void GLWebViewState::setBaseLayer(BaseLayerAndroid* layer, const SkRegion& inval } else { m_currentBaseLayerRoot = 0; } - if (m_currentBaseLayerRoot && oldRoot) + if (oldRoot != m_currentBaseLayerRoot) TilesManager::instance()->swapLayersTextures(oldRoot, m_currentBaseLayerRoot); SkSafeUnref(oldRoot); - // We only update the base layer if we are not currently // waiting for a tiledPage to be painted if (m_baseLayerUpdate) { |