am 6fd1c352: am 5bdfd148: Merge "Regression fix from bug:4136077 Plus animations improvement bug:3389597" into honeycomb-mr1

* commit '6fd1c35298bb73147bb585e01b86d5b7c1c8f640':
  Regression fix from bug:4136077 Plus animations improvement bug:3389597

1 files changed, 8 insertions, 3 deletions

diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
index 5c63117..7a08e94 100644
--- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
@@ -345,16 +345,21 @@ bool BaseLayerAndroid::drawGL(LayerAndroid* compositedRoot,
             // Now that we marked the textures being used, we delete
             // the unnecessary ones to make space...
             TilesManager::instance()->cleanupLayersTextures(compositedRoot);
-            // Finally do another pass to create new textures and schedule
-            // repaints if needed
-            compositedRoot->createGLTextures();
         }
+        // Finally do another pass to create new textures and schedule
+        // repaints if needed
+        compositedRoot->createGLTextures();
 
         if (compositedRoot->drawGL(m_glWebViewState, matrix))
             needsRedraw = true;
         else if (!animsRunning)
             m_glWebViewState->resetLayersDirtyArea();
 
+        if (animsRunning) {
+            m_glWebViewState->resetLayersDirtyArea();
+            m_glWebViewState->resetFrameworkInval();
+        }
+
     } else {
         TilesManager::instance()->cleanupLayersTextures(0);
     }