Bug 1059033 - Part 3: Avoid save/restoring for tiles that are entirely clipped out. r=Bas

gfx/2d/DrawTargetTiled.cpp

@@ -48,7 +48,7 @@ DrawTargetTiled::Init(const TileSet& aTiles)
 class SnapshotTiled : public SourceSurface
 {
 public:
-  SnapshotTiled(const vector<Tile>& aTiles, const IntRect& aRect)
+  SnapshotTiled(const vector<TileInternal>& aTiles, const IntRect& aRect)
     : mRect(aRect)
   {
     for (size_t i = 0; i < aTiles.size(); i++) {
@@ -97,14 +97,14 @@ DrawTargetTiled::Snapshot()
   return new SnapshotTiled(mTiles, mRect);
 }
 
+// Skip the mClippedOut check since this is only used for Flush() which
+// should happen even if we're clipped.
 #define TILED_COMMAND(command) \
   void \
   DrawTargetTiled::command() \
   { \
     for (size_t i = 0; i < mTiles.size(); i++) { \
-    \
+      mTiles[i].mDrawTarget->command(); \
-    \
-    mTiles[i].mDrawTarget->command(); \
     } \
   }
 #define TILED_COMMAND1(command, type1) \
@@ -112,9 +112,8 @@ DrawTargetTiled::Snapshot()
   DrawTargetTiled::command(type1 arg1) \
   { \
     for (size_t i = 0; i < mTiles.size(); i++) { \
-    \
+      if (!mTiles[i].mClippedOut) \
-    \
+        mTiles[i].mDrawTarget->command(arg1); \
-    mTiles[i].mDrawTarget->command(arg1); \
     } \
   }
 #define TILED_COMMAND3(command, type1, type2, type3) \
@@ -122,9 +121,8 @@ DrawTargetTiled::Snapshot()
   DrawTargetTiled::command(type1 arg1, type2 arg2, type3 arg3) \
   { \
     for (size_t i = 0; i < mTiles.size(); i++) { \
-    \
+      if (!mTiles[i].mClippedOut) \
-    \
+        mTiles[i].mDrawTarget->command(arg1, arg2, arg3); \
-    mTiles[i].mDrawTarget->command(arg1, arg2, arg3); \
     } \
   }
 #define TILED_COMMAND4(command, type1, type2, type3, type4) \
@@ -132,9 +130,8 @@ DrawTargetTiled::Snapshot()
   DrawTargetTiled::command(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
   { \
     for (size_t i = 0; i < mTiles.size(); i++) { \
-    \
+      if (!mTiles[i].mClippedOut) \
-    \
+        mTiles[i].mDrawTarget->command(arg1, arg2, arg3, arg4); \
-    mTiles[i].mDrawTarget->command(arg1, arg2, arg3, arg4); \
     } \
   }
 #define TILED_COMMAND5(command, type1, type2, type3, type4, type5) \
@@ -142,9 +139,8 @@ DrawTargetTiled::Snapshot()
   DrawTargetTiled::command(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \
   { \
     for (size_t i = 0; i < mTiles.size(); i++) { \
-    \
+      if (!mTiles[i].mClippedOut) \
-    \
+        mTiles[i].mDrawTarget->command(arg1, arg2, arg3, arg4, arg5); \
-    mTiles[i].mDrawTarget->command(arg1, arg2, arg3, arg4, arg5); \
     } \
   }
 
@@ -156,9 +152,69 @@ TILED_COMMAND4(StrokeRect, const Rect&, const Pattern&, const StrokeOptions&, co
 TILED_COMMAND5(StrokeLine, const Point&, const Point&, const Pattern&, const StrokeOptions&, const DrawOptions&)
 TILED_COMMAND5(FillGlyphs, ScaledFont*, const GlyphBuffer&, const Pattern&, const DrawOptions&, const GlyphRenderingOptions*)
 TILED_COMMAND3(Mask, const Pattern&, const Pattern&, const DrawOptions&)
-TILED_COMMAND1(PushClip, const Path*)
+
-TILED_COMMAND1(PushClipRect, const Rect&)
+void
-TILED_COMMAND(PopClip)
+DrawTargetTiled::PushClip(const Path* aPath)
+{
+  mClippedOutTilesStack.push_back(std::vector<uint32_t>());
+  std::vector<uint32_t>& clippedTiles = mClippedOutTilesStack.back();
+
+  Rect deviceRect = aPath->GetBounds(mTransform);
+
+  for (size_t i = 0; i < mTiles.size(); i++) {
+    if (!mTiles[i].mClippedOut) {
+      if (deviceRect.Intersects(Rect(mTiles[i].mTileOrigin.x,
+                                   mTiles[i].mTileOrigin.y,
+                                   mTiles[i].mDrawTarget->GetSize().width,
+                                   mTiles[i].mDrawTarget->GetSize().height))) {
+        mTiles[i].mDrawTarget->PushClip(aPath);
+      } else {
+        mTiles[i].mClippedOut = true;
+        clippedTiles.push_back(i);
+      }
+    }
+  }
+}
+
+void
+DrawTargetTiled::PushClipRect(const Rect& aRect)
+{
+  mClippedOutTilesStack.push_back(std::vector<uint32_t>());
+  std::vector<uint32_t>& clippedTiles = mClippedOutTilesStack.back();
+
+  Rect deviceRect = mTransform.TransformBounds(aRect);
+
+  for (size_t i = 0; i < mTiles.size(); i++) {
+    if (!mTiles[i].mClippedOut) {
+      if (deviceRect.Intersects(Rect(mTiles[i].mTileOrigin.x,
+                                   mTiles[i].mTileOrigin.y,
+                                   mTiles[i].mDrawTarget->GetSize().width,
+                                   mTiles[i].mDrawTarget->GetSize().height))) {
+        mTiles[i].mDrawTarget->PushClipRect(aRect);
+      } else {
+        mTiles[i].mClippedOut = true;
+        clippedTiles.push_back(i);
+      }
+    }
+  }
+}
+
+void
+DrawTargetTiled::PopClip()
+{
+  for (size_t i = 0; i < mTiles.size(); i++) {
+    if (!mTiles[i].mClippedOut) {
+      mTiles[i].mDrawTarget->PopClip();
+    }
+  }
+
+  std::vector<uint32_t>& clippedTiles = mClippedOutTilesStack.back();
+  for (size_t i = 0; i < clippedTiles.size(); i++) {
+    mTiles[clippedTiles[i]].mClippedOut = false;
+  }
+
+  mClippedOutTilesStack.pop_back();
+}
 
 void
 DrawTargetTiled::CopySurface(SourceSurface *aSurface,
@@ -197,7 +253,8 @@ DrawTargetTiled::DrawSurface(SourceSurface* aSurface, const Rect& aDest, const R
 {
   Rect deviceRect = mTransform.TransformBounds(aDest);
   for (size_t i = 0; i < mTiles.size(); i++) {
-    if (deviceRect.Intersects(Rect(mTiles[i].mTileOrigin.x,
+    if (!mTiles[i].mClippedOut &&
+        deviceRect.Intersects(Rect(mTiles[i].mTileOrigin.x,
                                    mTiles[i].mTileOrigin.y,
                                    mTiles[i].mDrawTarget->GetSize().width,
                                    mTiles[i].mDrawTarget->GetSize().height))) {
@@ -211,7 +268,8 @@ DrawTargetTiled::FillRect(const Rect& aRect, const Pattern& aPattern, const Draw
 {
   Rect deviceRect = mTransform.TransformBounds(aRect);
   for (size_t i = 0; i < mTiles.size(); i++) {
-    if (deviceRect.Intersects(Rect(mTiles[i].mTileOrigin.x,
+    if (!mTiles[i].mClippedOut &&
+        deviceRect.Intersects(Rect(mTiles[i].mTileOrigin.x,
                                    mTiles[i].mTileOrigin.y,
                                    mTiles[i].mDrawTarget->GetSize().width,
                                    mTiles[i].mDrawTarget->GetSize().height))) {
@@ -255,7 +313,8 @@ DrawTargetTiled::Stroke(const Path* aPath, const Pattern& aPattern, const Stroke
                                                  aPath->GetBounds(mTransform),
                                                  mTransform);
   for (size_t i = 0; i < mTiles.size(); i++) {
-    if (deviceRect.Intersects(Rect(mTiles[i].mTileOrigin.x,
+    if (!mTiles[i].mClippedOut &&
+        deviceRect.Intersects(Rect(mTiles[i].mTileOrigin.x,
                                    mTiles[i].mTileOrigin.y,
                                    mTiles[i].mDrawTarget->GetSize().width,
                                    mTiles[i].mDrawTarget->GetSize().height))) {
@@ -269,7 +328,8 @@ DrawTargetTiled::Fill(const Path* aPath, const Pattern& aPattern, const DrawOpti
 {
   Rect deviceRect = aPath->GetBounds(mTransform);
   for (size_t i = 0; i < mTiles.size(); i++) {
-    if (deviceRect.Intersects(Rect(mTiles[i].mTileOrigin.x,
+    if (!mTiles[i].mClippedOut &&
+        deviceRect.Intersects(Rect(mTiles[i].mTileOrigin.x,
                                    mTiles[i].mTileOrigin.y,
                                    mTiles[i].mDrawTarget->GetSize().width,
                                    mTiles[i].mDrawTarget->GetSize().height))) {

gfx/2d/DrawTargetTiled.h

@@ -14,6 +14,20 @@
 namespace mozilla {
 namespace gfx {
 
+struct TileInternal : public Tile {
+  TileInternal()
+    : mClippedOut(false)
+  {}
+
+  TileInternal(const Tile& aOther)
+    : Tile(aOther)
+    , mClippedOut(false)
+  {}
+
+  bool mClippedOut;
+};
+
+
 class DrawTargetTiled : public DrawTarget
 {
 public:
@@ -130,7 +144,8 @@ public:
   }
 
 private:
-  std::vector<Tile> mTiles;
+  std::vector<TileInternal> mTiles;
+  std::vector<std::vector<uint32_t> > mClippedOutTilesStack;
   IntRect mRect;
 };