Title: [109914] trunk/Source/WebCore
- Revision
- 109914
- Author
- [email protected]
- Date
- 2012-03-06 06:10:12 -0800 (Tue, 06 Mar 2012)
Log Message
Rename m_tileCreationTimer in the tiled backing store https://bugs.webkit.org/show_bug.cgi?id=80414
Patch by Kenneth Rohde Christiansen and Alexander Færøy.
Reviewed by Tor Arne Vestbø.
The m_tileCreationTimer member is currently being used to represent a
timer that is fired when the backing store has been updated which is
confusing with its current name. This patch fixes this by renaming
the m_tileCreationTimer to m_backingStoreUpdateTimer.
* platform/graphics/TiledBackingStore.cpp:
(WebCore::TiledBackingStore::TiledBackingStore):
(WebCore::TiledBackingStore::setTileSize):
(WebCore::TiledBackingStore::coverWithTilesIfNeeded):
(WebCore::TiledBackingStore::createTiles):
(WebCore::TiledBackingStore::startBackingStoreUpdateTimer):
(WebCore::TiledBackingStore::backingStoreUpdateTimerFired):
(WebCore::TiledBackingStore::setContentsFrozen):
* platform/graphics/TiledBackingStore.h:
(TiledBackingStore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (109913 => 109914)
--- trunk/Source/WebCore/ChangeLog 2012-03-06 13:41:21 UTC (rev 109913)
+++ trunk/Source/WebCore/ChangeLog 2012-03-06 14:10:12 UTC (rev 109914)
@@ -1,5 +1,30 @@
2012-03-06 Alexander Færøy <[email protected]>
+ Rename m_tileCreationTimer in the tiled backing store
+ https://bugs.webkit.org/show_bug.cgi?id=80414
+
+ Patch by Kenneth Rohde Christiansen and Alexander Færøy.
+
+ Reviewed by Tor Arne Vestbø.
+
+ The m_tileCreationTimer member is currently being used to represent a
+ timer that is fired when the backing store has been updated which is
+ confusing with its current name. This patch fixes this by renaming
+ the m_tileCreationTimer to m_backingStoreUpdateTimer.
+
+ * platform/graphics/TiledBackingStore.cpp:
+ (WebCore::TiledBackingStore::TiledBackingStore):
+ (WebCore::TiledBackingStore::setTileSize):
+ (WebCore::TiledBackingStore::coverWithTilesIfNeeded):
+ (WebCore::TiledBackingStore::createTiles):
+ (WebCore::TiledBackingStore::startBackingStoreUpdateTimer):
+ (WebCore::TiledBackingStore::backingStoreUpdateTimerFired):
+ (WebCore::TiledBackingStore::setContentsFrozen):
+ * platform/graphics/TiledBackingStore.h:
+ (TiledBackingStore):
+
+2012-03-06 Alexander Færøy <[email protected]>
+
Remove TileTimer typedef from the tiled backing store
https://bugs.webkit.org/show_bug.cgi?id=80408
Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp (109913 => 109914)
--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2012-03-06 13:41:21 UTC (rev 109913)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2012-03-06 14:10:12 UTC (rev 109914)
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ Copyright (C) 2010-2012 Nokia Corporation and/or its subsidiary(-ies)
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -39,7 +39,7 @@
: m_client(client)
, m_backend(backend)
, m_tileBufferUpdateTimer(this, &TiledBackingStore::tileBufferUpdateTimerFired)
- , m_tileCreationTimer(this, &TiledBackingStore::tileCreationTimerFired)
+ , m_backingStoreUpdateTimer(this, &TiledBackingStore::backingStoreUpdateTimerFired)
, m_tileSize(defaultTileDimension, defaultTileDimension)
, m_tileCreationDelay(0.01)
, m_coverAreaMultiplier(2.0f)
@@ -58,7 +58,7 @@
{
m_tileSize = size;
m_tiles.clear();
- startTileCreationTimer();
+ startBackingStoreUpdateTimer();
}
void TiledBackingStore::setTileCreationDelay(double delay)
@@ -75,7 +75,7 @@
m_trajectoryVector = trajectoryVector;
m_visibleRect = visibleRect;
- startTileCreationTimer();
+ startBackingStoreUpdateTimer();
}
void TiledBackingStore::invalidate(const IntRect& contentsDirtyRect)
@@ -296,7 +296,7 @@
// Re-call createTiles on a timer to cover the visible area with the newest shortest distance.
if (requiredTileCount)
- m_tileCreationTimer.startOneShot(m_tileCreationDelay);
+ m_backingStoreUpdateTimer.startOneShot(m_tileCreationDelay);
}
void TiledBackingStore::adjustForContentsRect(IntRect& rect) const
@@ -492,14 +492,14 @@
updateTileBuffers();
}
-void TiledBackingStore::startTileCreationTimer()
+void TiledBackingStore::startBackingStoreUpdateTimer()
{
- if (m_tileCreationTimer.isActive() || isBackingStoreUpdatesSuspended())
+ if (m_backingStoreUpdateTimer.isActive() || isBackingStoreUpdatesSuspended())
return;
- m_tileCreationTimer.startOneShot(0);
+ m_backingStoreUpdateTimer.startOneShot(0);
}
-void TiledBackingStore::tileCreationTimerFired(Timer<TiledBackingStore>*)
+void TiledBackingStore::backingStoreUpdateTimerFired(Timer<TiledBackingStore>*)
{
createTiles();
}
@@ -519,7 +519,7 @@
if (m_pendingScale)
commitScaleChange();
else {
- startTileCreationTimer();
+ startBackingStoreUpdateTimer();
startTileBufferUpdateTimer();
}
}
Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.h (109913 => 109914)
--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.h 2012-03-06 13:41:21 UTC (rev 109913)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.h 2012-03-06 14:10:12 UTC (rev 109914)
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ Copyright (C) 2010-2012 Nokia Corporation and/or its subsidiary(-ies)
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -80,10 +80,10 @@
private:
void startTileBufferUpdateTimer();
- void startTileCreationTimer();
+ void startBackingStoreUpdateTimer();
void tileBufferUpdateTimerFired(Timer<TiledBackingStore>*);
- void tileCreationTimerFired(Timer<TiledBackingStore>*);
+ void backingStoreUpdateTimerFired(Timer<TiledBackingStore>*);
void createTiles();
void computeCoverAndKeepRect(const IntRect& visibleRect, IntRect& coverRect, IntRect& keepRect) const;
@@ -115,7 +115,7 @@
TileMap m_tiles;
Timer<TiledBackingStore> m_tileBufferUpdateTimer;
- Timer<TiledBackingStore> m_tileCreationTimer;
+ Timer<TiledBackingStore> m_backingStoreUpdateTimer;
IntSize m_tileSize;
double m_tileCreationDelay;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
