Changeset 109738 in webkit

Timestamp:

Mar 5, 2012 6:26:00 AM (12 years ago)

Author:

ahf@0x90.dk

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/TiledBackingStore.cpp (modified) (7 diffs)
• platform/graphics/TiledBackingStore.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-05  Alexander Færøy  <alexander.faeroy@nokia.com>
+
+        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  <simon.hausmann@nokia.com>
 

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

@@ -69 +69 @@
 }
 
-void TiledBackingStore::coverWithTilesIfNeeded(const FloatPoint& panningTrajectoryVector)
-{
-    IntRect visibleRect = visibleContentsRect();
-    if (m_visibleRectTrajectoryVector == panningTrajectoryVector && m_previousVisibleRect == visibleRect)
-        return;
-
-    m_visibleRectTrajectoryVector = panningTrajectoryVector;
-    m_previousVisibleRect = visibleRect;
+void TiledBackingStore::coverWithTilesIfNeeded(const FloatPoint& trajectoryVector)
+{
+    IntRect visibleRect = this->visibleRect();
+    if (m_trajectoryVector == trajectoryVector && m_visibleRect == visibleRect)
+        return;
+
+    m_trajectoryVector = trajectoryVector;
+    m_visibleRect = visibleRect;
 
     startTileCreationTimer();
@@ -165 +165 @@
 }
 
-IntRect TiledBackingStore::visibleContentsRect() const
+IntRect TiledBackingStore::visibleRect() const
 {
     return mapFromContents(intersection(m_client->tiledBackingStoreVisibleRect(), m_client->tiledBackingStoreContentsRect()));
@@ -226 +226 @@
 bool TiledBackingStore::visibleAreaIsCovered() const
 {
-    return coverageRatio(visibleContentsRect()) == 1.0f;
+    return coverageRatio(visibleRect()) == 1.0f;
 }
 
@@ -237 +237 @@
     m_rect = mapFromContents(m_client->tiledBackingStoreContentsRect());
 
-    const IntRect visibleRect = visibleContentsRect();
-    m_previousVisibleRect = visibleRect;
+    const IntRect visibleRect = this->visibleRect();
+    m_visibleRect = visibleRect;
 
     if (visibleRect.isEmpty())
@@ -339 +339 @@
         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.
@@ -355 +355 @@
             // 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);
@@ -417 +417 @@
 void TiledBackingStore::removeAllNonVisibleTiles()
 {
-    setKeepRect(visibleContentsRect());
+    setKeepRect(visibleRect());
 }
 

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

@@ -100 +100 @@
     void removeTile(const Tile::Coordinate& coordinate);
 
-    IntRect visibleContentsRect() const;
+    IntRect visibleRect() const;
 
     float coverageRatio(const IntRect&) const;
@@ -120 +120 @@
     double m_tileCreationDelay;
     float m_coverAreaMultiplier;
-    FloatPoint m_visibleRectTrajectoryVector;
 
-    IntRect m_previousVisibleRect;
+    FloatPoint m_trajectoryVector;
+    IntRect m_visibleRect;
 
     IntRect m_keepRect;