gistfile1.diff

commit f8c9fa5a9e356b6952d5c55f4a51269539c053be
Author: Kenneth Rohde Christiansen <kenneth@webkit.org>
Date:   Mon Mar 5 14:23:07 2012 +0100

    Use OwnPtr for the timers

diff --git a/Source/WebCore/platform/graphics/TiledBackingStore.cpp b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
index 47e8d37..8adbb30 100644
--- a/Source/WebCore/platform/graphics/TiledBackingStore.cpp
+++ b/Source/WebCore/platform/graphics/TiledBackingStore.cpp
@@ -38,8 +38,8 @@ static IntPoint innerBottomRight(const IntRect& rect)
 TiledBackingStore::TiledBackingStore(TiledBackingStoreClient* client, PassOwnPtr<TiledBackingStoreBackend> backend)
     : m_client(client)
     , m_backend(backend)
-    , m_tileBufferUpdateTimer(new TileTimer(this, &TiledBackingStore::tileBufferUpdateTimerFired))
-    , m_tileCreationTimer(new TileTimer(this, &TiledBackingStore::tileCreationTimerFired))
+    , m_tileBufferUpdateTimer(adoptPtr(new Timer<TiledBackingStore>(this, &TiledBackingStore::tileBufferUpdateTimerFired)))
+    , m_backingStoreUpdateTimer(adoptPtr(new Timer<TiledBackingStore>(this, &TiledBackingStore::backingStoreUpdateTimerFired)))
     , m_tileSize(defaultTileDimension, defaultTileDimension)
     , m_tileCreationDelay(0.01)
     , m_coverAreaMultiplier(2.0f)
@@ -52,8 +52,6 @@ TiledBackingStore::TiledBackingStore(TiledBackingStoreClient* client, PassOwnPtr
 
 TiledBackingStore::~TiledBackingStore()
 {
-    delete m_tileBufferUpdateTimer;
-    delete m_tileCreationTimer;
 }
 
 void TiledBackingStore::setTileSize(const IntSize& size)
diff --git a/Source/WebCore/platform/graphics/TiledBackingStore.h b/Source/WebCore/platform/graphics/TiledBackingStore.h
index 2399a3d..a84a5d9 100644
--- a/Source/WebCore/platform/graphics/TiledBackingStore.h
+++ b/Source/WebCore/platform/graphics/TiledBackingStore.h
@@ -85,8 +85,8 @@ private:
     void tileBufferUpdateTimerFired(Timer<TiledBackingStore>*);
     void backingStoreUpdateTimerFired(Timer<TiledBackingStore>*);
 
-    void tileBufferUpdateTimerFired(TileTimer*);
-    void tileCreationTimerFired(TileTimer*);
+    bool isBackingStoreUpdatesSuspended();
+    bool isTileBufferUpdatesSuspended();
 
     void updateBackingStore();
 
@@ -115,8 +115,8 @@ private:
     typedef HashMap<Tile::Coordinate, RefPtr<Tile> > TileMap;
     TileMap m_tiles;
 
-    TileTimer* m_tileBufferUpdateTimer;
-    TileTimer* m_tileCreationTimer;
+    OwnPtr<Timer<TiledBackingStore> > m_tileBufferUpdateTimer;
+    OwnPtr<Timer<TiledBackingStore> > m_backingStoreUpdateTimer;
 
     IntSize m_tileSize;
     double m_tileCreationDelay;