Changeset 176381 in webkit

Timestamp:

Nov 19, 2014 9:35:49 PM (9 years ago)

Author:

ryuan.choi@navercorp.com

Message:

Remove dead code from TiledBackingStore
​https://bugs.webkit.org/show_bug.cgi?id=138864

Reviewed by Andreas Kling.

Since r168151, paint() method, m_commitTileUpdatesOnIdleEventLoop and related code are not used.

No new tests, no behavior change.

• platform/graphics/TiledBackingStore.cpp:

(WebCore::TiledBackingStore::TiledBackingStore):
(WebCore::TiledBackingStore::setTileSize):
(WebCore::TiledBackingStore::invalidate):
(WebCore::TiledBackingStore::createTiles):
(WebCore::TiledBackingStore::paint): Deleted.
(WebCore::TiledBackingStore::startTileBufferUpdateTimer): Deleted.
(WebCore::TiledBackingStore::tileBufferUpdateTimerFired): Deleted.
(WebCore::TiledBackingStore::startBackingStoreUpdateTimer): Deleted.
(WebCore::TiledBackingStore::backingStoreUpdateTimerFired): Deleted.

• platform/graphics/TiledBackingStore.h:

(WebCore::TiledBackingStore::setCommitTileUpdatesOnIdleEventLoop): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/TiledBackingStore.cpp (modified) (6 diffs)
• platform/graphics/TiledBackingStore.h (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-19  Ryuan Choi  <ryuan.choi@navercorp.com>
+
+        Remove dead code from TiledBackingStore
+        https://bugs.webkit.org/show_bug.cgi?id=138864
+
+        Reviewed by Andreas Kling.
+
+        Since r168151, paint() method, m_commitTileUpdatesOnIdleEventLoop and related code are not used.
+
+        No new tests, no behavior change.
+
+        * platform/graphics/TiledBackingStore.cpp:
+        (WebCore::TiledBackingStore::TiledBackingStore):
+        (WebCore::TiledBackingStore::setTileSize):
+        (WebCore::TiledBackingStore::invalidate):
+        (WebCore::TiledBackingStore::createTiles):
+        (WebCore::TiledBackingStore::paint): Deleted.
+        (WebCore::TiledBackingStore::startTileBufferUpdateTimer): Deleted.
+        (WebCore::TiledBackingStore::tileBufferUpdateTimerFired): Deleted.
+        (WebCore::TiledBackingStore::startBackingStoreUpdateTimer): Deleted.
+        (WebCore::TiledBackingStore::backingStoreUpdateTimerFired): Deleted.
+        * platform/graphics/TiledBackingStore.h:
+        (WebCore::TiledBackingStore::setCommitTileUpdatesOnIdleEventLoop): Deleted.
+
 2014-11-19  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp

@@ -39 +39 @@
     : m_client(client)
     , m_backend(WTF::move(backend))
-    , m_tileBufferUpdateTimer(this, &TiledBackingStore::tileBufferUpdateTimerFired)
-    , m_backingStoreUpdateTimer(this, &TiledBackingStore::backingStoreUpdateTimerFired)
     , m_tileSize(defaultTileDimension, defaultTileDimension)
     , m_coverAreaMultiplier(2.0f)
     , m_contentsScale(1.f)
-    , m_commitTileUpdatesOnIdleEventLoop(false)
     , m_supportsAlpha(false)
     , m_pendingTileCreation(false)
@@ -58 +55 @@
     m_tileSize = size;
     m_tiles.clear();
-    startBackingStoreUpdateTimer();
 }
 
@@ -98 +94 @@
         }
     }
-
-    startTileBufferUpdateTimer();
 }
 
@@ -130 +124 @@
 
     m_client->tiledBackingStorePaintEnd(paintedArea);
-}
-
-void TiledBackingStore::paint(GraphicsContext* context, const IntRect& rect)
-{
-    context->save();
-
-    // Assumes the backing store is painted with the scale transform applied.
-    // Since tile content is already scaled, first revert the scaling from the painter.
-    context->scale(FloatSize(1.f / m_contentsScale, 1.f / m_contentsScale));
-
-    IntRect dirtyRect = mapFromContents(rect);
-
-    Tile::Coordinate topLeft = tileCoordinateForPoint(dirtyRect.location());
-    Tile::Coordinate bottomRight = tileCoordinateForPoint(innerBottomRight(dirtyRect));
-
-    for (int yCoordinate = topLeft.y(); yCoordinate <= bottomRight.y(); ++yCoordinate) {
-        for (int xCoordinate = topLeft.x(); xCoordinate <= bottomRight.x(); ++xCoordinate) {
-            Tile::Coordinate currentCoordinate(xCoordinate, yCoordinate);
-            RefPtr<Tile> currentTile = tileAt(currentCoordinate);
-            if (currentTile && currentTile->isReadyToPaint())
-                currentTile->paint(context, dirtyRect);
-            else {
-                IntRect tileRect = tileRectForCoordinate(currentCoordinate);
-                IntRect target = intersection(tileRect, dirtyRect);
-                if (target.isEmpty())
-                    continue;
-                m_backend->paintCheckerPattern(context, FloatRect(target));
-            }
-        }
-    }
-    context->restore();
 }
 
@@ -311 +274 @@
     // Re-call createTiles on a timer to cover the visible area with the newest shortest distance.
     m_pendingTileCreation = requiredTileCount;
-    if (m_pendingTileCreation) {
-        if (!m_commitTileUpdatesOnIdleEventLoop) {
-            m_client->tiledBackingStoreHasPendingTileCreation();
-            return;
-        }
-
-        static const double tileCreationDelay = 0.01;
-        startBackingStoreUpdateTimer(tileCreationDelay);
-    }
+    if (m_pendingTileCreation)
+        m_client->tiledBackingStoreHasPendingTileCreation();
 }
 
@@ -504 +460 @@
 }
 
-void TiledBackingStore::startTileBufferUpdateTimer()
-{
-    if (!m_commitTileUpdatesOnIdleEventLoop)
-        return;
-
-    if (m_tileBufferUpdateTimer.isActive())
-        return;
-    m_tileBufferUpdateTimer.startOneShot(0);
-}
-
-void TiledBackingStore::tileBufferUpdateTimerFired(Timer*)
-{
-    ASSERT(m_commitTileUpdatesOnIdleEventLoop);
-    updateTileBuffers();
-}
-
-void TiledBackingStore::startBackingStoreUpdateTimer(double interval)
-{
-    if (!m_commitTileUpdatesOnIdleEventLoop)
-        return;
-
-    if (m_backingStoreUpdateTimer.isActive())
-        return;
-    m_backingStoreUpdateTimer.startOneShot(interval);
-}
-
-void TiledBackingStore::backingStoreUpdateTimerFired(Timer*)
-{
-    ASSERT(m_commitTileUpdatesOnIdleEventLoop);
-    createTiles();
-}
-
 void TiledBackingStore::setSupportsAlpha(bool a)
 {

trunk/Source/WebCore/platform/graphics/TiledBackingStore.h

@@ -47 +47 @@
     TiledBackingStoreClient* client() { return m_client; }
 
-    // Used when class methods cannot be called asynchronously by client.
-    // Updates of tiles are committed as soon as all the events in event queue have been processed.
-    void setCommitTileUpdatesOnIdleEventLoop(bool enable) { m_commitTileUpdatesOnIdleEventLoop = enable; }
-
     void setTrajectoryVector(const FloatPoint&);
     void coverWithTilesIfNeeded();
@@ -60 +56 @@
 
     void invalidate(const IntRect& dirtyRect);
-    void paint(GraphicsContext*, const IntRect&);
 
     IntSize tileSize() { return m_tileSize; }
@@ -79 +74 @@
 
 private:
-    void startTileBufferUpdateTimer();
-    void startBackingStoreUpdateTimer(double = 0);
-
-    void tileBufferUpdateTimerFired(Timer*);
-    void backingStoreUpdateTimerFired(Timer*);
-
     void createTiles();
     void computeCoverAndKeepRect(const IntRect& visibleRect, IntRect& coverRect, IntRect& keepRect) const;
@@ -110 +99 @@
     TileMap m_tiles;
 
-    Timer m_tileBufferUpdateTimer;
-    Timer m_backingStoreUpdateTimer;
-
     IntSize m_tileSize;
     float m_coverAreaMultiplier;
@@ -126 +112 @@
     float m_contentsScale;
 
-    bool m_commitTileUpdatesOnIdleEventLoop;
     bool m_supportsAlpha;
     bool m_pendingTileCreation;