A bit more privacy for SkiaServe's Request

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1741043003

Review URL: https://codereview.chromium.org/1741043003

6 files changed, 7 insertions, 15 deletions

diff --git a/tools/skiaserve/urlhandlers/BreakHandler.cpp b/tools/skiaserve/urlhandlers/BreakHandler.cpp
index 9e01c0f509..0b044634fe 100644
--- a/tools/skiaserve/urlhandlers/BreakHandler.cpp
+++ b/tools/skiaserve/urlhandlers/BreakHandler.cpp
@@ -38,7 +38,7 @@ int BreakHandler::handle(Request* request, MHD_Connection* connection,
     SkTArray<SkString> commands;
     SkStrSplit(url, "/", &commands);
 
-    if (!request->fPicture.get() || commands.count() != 4) {
+    if (!request->hasPicture() || commands.count() != 4) {
         return MHD_NO;
     }
 
diff --git a/tools/skiaserve/urlhandlers/ClipAlphaHandler.cpp b/tools/skiaserve/urlhandlers/ClipAlphaHandler.cpp
index 4d66fc9958..4ab5096a1b 100644
--- a/tools/skiaserve/urlhandlers/ClipAlphaHandler.cpp
+++ b/tools/skiaserve/urlhandlers/ClipAlphaHandler.cpp
@@ -25,7 +25,7 @@ int ClipAlphaHandler::handle(Request* request, MHD_Connection* connection,
     SkTArray<SkString> commands;
     SkStrSplit(url, "/", &commands);
 
-    if (!request->fPicture.get() || commands.count() != 2) {
+    if (!request->hasPicture() || commands.count() != 2) {
         return MHD_NO;
     }
 
diff --git a/tools/skiaserve/urlhandlers/DataHandler.cpp b/tools/skiaserve/urlhandlers/DataHandler.cpp
index adad99971f..0c94530c5d 100644
--- a/tools/skiaserve/urlhandlers/DataHandler.cpp
+++ b/tools/skiaserve/urlhandlers/DataHandler.cpp
@@ -25,7 +25,7 @@ int DataHandler::handle(Request* request, MHD_Connection* connection,
     SkTArray<SkString> commands;
     SkStrSplit(url, "/", &commands);
 
-    if (!request->fPicture.get() || commands.count() != 2) {
+    if (!request->hasPicture() || commands.count() != 2) {
         return MHD_NO;
     }
 
diff --git a/tools/skiaserve/urlhandlers/DownloadHandler.cpp b/tools/skiaserve/urlhandlers/DownloadHandler.cpp
index 719a382494..cc55c3b4b9 100644
--- a/tools/skiaserve/urlhandlers/DownloadHandler.cpp
+++ b/tools/skiaserve/urlhandlers/DownloadHandler.cpp
@@ -23,7 +23,7 @@ bool DownloadHandler::canHandle(const char* method, const char* url) {
 int DownloadHandler::handle(Request* request, MHD_Connection* connection,
                             const char* url, const char* method,
                             const char* upload_data, size_t* upload_data_size) {
-    if (!request->fPicture.get()) {
+    if (!request->hasPicture()) {
         return MHD_NO;
     }
 
diff --git a/tools/skiaserve/urlhandlers/ImgHandler.cpp b/tools/skiaserve/urlhandlers/ImgHandler.cpp
index 68828267fb..3e390fe832 100644
--- a/tools/skiaserve/urlhandlers/ImgHandler.cpp
+++ b/tools/skiaserve/urlhandlers/ImgHandler.cpp
@@ -25,7 +25,7 @@ int ImgHandler::handle(Request* request, MHD_Connection* connection,
     SkTArray<SkString> commands;
     SkStrSplit(url, "/", &commands);
 
-    if (!request->fPicture.get() || commands.count() > 2) {
+    if (!request->hasPicture() || commands.count() > 2) {
         return MHD_NO;
     }
 
diff --git a/tools/skiaserve/urlhandlers/PostHandler.cpp b/tools/skiaserve/urlhandlers/PostHandler.cpp
index 7cdbf295c6..ce599200b2 100644
--- a/tools/skiaserve/urlhandlers/PostHandler.cpp
+++ b/tools/skiaserve/urlhandlers/PostHandler.cpp
@@ -62,19 +62,11 @@ int PostHandler::handle(Request* request, MHD_Connection* connection,
     MHD_destroy_post_processor(uc->fPostProcessor);
     uc->fPostProcessor = nullptr;
 
-    // parse picture from stream
-    request->fPicture.reset(
-        SkPicture::CreateFromStream(request->fUploadContext->fStream.detachAsStream()));
-    if (!request->fPicture.get()) {
+    if (!request->initPictureFromStream(request->fUploadContext->fStream.detachAsStream())) {
         fprintf(stderr, "Could not create picture from stream.\n");
         return MHD_NO;
     }
-
-    // pour picture into debug canvas
-    request->fDebugCanvas.reset(new SkDebugCanvas(Request::kImageWidth,
-                                                  Request::kImageHeight));
-    request->fDebugCanvas->drawPicture(request->fPicture);
-
+    
     // clear upload context
     delete request->fUploadContext;
     request->fUploadContext = nullptr;