Title: [109738] trunk/Source/WebCore
- Revision
- 109738
- Author
- [email protected]
- Date
- 2012-03-05 06:26:00 -0800 (Mon, 05 Mar 2012)
Log Message
TiledBackingStore.{h,cpp} contains unclear variable names https://bugs.webkit.org/show_bug.cgi?id=80276
Patch by Kenneth Rohde Christiansen and Alexander Færøy.
Reviewed by Simon Hausmann.
This patch renames some of the variables in TiledBackingStore.cpp to
enhance the clearity and for consistence.
The visibleContentsRect is renamed to visibleRect as it is not in
contents coordinates.
The panningTrajectoryVector and m_visibleRectTrajectoryVector are
renamed to just *[m_]trajectoryVector, as that is descriptive enough.
The previous prefix has also been removed, as it is being used as the
current one in the code. This avoids confusion.
* platform/graphics/TiledBackingStore.cpp:
(WebCore::TiledBackingStore::coverWithTilesIfNeeded):
(WebCore::TiledBackingStore::visibleRect):
(WebCore::TiledBackingStore::visibleAreaIsCovered):
(WebCore::TiledBackingStore::createTiles):
(WebCore::TiledBackingStore::computeCoverAndKeepRect):
(WebCore::TiledBackingStore::removeAllNonVisibleTiles):
* platform/graphics/TiledBackingStore.h:
(TiledBackingStore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (109737 => 109738)
--- trunk/Source/WebCore/ChangeLog 2012-03-05 14:16:15 UTC (rev 109737)
+++ trunk/Source/WebCore/ChangeLog 2012-03-05 14:26:00 UTC (rev 109738)
@@ -1,3 +1,34 @@
+2012-03-05 Alexander Færøy <[email protected]>
+
+ TiledBackingStore.{h,cpp} contains unclear variable names
+ https://bugs.webkit.org/show_bug.cgi?id=80276
+
+ Patch by Kenneth Rohde Christiansen and Alexander Færøy.
+
+ Reviewed by Simon Hausmann.
+
+ This patch renames some of the variables in TiledBackingStore.cpp to
+ enhance the clearity and for consistence.
+
+ The visibleContentsRect is renamed to visibleRect as it is not in
+ contents coordinates.
+
+ The panningTrajectoryVector and m_visibleRectTrajectoryVector are
+ renamed to just *[m_]trajectoryVector, as that is descriptive enough.
+
+ The previous prefix has also been removed, as it is being used as the
+ current one in the code. This avoids confusion.
+
+ * platform/graphics/TiledBackingStore.cpp:
+ (WebCore::TiledBackingStore::coverWithTilesIfNeeded):
+ (WebCore::TiledBackingStore::visibleRect):
+ (WebCore::TiledBackingStore::visibleAreaIsCovered):
+ (WebCore::TiledBackingStore::createTiles):
+ (WebCore::TiledBackingStore::computeCoverAndKeepRect):
+ (WebCore::TiledBackingStore::removeAllNonVisibleTiles):
+ * platform/graphics/TiledBackingStore.h:
+ (TiledBackingStore):
+
2012-03-05 Simon Hausmann <[email protected]>
[Qt] Fix build with Qt 5 and OpenGL ES 2.0
Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp (109737 => 109738)
--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2012-03-05 14:16:15 UTC (rev 109737)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2012-03-05 14:26:00 UTC (rev 109738)
@@ -68,14 +68,14 @@
m_tileCreationDelay = delay;
}
-void TiledBackingStore::coverWithTilesIfNeeded(const FloatPoint& panningTrajectoryVector)
+void TiledBackingStore::coverWithTilesIfNeeded(const FloatPoint& trajectoryVector)
{
- IntRect visibleRect = visibleContentsRect();
- if (m_visibleRectTrajectoryVector == panningTrajectoryVector && m_previousVisibleRect == visibleRect)
+ IntRect visibleRect = this->visibleRect();
+ if (m_trajectoryVector == trajectoryVector && m_visibleRect == visibleRect)
return;
- m_visibleRectTrajectoryVector = panningTrajectoryVector;
- m_previousVisibleRect = visibleRect;
+ m_trajectoryVector = trajectoryVector;
+ m_visibleRect = visibleRect;
startTileCreationTimer();
}
@@ -164,7 +164,7 @@
context->restore();
}
-IntRect TiledBackingStore::visibleContentsRect() const
+IntRect TiledBackingStore::visibleRect() const
{
return mapFromContents(intersection(m_client->tiledBackingStoreVisibleRect(), m_client->tiledBackingStoreContentsRect()));
}
@@ -225,7 +225,7 @@
bool TiledBackingStore::visibleAreaIsCovered() const
{
- return coverageRatio(visibleContentsRect()) == 1.0f;
+ return coverageRatio(visibleRect()) == 1.0f;
}
void TiledBackingStore::createTiles()
@@ -236,8 +236,8 @@
const IntRect previousRect = m_rect;
m_rect = mapFromContents(m_client->tiledBackingStoreContentsRect());
- const IntRect visibleRect = visibleContentsRect();
- m_previousVisibleRect = visibleRect;
+ const IntRect visibleRect = this->visibleRect();
+ m_visibleRect = visibleRect;
if (visibleRect.isEmpty())
return;
@@ -338,7 +338,7 @@
coverRect.inflateY(visibleRect.height() * (m_coverAreaMultiplier - 1) / 2);
keepRect = coverRect;
- float trajectoryVectorNorm = sqrt(pow(m_visibleRectTrajectoryVector.x(), 2) + pow(m_visibleRectTrajectoryVector.y(), 2));
+ float trajectoryVectorNorm = sqrt(pow(m_trajectoryVector.x(), 2) + pow(m_trajectoryVector.y(), 2));
if (trajectoryVectorNorm) {
// A null trajectory vector (no motion) means that tiles for the coverArea will be created.
// A non-null trajectory vector will shrink the covered rect to visibleRect plus its expansion from its
@@ -354,8 +354,8 @@
// Unite the visible rect with a "ghost" of the visible rect moved in the direction of the trajectory vector.
coverRect = visibleRect;
- coverRect.move(coverRect.width() * m_visibleRectTrajectoryVector.x() / trajectoryVectorNorm * trajectoryVectorMultiplier,
- coverRect.height() * m_visibleRectTrajectoryVector.y() / trajectoryVectorNorm * trajectoryVectorMultiplier);
+ coverRect.move(coverRect.width() * m_trajectoryVector.x() / trajectoryVectorNorm * trajectoryVectorMultiplier,
+ coverRect.height() * m_trajectoryVector.y() / trajectoryVectorNorm * trajectoryVectorMultiplier);
coverRect.unite(visibleRect);
}
@@ -416,7 +416,7 @@
void TiledBackingStore::removeAllNonVisibleTiles()
{
- setKeepRect(visibleContentsRect());
+ setKeepRect(visibleRect());
}
PassRefPtr<Tile> TiledBackingStore::tileAt(const Tile::Coordinate& coordinate) const
Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.h (109737 => 109738)
--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.h 2012-03-05 14:16:15 UTC (rev 109737)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.h 2012-03-05 14:26:00 UTC (rev 109738)
@@ -99,7 +99,7 @@
void setTile(const Tile::Coordinate& coordinate, PassRefPtr<Tile> tile);
void removeTile(const Tile::Coordinate& coordinate);
- IntRect visibleContentsRect() const;
+ IntRect visibleRect() const;
float coverageRatio(const IntRect&) const;
void adjustForContentsRect(IntRect&) const;
@@ -119,9 +119,9 @@
IntSize m_tileSize;
double m_tileCreationDelay;
float m_coverAreaMultiplier;
- FloatPoint m_visibleRectTrajectoryVector;
- IntRect m_previousVisibleRect;
+ FloatPoint m_trajectoryVector;
+ IntRect m_visibleRect;
IntRect m_keepRect;
IntRect m_rect;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
