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
aosp-mirror · Oct 25, 2011 · bee2599 · bee2599
1 parent a4adfec
commit bee2599
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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) {