diff options
| author |  Mike Reed <reed@google.com> | 2017-07-23 15:30:02 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-25 15:35:23 +0000 |
| commit | ede7bac43fbc69b9fdf1c178890ba6353f5bb140 (patch) | |
| tree | dccdba46e7abf125e2f90e6dc08eca00ad9cb09b /bench/CodecBench.cpp | |
| parent | fa3ed03720b5083afd3620c9239863f05f2eedbd (diff) | |
use unique_ptr for codec factories
Will need guards for android (at least)
Bug: skia:
Change-Id: I2bb8e656997984489ef1f2e41cd3d301c4e7b947
Reviewed-on: https://skia-review.googlesource.com/26040
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'bench/CodecBench.cpp')
| -rw-r--r-- | bench/CodecBench.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/bench/CodecBench.cpp b/bench/CodecBench.cpp index f72294e246..29443746f7 100644 --- a/bench/CodecBench.cpp +++ b/bench/CodecBench.cpp @@ -24,11 +24,8 @@ CodecBench::CodecBench(SkString baseName, SkData* encoded, SkColorType colorType // Parse filename and the color type to give the benchmark a useful name fName.printf("Codec_%s_%s%s", baseName.c_str(), color_type_to_str(colorType), alpha_type_to_str(alphaType)); -#ifdef SK_DEBUG // Ensure that we can create an SkCodec from this data. - std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(fData)); - SkASSERT(codec); -#endif + SkASSERT(SkCodec::MakeFromData(fData)); } const char* CodecBench::onGetName() { @@ -40,7 +37,7 @@ bool CodecBench::isSuitableFor(Backend backend) { } void CodecBench::onDelayedSetup() { - std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(fData)); + std::unique_ptr<SkCodec> codec = SkCodec::MakeFromData(fData); fInfo = codec->getInfo().makeColorType(fColorType) .makeAlphaType(fAlphaType) @@ -56,7 +53,7 @@ void CodecBench::onDraw(int n, SkCanvas* canvas) { options.fZeroInitialized = SkCodec::kYes_ZeroInitialized; } for (int i = 0; i < n; i++) { - codec.reset(SkCodec::NewFromData(fData)); + codec = SkCodec::MakeFromData(fData); #ifdef SK_DEBUG const SkCodec::Result result = #endif |