diff options
| author | Chris Craik <ccraik@google.com> | 2011-10-24 18:51:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-24 18:51:52 -0700 |
| commit | 2c6a03a116ab0fafc5e33c70854da3694705824e (patch) | |
| tree | 70bb1d99474c9cc3412f78940101bbc5cebcaa85 /Source/WebCore/platform | |
| parent | 5bea371e545f4e8a2dce478d60249a35f0b2ec81 (diff) | |
| parent | bee2599ec82af8aaf47491b6aea4ee07a377c81a (diff) | |
| download | external_webkit-2c6a03a116ab0fafc5e33c70854da3694705824e.zip external_webkit-2c6a03a116ab0fafc5e33c70854da3694705824e.tar.gz external_webkit-2c6a03a116ab0fafc5e33c70854da3694705824e.tar.bz2 | |
am bee2599e: SwapLayersTextures on all layer changes
* commit 'bee2599ec82af8aaf47491b6aea4ee07a377c81a':
SwapLayersTextures on all layer changes
Diffstat (limited to 'Source/WebCore/platform')
| -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 4c6161a..e53a1e1 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -162,11 +162,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) { |