change signature for virtual related to saveLayer, passing SaveLayerRec

src/pipe/SkGPipeWrite.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAnnotation.h"
 #include "SkBitmapHeap.h"
@@ skipping 230 matching lines @@
     /**
      * Flatten an SkBitmap to send to the reader, where it will be referenced
      * according to slot.
      */
     bool shuttleBitmap(const SkBitmap&, int32_t slot);
 
     void resetImageHeap();
 
 protected:
     void willSave() override;
-    SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override;
+    SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec&) override;
     void willRestore() override;
 
     void didConcat(const SkMatrix&) override;
     void didSetMatrix(const SkMatrix&) override;
 
     void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
     void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                     const SkPaint&) override;
     void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
                        const SkPaint&) override;
@@ skipping 273 matching lines @@
 
 void SkGPipeCanvas::willSave() {
     NOTIFY_SETUP(this);
     if (this->needOpBytes()) {
         this->writeOp(kSave_DrawOp);
     }
 
     this->INHERITED::willSave();
 }
 
-SkCanvas::SaveLayerStrategy SkGPipeCanvas::willSaveLayer(const SkRect* bounds, const SkPaint* paint,
-                                                         SaveFlags saveFlags) {
+SkCanvas::SaveLayerStrategy SkGPipeCanvas::getSaveLayerStrategy(const SaveLayerRec& rec) {
     NOTIFY_SETUP(this);
     size_t size = 0;
     unsigned opFlags = 0;
 
-    if (bounds) {
+    if (rec.fBounds) {
         opFlags |= kSaveLayer_HasBounds_DrawOpFlag;
         size += sizeof(SkRect);
     }
-    if (paint) {
+    if (rec.fPaint) {
         opFlags |= kSaveLayer_HasPaint_DrawOpFlag;
-        this->writePaint(*paint);
+        this->writePaint(*rec.fPaint);
     }
 
     if (this->needOpBytes(size)) {
-        this->writeOp(kSaveLayer_DrawOp, opFlags, saveFlags);
-        if (bounds) {
-            fWriter.writeRect(*bounds);
+        this->writeOp(kSaveLayer_DrawOp, opFlags, rec.fSaveLayerFlags);
+        if (rec.fBounds) {
+            fWriter.writeRect(*rec.fBounds);
         }
     }
 
-    this->INHERITED::willSaveLayer(bounds, paint, saveFlags);
+    (void)this->INHERITED::getSaveLayerStrategy(rec);
     // we don't create a layer
     return kNoLayer_SaveLayerStrategy;
 }
 
 void SkGPipeCanvas::willRestore() {
     NOTIFY_SETUP(this);
     if (this->needOpBytes()) {
         this->writeOp(kRestore_DrawOp);
     }
 
@@ skipping 897 matching lines @@
     int32_t slot = this->find(img);
     if (slot) {
         return slot;
     }
     // TODO: SkImage does not expose bytes per pixel, 4 is just a best guess.
     fBytesInCache += img->width() * img->height() * 4;
     *fArray.append() = SkRef(img);
     return fArray.count();  // slot is always index+1
 }