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

src/core/SkPictureFlat.h

Index: src/core/SkPictureFlat.h
diff --git a/src/core/SkPictureFlat.h b/src/core/SkPictureFlat.h
index cbacc8e6647d8e2b79a70cb3be225718624dc629..4eee04fcdab64628b34bba8c5afe4da25d40fb4a 100644
--- a/src/core/SkPictureFlat.h
+++ b/src/core/SkPictureFlat.h
@@ -75,9 +75,10 @@ enum DrawType {
     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*
@@ -95,6 +96,13 @@ enum DrawAtlasFlags {
     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