commit a2b4bdce8cfd1a91407595a25683ecff982af22e
author Hal Canary <halcanary@google.com> Tue Nov 22 14:21:38 2016 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Nov 22 21:23:51 2016 +0000
tree 2e8fad7d92be4e8a024db784747944d110a80123
parent 6b77f1cf09f6a3c47a42e29dc28087ac9f9cdb25

Revert 248ff023 & 2cb6cb72

Revert "SkImageEncoder: simplify API"
This reverts commit 248ff02331d7f73ee4b6c5a7eabeae1080c16cd4.
Revert "Fix bug: can't convert nullptr -> bool"
This reverts commit 2cb6cb7218171b357bb5c934f032ba69c7b78401.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5151
NOTRY=true

Change-Id: I5f6414392d6545f74db0b5bb50608d04f053a8ec
Reviewed-on: https://skia-review.googlesource.com/5151
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>

tools/skiaserve/Request.cpp

diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp
index 2064a46..c1b3b25 100644
--- a/tools/skiaserve/Request.cpp
+++ b/tools/skiaserve/Request.cpp
@@ -11,7 +11,6 @@
 #include "SkPixelSerializer.h"
 #include "SkPM4fPriv.h"
 #include "picture_utils.h"
-#include "sk_tool_utils.h"
 
 using namespace sk_gpu_test;
 
@@ -118,7 +117,7 @@
 
     SkDynamicMemoryWStream outStream;
 
-    sk_sp<SkPixelSerializer> serializer = sk_tool_utils::MakePixelSerializer();
+    sk_sp<SkPixelSerializer> serializer(SkImageEncoder::CreatePixelSerializer());
     picture->serialize(&outStream, serializer.get());
 
     return outStream.detachAsData();