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

This reverts commit fc92ca2409a95b539274985812d88016b6b84b7e.

1 files changed, 29 insertions, 3 deletions

diff --git a/WebCore/platform/graphics/android/TileSet.cpp b/WebCore/platform/graphics/android/TileSet.cpp
index 4530640..fe13ef3 100644
--- a/WebCore/platform/graphics/android/TileSet.cpp
+++ b/WebCore/platform/graphics/android/TileSet.cpp
@@ -56,8 +56,10 @@ int TileSet::count()
 }
 #endif
 
-TileSet::TileSet(TiledPage* tiledPage, int rows, int cols)
-    : m_tiledPage(tiledPage)
+TileSet::TileSet(int id, int firstTileX, int firstTileY, int rows, int cols)
+    : m_id(id)
+    , m_firstTileX(firstTileX)
+    , m_firstTileY(firstTileY)
     , m_nbRows(rows)
     , m_nbCols(cols)
 {
@@ -75,12 +77,36 @@ TileSet::~TileSet()
 
 bool TileSet::operator==(const TileSet& set)
 {
-    return m_tiledPage == set.m_tiledPage
+    return m_id == set.m_id
+           && m_firstTileX == set.m_firstTileX
+           && m_firstTileY == set.m_firstTileY
            && m_nbRows == set.m_nbRows
            && m_nbCols == set.m_nbCols;
 }
 
 
+void TileSet::reserveTextures()
+{
+#ifdef DEBUG
+    if (m_tiles.size()) {
+        TiledPage* page = m_tiles[0]->page();
+        XLOG("reserveTextures (%d tiles) for page %x (sibling: %x)", m_tiles.size(), page, page->sibling());
+        TilesManager::instance()->printTextures();
+    }
+#endif // DEBUG
+
+    for (unsigned int i = 0; i < m_tiles.size(); i++)
+        m_tiles[i]->reserveTexture();
+
+#ifdef DEBUG
+    if (m_tiles.size()) {
+        TiledPage* page = m_tiles[0]->page();
+        XLOG(" DONE reserveTextures (%d tiles) for page %x (sibling: %x)", m_tiles.size(), page, page->sibling());
+        TilesManager::instance()->printTextures();
+    }
+#endif // DEBUG
+}
+
 void TileSet::paint()
 {
     XLOG("%x, painting %d tiles", this, m_tiles.size());