Revert[2] of "add backdrop option to SaveLayerRec"

src/core/SkPictureFlat.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkPictureFlat_DEFINED
 #define SkPictureFlat_DEFINED
 
@@ skipping 57 matching lines @@
 
     DRAW_PATCH, // could not add in aphabetical order
     DRAW_PICTURE_MATRIX_PAINT,
     DRAW_TEXT_BLOB,
     DRAW_IMAGE,
     DRAW_IMAGE_RECT_STRICT, // deprecated (M45)
     DRAW_ATLAS,
     DRAW_IMAGE_NINE,
     DRAW_IMAGE_RECT,
 
-    SAVE_LAYER_SAVELAYERFLAGS,
+    SAVE_LAYER_SAVELAYERFLAGS_DEPRECATED_JAN_2016,
+    SAVE_LAYER_SAVELAYERREC,
 
-    LAST_DRAWTYPE_ENUM = SAVE_LAYER_SAVELAYERFLAGS,
+    LAST_DRAWTYPE_ENUM = SAVE_LAYER_SAVELAYERREC,
 };
 
 // In the 'match' method, this constant will match any flavor of DRAW_BITMAP*
 static const int kDRAW_BITMAP_FLAVOR = LAST_DRAWTYPE_ENUM+1;
 
 enum DrawVertexFlags {
     DRAW_VERTICES_HAS_TEXS    = 0x01,
     DRAW_VERTICES_HAS_COLORS  = 0x02,
     DRAW_VERTICES_HAS_INDICES = 0x04,
     DRAW_VERTICES_HAS_XFER    = 0x08,
 };
 
 enum DrawAtlasFlags {
     DRAW_ATLAS_HAS_COLORS   = 1 << 0,
     DRAW_ATLAS_HAS_CULL     = 1 << 1,
 };
 
+enum SaveLayerRecFlatFlags {
+    SAVELAYERREC_HAS_BOUNDS     = 1 << 0,
+    SAVELAYERREC_HAS_PAINT      = 1 << 1,
+    SAVELAYERREC_HAS_BACKDROP   = 1 << 2,
+    SAVELAYERREC_HAS_FLAGS      = 1 << 3,
+};
+
 ///////////////////////////////////////////////////////////////////////////////
 // clipparams are packed in 5 bits
 //  doAA:1 | regionOp:4
 
 static inline uint32_t ClipParams_pack(SkRegion::Op op, bool doAA) {
     unsigned doAABit = doAA ? 1 : 0;
     return (doAABit << 4) | op;
 }
 
 static inline SkRegion::Op ClipParams_unpackRegionOp(uint32_t packed) {
@@ skipping 447 matching lines @@
     bool fReady;
 
     // For index -> SkFlatData.  0-based, while all indices in the API are 1-based.  Careful!
     SkTDArray<const SkFlatData*> fIndexedData;
 
     // For SkFlatData -> cached SkFlatData, which has index().
     SkTDynamicHash<SkFlatData, SkFlatData, SkFlatData::HashTraits> fHash;
 };
 
 #endif