commit 60ebf14cccaecc9f75eb002b8839a8719325714f
author Cary Clark <caryclark@skia.org> Thu Sep 06 12:22:33 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 06 12:22:41 2018 +0000
tree feda3096a5ec14690d5b5a1c8bc29bbb30852e11
parent f05ebf074a040e041e7ace76944900902dd3d60f

Revert "SkStream: remove some WStream functions from public api"

This reverts commit 8b681105077393ce8fb5bef0c1b55461ac2a5792.

Reason for revert: breaks bots

Original change's description:
> SkStream: remove some WStream functions from public api
> 
> move functions to SkStringPriv.h
> 
> also add SkStrAppendU32Hex() function, and re-write
> SkString::insertHex() to use SkStrAppendU32Hex.
> 
> add unit tests.
> 
> Change-Id: Ieda98fb4106db71565b607e593713a91a5ddd892
> Reviewed-on: https://skia-review.googlesource.com/151986
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Hal Canary <halcanary@google.com>

TBR=halcanary@google.com,bungeman@google.com,caryclark@google.com,reed@google.com

Change-Id: Idbac615092f46c18b38e08385dafba20930f0ff0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/152121
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@skia.org>

src/utils/SkJSON.cpp

diff --git a/src/utils/SkJSON.cpp b/src/utils/SkJSON.cpp
index 8f7d67d..cb7704c 100644
--- a/src/utils/SkJSON.cpp
+++ b/src/utils/SkJSON.cpp
@@ -9,7 +9,6 @@
 
 #include "SkMalloc.h"
 #include "SkStream.h"
-#include "SkStreamPriv.h"
 #include "SkString.h"
 
 #include <cmath>
@@ -778,7 +777,7 @@
         stream->writeText(*v.as<BoolValue>() ? "true" : "false");
         break;
     case Value::Type::kNumber:
-        SkWStreamWriteScalarAsText(stream, *v.as<NumberValue>());
+        stream->writeScalarAsText(*v.as<NumberValue>());
         break;
     case Value::Type::kString:
         stream->writeText("\"");