Move off SK_SUPPORT_LEGACY_DATA_FACTORIES.

fuzz/fuzz.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Fuzz.h"
 #include "SkCanvas.h"
 #include "SkCodec.h"
@@ skipping 26 matching lines @@
 static int fuzz_api(SkData*);
 static int fuzz_img(SkData*, uint8_t, uint8_t);
 static int fuzz_skp(SkData*);
 static int fuzz_icc(SkData*);
 static int fuzz_color_deserialize(SkData*);
 
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
 
     const char* path = FLAGS_bytes.isEmpty() ? argv[0] : FLAGS_bytes[0];
-    SkAutoTUnref<SkData> bytes(SkData::NewFromFileName(path));
+    sk_sp<SkData> bytes(SkData::MakeFromFileName(path));
     if (!bytes) {
         SkDebugf("Could not read %s\n", path);
         return 2;
     }
 
-    uint8_t option = calculate_option(bytes);
+    uint8_t option = calculate_option(bytes.get());
 
     if (!FLAGS_type.isEmpty()) {
         switch (FLAGS_type[0][0]) {
-            case 'a': return fuzz_api(bytes);
+            case 'a': return fuzz_api(bytes.get());
 
-            case 'c': return fuzz_color_deserialize(bytes);
+            case 'c': return fuzz_color_deserialize(bytes.get());
 
             case 'i':
                 if (FLAGS_type[0][1] == 'c') { //icc
-                    return fuzz_icc(bytes);
+                    return fuzz_icc(bytes.get());
                 }
                 // We only allow one degree of freedom to avoid a search space explosion for afl-fuzz.
                 if (FLAGS_type[0][6] == 's') { // image_scale
-                    return fuzz_img(bytes, option, 0);
+                    return fuzz_img(bytes.get(), option, 0);
                 }
                 // image_mode
-                return fuzz_img(bytes, 0, option);
-            case 's': return fuzz_skp(bytes);
+                return fuzz_img(bytes.get(), 0, option);
+            case 's': return fuzz_skp(bytes.get());
         }
     }
     return printUsage(argv[0]);
 }
 
 // This adds up the first 1024 bytes and returns it as an 8 bit integer.  This allows afl-fuzz to
 // deterministically excercise different paths, or *options* (such as different scaling sizes or
 // different image modes) without needing to introduce a parameter.  This way we don't need a
 // image_scale1, image_scale2, image_scale4, etc fuzzer, we can just have a image_scale fuzzer.
 // Clients are expected to transform this number into a different range, e.g. with modulo (%).
@@ skipping 370 matching lines @@
     if (min > max) {
         SkDebugf("Check mins and maxes (%f, %f)\n", min, max);
         this->signalBoring();
     }
     float f = std::abs(this->nextF());
     if (!std::isnormal(f) && f != 0.0) {
         this->signalBoring();
     }
     return min + fmod(f, (max - min + 1));
 }