Turn serialization back on in GM.
With https://codereview.appspot.com/6503106/ it is now safe to do
serialization by default.
Review URL: https://codereview.appspot.com/6498121
git-svn-id: http://skia.googlecode.com/svn/trunk@5551 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index f13d99f..c4ed298 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -775,7 +775,7 @@
SkDebugf(gRec[i].fName);
}
SkDebugf(" ]\n");
- SkDebugf(" [--noreplay] [--nopipe] [--serialize] [--forceBWtext] [--nopdf] \n"
+ SkDebugf(" [--noreplay] [--nopipe] [--noserialize] [--forceBWtext] [--nopdf] \n"
" [--tiledPipe] \n"
" [--nodeferred] [--match substring] [--notexturecache]\n"
" [-h|--help]\n"
@@ -791,7 +791,7 @@
SkDebugf(" --nopipe: Skip SkGPipe replay.\n");
SkDebugf(" --tiledPipe: Exercise tiled SkGPipe replay.\n");
SkDebugf(
- " --serialize: exercise SkPicture serialization & deserialization.\n");
+ " --noserialize: do not exercise SkPicture serialization & deserialization.\n");
SkDebugf(" --forceBWtext: disable text anti-aliasing.\n");
SkDebugf(" --nopdf: skip the pdf rendering test pass.\n");
SkDebugf(" --nodeferred: skip the deferred rendering test pass.\n");
@@ -888,7 +888,7 @@
bool doReplay = true;
bool doPipe = true;
bool doTiledPipe = false;
- bool doSerialize = false;
+ bool doSerialize = true;
bool doDeferred = true;
bool disableTextureCache = false;
SkTDArray<size_t> configs;
@@ -941,7 +941,11 @@
} else if (strcmp(*argv, "--enable-missing-warning") == 0) {
gNotifyMissingReadReference = true;
} else if (strcmp(*argv, "--serialize") == 0) {
+ // Leaving in this option so that a user need not modify their command line arguments
+ // to still run.
doSerialize = true;
+ } else if (strcmp(*argv, "--noserialize") == 0) {
+ doSerialize = false;
} else if (strcmp(*argv, "--match") == 0) {
++argv;
if (argv < stop && **argv) {