Revert 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 4eee04fcdab64628b34bba8c5afe4da25d40fb4a..cbacc8e6647d8e2b79a70cb3be225718624dc629 100644
--- a/src/core/SkPictureFlat.h
+++ b/src/core/SkPictureFlat.h
@@ -75,10 +75,9 @@
     DRAW_IMAGE_NINE,
     DRAW_IMAGE_RECT,
 
-    SAVE_LAYER_SAVELAYERFLAGS_DEPRECATED_JAN_2016,
-    SAVE_LAYER_SAVELAYERREC,
-
-    LAST_DRAWTYPE_ENUM = SAVE_LAYER_SAVELAYERREC,
+    SAVE_LAYER_SAVELAYERFLAGS,
+
+    LAST_DRAWTYPE_ENUM = SAVE_LAYER_SAVELAYERFLAGS,
 };
 
 // In the 'match' method, this constant will match any flavor of DRAW_BITMAP*
@@ -94,13 +93,6 @@
 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,
 };
 
 ///////////////////////////////////////////////////////////////////////////////