Add clip to layer cache

src/gpu/GrPictureUtils.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrPictureUtils.h"
 
 #include "SkPaintPriv.h"
@@ skipping 90 matching lines @@
     void trackSaveLayers(const SkRecords::SaveLayer& sl) { this->pushSaveLayerBlock(sl.paint); }
     void trackSaveLayers(const SkRecords::Restore& r) { this->popSaveBlock(); }
     void trackSaveLayers(const SkRecords::DrawPicture& dp) {
         // For sub-pictures, we wrap their layer information within the parent
         // picture's rendering hierarchy
         const GrAccelData* childData = GPUOptimize(dp.picture);
 
         for (int i = 0; i < childData->numSaveLayers(); ++i) {
             const GrAccelData::SaveLayerInfo& src = childData->saveLayerInfo(i);
 
+            SkRect srcRect = SkRect::Make(src.fBounds);
+            SkIRect newClip(fCurrentClipBounds);
+
+            if (!newClip.intersect(this->adjustAndMap(srcRect, dp.paint))) {
+                continue;
+            }
+
             this->updateStackForSaveLayer();
 
-            // TODO: need to store an SkRect in GrAccelData::SaveLayerInfo?
-            SkRect srcRect = SkRect::MakeXYWH(SkIntToScalar(src.fOffset.fX),
-                                              SkIntToScalar(src.fOffset.fY),
-                                              SkIntToScalar(src.fSize.width()),
-                                              SkIntToScalar(src.fSize.height()));
-            SkIRect newClip(fCurrentClipBounds);
-            newClip.intersect(this->adjustAndMap(srcRect, dp.paint));
-
             GrAccelData::SaveLayerInfo& dst = fAccelData->addSaveLayerInfo();
 
             // If src.fPicture is NULL the layer is in dp.picture; otherwise
             // it belongs to a sub-picture.
             dst.fPicture = src.fPicture ? src.fPicture : static_cast<const SkPicture*>(dp.picture);
             dst.fPicture->ref();
-            dst.fSize = SkISize::Make(newClip.width(), newClip.height());
-            dst.fOffset = SkIPoint::Make(newClip.fLeft, newClip.fTop);
+            dst.fBounds = newClip;
             dst.fOriginXform = src.fOriginXform;
             dst.fOriginXform.postConcat(*fCTM);
             if (src.fPaint) {
                 dst.fPaint = SkNEW_ARGS(SkPaint, (*src.fPaint));
             }
             dst.fSaveLayerOpID = src.fSaveLayerOpID;
             dst.fRestoreOpID = src.fRestoreOpID;
             dst.fHasNestedLayers = src.fHasNestedLayers;
             dst.fIsNested = fSaveLayersInStack > 0 || src.fIsNested;
         }
@@ skipping 35 matching lines @@
 
         if (!si.fIsSaveLayer) {
             return;
         }
 
         --fSaveLayersInStack;
 
         GrAccelData::SaveLayerInfo& slInfo = fAccelData->addSaveLayerInfo();
 
         SkASSERT(NULL == slInfo.fPicture);  // This layer is in the top-most picture
-        slInfo.fSize = SkISize::Make(si.fBounds.width(), si.fBounds.height());
-        slInfo.fOffset = SkIPoint::Make(si.fBounds.fLeft, si.fBounds.fTop);
+        slInfo.fBounds = si.fBounds;
         slInfo.fOriginXform = *fCTM;
         if (si.fPaint) {
             slInfo.fPaint = SkNEW_ARGS(SkPaint, (*si.fPaint));
         }
         slInfo.fSaveLayerOpID = si.fStartIndex;
         slInfo.fRestoreOpID = fCurrentOp;
         slInfo.fHasNestedLayers = si.fHasNestedSaveLayer;
         slInfo.fIsNested = fSaveLayersInStack > 0;
     }
 
@@ skipping 58 matching lines @@
     }
 
     SkAutoTUnref<GrAccelData> data(SkNEW_ARGS(GrAccelData, (key)));
 
     pict->EXPERIMENTAL_addAccelData(data);
 
     CollectLayers collector(pict, data);
 
     return data;
 }