ref count the surface to keep the tiles alive for transfer queue

bug:6317924

Change-Id: If0a56ee48247d924f5a4cbd2dcac2cbb3faf0adb

1 files changed, 5 insertions, 0 deletions

diff --git a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.h b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.h
index 44d3c37..9d33ff5 100644
--- a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.h
+++ b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.h
@@ -37,6 +37,7 @@
 namespace WebCore {
 
 class Tile;
+class TilePainter;
 class TileTexture;
 
 struct GLState {
@@ -75,6 +76,7 @@ public:
     TileTransferData()
     : status(emptyItem)
     , savedTilePtr(0)
+    , savedTilePainter(0)
     , savedTileTexturePtr(0)
     , uploadType(DEFAULT_UPLOAD_TYPE)
     , bitmap(0)
@@ -90,6 +92,7 @@ public:
 
     TransferItemStatus status;
     Tile* savedTilePtr;
+    TilePainter* savedTilePainter; // Ref count the tilePainter to keep the tile alive.
     TileTexture* savedTileTexturePtr;
     TextureUploadType uploadType;
     // This is only useful in Cpu upload code path, so it will be dynamically
@@ -178,10 +181,12 @@ private:
                            GLuint srcTexId, GLenum srcTexTarget,
                            int index);
 
+    void clearItemInTranferQueue(int index);
     void addItemCommon(const TileRenderInfo* renderInfo,
                        TextureUploadType type, TileTransferData* data);
 
     void updatePureColorTiles();
+    void clearPureColorQueue();
     // Note that the m_transferQueueIndex only changed in the TexGen thread
     // where we are going to move on to update the next item in the queue.
     int m_transferQueueIndex;