Move Request to its own file in preparation for numerous cleanups

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

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

1 files changed, 3 insertions, 28 deletions

diff --git a/tools/skiaserve/skiaserve.cpp b/tools/skiaserve/skiaserve.cpp
index 96760b91aa..5947d3dc63 100644
--- a/tools/skiaserve/skiaserve.cpp
+++ b/tools/skiaserve/skiaserve.cpp
@@ -7,18 +7,14 @@
 
 #include "GrCaps.h"
 #include "GrContextFactory.h"
+
+#include "Request.h"
+
 #include "SkCanvas.h"
 #include "SkCommandLineFlags.h"
-#include "SkDebugCanvas.h"
 #include "SkJSONCanvas.h"
-#include "SkJSONCPP.h"
-#include "SkPicture.h"
 #include "SkPictureRecorder.h"
 #include "SkPixelSerializer.h"
-#include "SkStream.h"
-#include "SkSurface.h"
-
-#include "UrlDataManager.h"
 
 #include <sys/socket.h>
 #include <microhttpd.h>
@@ -59,27 +55,6 @@ SkString generateTemplate(SkString source) {
 
 }
 
-struct UploadContext {
-    SkDynamicMemoryWStream fStream;
-    MHD_PostProcessor* fPostProcessor;
-    MHD_Connection* connection;
-};
-
-struct Request {
-    Request(SkString rootUrl)
-    : fUploadContext(nullptr)
-    , fUrlDataManager(rootUrl)
-    , fGPUEnabled(false) {}
-
-    UploadContext* fUploadContext;
-    SkAutoTUnref<SkPicture> fPicture;
-    SkAutoTUnref<SkDebugCanvas> fDebugCanvas;
-    SkAutoTDelete<GrContextFactory> fContextFactory;
-    SkAutoTUnref<SkSurface> fSurface;
-    UrlDataManager fUrlDataManager;
-    bool fGPUEnabled;
-};
-
 static void write_png_callback(png_structp png_ptr, png_bytep data, png_size_t length) {
     SkWStream* out = (SkWStream*) png_get_io_ptr(png_ptr);
     out->write(data, length);