2 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/AndroidAnimation.cpp b/Source/WebCore/platform/graphics/android/AndroidAnimation.cpp
index 1eb7f39..e7d4780 100644
--- a/Source/WebCore/platform/graphics/android/AndroidAnimation.cpp
+++ b/Source/WebCore/platform/graphics/android/AndroidAnimation.cpp
@@ -86,6 +86,7 @@ AndroidAnimation::AndroidAnimation(AndroidAnimation* anim)
     , m_type(anim->m_type)
     , m_operations(anim->m_operations)
     , m_originalLayer(0)
+    , m_name(anim->name())
 {
     gDebugAndroidAnimationInstances++;
 }
diff --git a/Source/WebCore/platform/graphics/android/TilesManager.cpp b/Source/WebCore/platform/graphics/android/TilesManager.cpp
index b4df0a1..2259072 100644
--- a/Source/WebCore/platform/graphics/android/TilesManager.cpp
+++ b/Source/WebCore/platform/graphics/android/TilesManager.cpp
@@ -355,6 +355,10 @@ LayerTexture* TilesManager::createTextureForLayer(LayerAndroid* layer, const Int
     if (m_layersMemoryUsage + size > MAX_LAYERS_ALLOCATION)
         cleanupLayersTextures(layer, true);
 
+    // If the cleanup can't achieve the goal, then don't create a layerTexture.
+    if (m_layersMemoryUsage + size > MAX_LAYERS_ALLOCATION)
+        return 0;
+
     LayerTexture* texture = new LayerTexture(w, h);
     texture->setId(layer->uniqueId());
     texture->setRect(rect);