Revert of Add image as a draw type that can be filtered

tools/bench_pictures_main.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "BenchLogger.h"
 #include "Timer.h"
 #include "CopyTilesRenderer.h"
@@ skipping 57 matching lines @@
 DEFINE_string(gitHash, "", "Commit hash of the revision of Skia being run.");
 DEFINE_int32(gitNumber, -1, "Git number of the revision of Skia being run.");
 
 
 static char const * const gFilterTypes[] = {
     "paint",
     "point",
     "line",
     "bitmap",
     "rect",
-    "rrect",
     "oval",
     "path",
     "text",
-    "image",
     "all",
 };
 
 static const size_t kFilterTypesCount = sizeof(gFilterTypes) / sizeof(gFilterTypes[0]);
 
-SK_COMPILE_ASSERT(kFilterTypesCount - 1u == SkDrawFilter::kTypeCount,
-                  filter_types_list_is_not_exact);
-
 static char const * const gFilterFlags[] = {
     "antiAlias",
     "filterBitmap",
     "dither",
     "underlineText",
     "strikeThruText",
     "fakeBoldText",
     "linearText",
     "subpixelText",
     "devKernText",
@@ skipping 383 matching lines @@
 
     gWriter.end();
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif