Fix up picture clip bounds in SkiaServe

tools/skiaserve/urlhandlers/DownloadHandler.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "UrlHandler.h"
 
 #include "microhttpd.h"
-#include "SkPictureRecorder.h"
-#include "SkPixelSerializer.h"
 #include "../Request.h"
 #include "../Response.h"
 
 using namespace Response;
 
 bool DownloadHandler::canHandle(const char* method, const char* url) {
     return 0 == strcmp(method, MHD_HTTP_METHOD_GET) &&
            0 == strcmp(url, "/download");
 }
 
 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->hasPicture()) {
         return MHD_NO;
     }
 
-    // TODO move to a function
-    // Playback into picture recorder
-    SkPictureRecorder recorder;
-    SkCanvas* canvas = recorder.beginRecording(Request::kImageWidth,
-                                               Request::kImageHeight);
-
-    request->fDebugCanvas->draw(canvas);
-
-    SkAutoTUnref<SkPicture> picture(recorder.endRecording());
-
-    SkDynamicMemoryWStream outStream;
-
-    SkAutoTUnref<SkPixelSerializer> serializer(SkImageEncoder::CreatePixelSerializer());
-    picture->serialize(&outStream, serializer);
-
-    SkAutoTUnref<SkData> data(outStream.copyToData());
+    SkAutoTUnref<SkData> data(request->writeOutSkp());
 
     // TODO fancier name handling
     return SendData(connection, data, "application/octet-stream", true,
                     "attachment; filename=something.skp;");
 }