Merge "Support partial invalidation of tiles based on webkit's inval rect."

1 files changed, 3 insertions, 8 deletions

diff --git a/WebCore/platform/graphics/android/TileSet.h b/WebCore/platform/graphics/android/TileSet.h
index adf6d13..fd65ad7 100644
--- a/WebCore/platform/graphics/android/TileSet.h
+++ b/WebCore/platform/graphics/android/TileSet.h
@@ -45,11 +45,10 @@ public:
 #ifdef DEBUG_COUNT
     static int count();
 #endif
-    TileSet(int id, int firstTileX, int firstTileY, int rows, int cols);
+    TileSet(TiledPage* tiledPage, int nbRows, int nbCols);
     ~TileSet();
 
     bool operator==(const TileSet& set);
-    void reserveTextures();
     void paint();
 
     void add(BaseTile* texture)
@@ -59,17 +58,13 @@ public:
 
     TiledPage* page()
     {
-        if (m_tiles.size())
-            return m_tiles[0]->page();
-        return 0;
+        return m_tiledPage;
     }
 
 private:
     Vector<BaseTile*> m_tiles;
 
-    int m_id;
-    int m_firstTileX;
-    int m_firstTileY;
+    TiledPage* m_tiledPage;
     int m_nbRows;
     int m_nbCols;
 };