Title: [154415] trunk/Source/WebCore
- Revision
- 154415
- Author
- [email protected]
- Date
- 2013-08-21 14:08:53 -0700 (Wed, 21 Aug 2013)
Log Message
revalidateTiles and ensureTilesForRect can share a lot of code
https://bugs.webkit.org/show_bug.cgi?id=119282
Missed the review comments, whoops.
* platform/graphics/ca/mac/TileController.h:
* platform/graphics/ca/mac/TileController.mm:
(WebCore::TileController::prepopulateRect):
(WebCore::TileController::revalidateTiles):
(WebCore::TileController::ensureTilesForRect):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154414 => 154415)
--- trunk/Source/WebCore/ChangeLog 2013-08-21 21:07:32 UTC (rev 154414)
+++ trunk/Source/WebCore/ChangeLog 2013-08-21 21:08:53 UTC (rev 154415)
@@ -1,3 +1,16 @@
+2013-08-21 Tim Horton <[email protected]>
+
+ revalidateTiles and ensureTilesForRect can share a lot of code
+ https://bugs.webkit.org/show_bug.cgi?id=119282
+
+ Missed the review comments, whoops.
+
+ * platform/graphics/ca/mac/TileController.h:
+ * platform/graphics/ca/mac/TileController.mm:
+ (WebCore::TileController::prepopulateRect):
+ (WebCore::TileController::revalidateTiles):
+ (WebCore::TileController::ensureTilesForRect):
+
2013-08-21 Andreas Kling <[email protected]>
<https://webkit.org/b/120115> SVG elements always have custom style resolve callbacks.
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h (154414 => 154415)
--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h 2013-08-21 21:07:32 UTC (rev 154414)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h 2013-08-21 21:08:53 UTC (rev 154415)
@@ -146,8 +146,10 @@
typedef unsigned TileValidationPolicyFlags;
void revalidateTiles(TileValidationPolicyFlags foregroundValidationPolicy = 0, TileValidationPolicyFlags backgroundValidationPolicy = 0);
- enum class NewTileType { PrimaryTiles, SecondaryTiles };
- IntRect ensureTilesForRect(const FloatRect&, NewTileType);
+ enum class CoverageType { PrimaryTiles, SecondaryTiles };
+
+ // Returns the bounds of the covered tiles.
+ IntRect ensureTilesForRect(const FloatRect&, CoverageType);
void updateTileCoverageMap();
void removeAllTiles();
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm (154414 => 154415)
--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2013-08-21 21:07:32 UTC (rev 154414)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2013-08-21 21:08:53 UTC (rev 154415)
@@ -357,7 +357,7 @@
if (m_primaryTileCoverageRect.contains(rectInTileCoords))
return;
- ensureTilesForRect(rect, NewTileType::SecondaryTiles);
+ ensureTilesForRect(rect, CoverageType::SecondaryTiles);
if (m_tiledScrollingIndicatorLayer)
updateTileCoverageMap();
@@ -673,7 +673,7 @@
}
// Ensure primary tile coverage tiles.
- m_primaryTileCoverageRect = ensureTilesForRect(tileCoverageRect, NewTileType::PrimaryTiles);
+ m_primaryTileCoverageRect = ensureTilesForRect(tileCoverageRect, CoverageType::PrimaryTiles);
if (validationPolicy & PruneSecondaryTiles) {
removeAllSecondaryTiles();
@@ -768,7 +768,7 @@
updateTileCoverageMap();
}
-IntRect TileController::ensureTilesForRect(const FloatRect& rect, NewTileType newTileType)
+IntRect TileController::ensureTilesForRect(const FloatRect& rect, CoverageType newTileType)
{
if (m_unparentsOffscreenTiles && !m_isInWindow)
return IntRect();
@@ -813,7 +813,7 @@
[tileInfo.layer.get() setFrame:tileRect];
}
- if (newTileType == NewTileType::SecondaryTiles && !tileRect.intersects(m_primaryTileCoverageRect)) {
+ if (newTileType == CoverageType::SecondaryTiles && !tileRect.intersects(m_primaryTileCoverageRect)) {
tileInfo.cohort = currCohort;
++tilesInCohort;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
