From 0510edeebf76b8a9753acc06afde8b09a8f00a54 Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Thu, 14 Jun 2018 18:41:39 +0000 Subject: Revert "[skjson] Size-constrained input API" This reverts commit fc792b8718cc30e9da62c9559b23c1baac3166bb. Reason for revert: New ASAN, Android failures. Original change's description: > [skjson] Size-constrained input API > > Pass an explicit input size instead of requiring a C string. > > Thanks to mtklein's clever trick, this has no measurable perf impact. > > Change-Id: I64f210a9f653a78b05ab6b58fa34479504aa35ff > Reviewed-on: https://skia-review.googlesource.com/134940 > Reviewed-by: Mike Klein > Commit-Queue: Florin Malita TBR=mtklein@google.com,fmalita@chromium.org Change-Id: Ic0b52398b1ce6f64c781debb858829cb64bbae58 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/135022 Reviewed-by: Florin Malita Commit-Queue: Florin Malita --- modules/skjson/include/SkJSON.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/skjson/include/SkJSON.h') diff --git a/modules/skjson/include/SkJSON.h b/modules/skjson/include/SkJSON.h index 1b46c4a100..99da29de72 100644 --- a/modules/skjson/include/SkJSON.h +++ b/modules/skjson/include/SkJSON.h @@ -326,7 +326,7 @@ private: class DOM final : public SkNoncopyable { public: - DOM(const char*, size_t); + explicit DOM(const char*); const Value& root() const { return fRoot; } -- cgit v1.2.3