Deallocate graphics memory with onTrimMemory signals

bug:5269460
Deallocate the graphics memory backing a BaseTileTexture on onTrimMemory
signals, and accordingly allocate it lazily, as needed.

Change-Id: I52039723f47e6470e4fe8dd987d384017005390f

1 files changed, 20 insertions, 1 deletions

diff --git a/Source/WebCore/platform/graphics/android/BaseTileTexture.cpp b/Source/WebCore/platform/graphics/android/BaseTileTexture.cpp
index 34de9e7..8cc67b9 100644
--- a/Source/WebCore/platform/graphics/android/BaseTileTexture.cpp
+++ b/Source/WebCore/platform/graphics/android/BaseTileTexture.cpp
@@ -58,7 +58,7 @@ BaseTileTexture::BaseTileTexture(uint32_t w, uint32_t h)
     , m_busy(false)
 {
     m_size.set(w, h);
-    m_ownTextureId = GLUtils::createBaseTileGLTexture(w, h);
+    m_ownTextureId = 0;
 
     // Make sure they are created on the UI thread.
     TilesManager::instance()->transferQueue()->initSharedSurfaceTextures(w, h);
@@ -79,6 +79,18 @@ BaseTileTexture::~BaseTileTexture()
 #endif
 }
 
+void BaseTileTexture::requireTexture()
+{
+    if (!m_ownTextureId)
+        m_ownTextureId = GLUtils::createBaseTileGLTexture(m_size.width(), m_size.height());
+}
+
+void BaseTileTexture::discardTexture()
+{
+    if (m_ownTextureId)
+        GLUtils::deleteTexture(&m_ownTextureId);
+}
+
 void BaseTileTexture::destroyTextures(SharedTexture** textures)
 {
     int x = 0;
@@ -263,6 +275,13 @@ void BaseTileTexture::setOwnTextureTileInfoFromQueue(const TextureTileInfo* info
 
 bool BaseTileTexture::readyFor(BaseTile* baseTile)
 {
+    if (!m_ownTextureId) {
+        // If our backing opengl texture doesn't exist, allocate it and return
+        // false since it won't have useful data
+        requireTexture();
+        return false;
+    }
+
     const TextureTileInfo* info = &m_ownTextureTileInfo;
     if (info &&
         (info->m_x == baseTile->x()) &&