Fix up no gpu build

tools/skiaserve/Request.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 "Request.h"
 
 #include "png.h"
@@ skipping 38 matching lines @@
     png_write_png(png, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
     png_destroy_write_struct(&png, NULL);
     sk_free(rows);
 }
 
 Request::Request(SkString rootUrl)
     : fUploadContext(nullptr)
     , fUrlDataManager(rootUrl)
     , fGPUEnabled(false) {
     // create surface
+#if SK_SUPPORT_GPU
     GrContextOptions grContextOpts;
-    fContextFactory.reset(new GrContextFactory(grContextOpts));
+    fContextFactory = new GrContextFactory(grContextOpts);
+#else
+    fContextFactory = nullptr;
+#endif
+}
+
+Request::~Request() {
+#if SK_SUPPORT_GPU
+    if (fContextFactory) {
+        delete fContextFactory;
+    }
+#endif
 }
 
 SkBitmap* Request::getBitmapFromCanvas(SkCanvas* canvas) {
     SkBitmap* bmp = new SkBitmap();
     SkIRect bounds = this->getBounds();
     SkImageInfo info = SkImageInfo::Make(bounds.width(), bounds.height(),
                                          kRGBA_8888_SkColorType, kOpaque_SkAlphaType);
     bmp->setInfo(info);
     if (!canvas->readPixels(bmp, 0, 0)) {
         fprintf(stderr, "Can't read pixels\n");
         return nullptr;
     }
     return bmp;
 }
 
 SkData* Request::writeCanvasToPng(SkCanvas* canvas) {
     // capture pixels
     SkAutoTDelete<SkBitmap> bmp(this->getBitmapFromCanvas(canvas));
     SkASSERT(bmp);
 
     // write to png
     SkDynamicMemoryWStream buffer;
     write_png((const png_bytep) bmp->getPixels(), bmp->width(), bmp->height(), buffer);
     return buffer.copyToData();
 }
 
 SkCanvas* Request::getCanvas() {
+#if SK_SUPPORT_GPU
     GrContextFactory* factory = fContextFactory;
     SkGLContext* gl = factory->getContextInfo(GrContextFactory::kNative_GLContextType,
                                               GrContextFactory::kNone_GLContextOptions).fGLContext;
     gl->makeCurrent();
+#endif
     SkASSERT(fDebugCanvas);
 
     // create the appropriate surface if necessary
     if (!fSurface) {
         this->enableGPU(fGPUEnabled);
     }
     SkCanvas* target = fSurface->getCanvas();
     return target;
 }
 
@@ skipping 19 matching lines @@
 
     SkDynamicMemoryWStream outStream;
 
     SkAutoTUnref<SkPixelSerializer> serializer(SkImageEncoder::CreatePixelSerializer());
     picture->serialize(&outStream, serializer);
 
     return outStream.copyToData();
 }
 
 GrContext* Request::getContext() {
+#if SK_SUPPORT_GPU
   return fContextFactory->get(GrContextFactory::kNative_GLContextType,
                               GrContextFactory::kNone_GLContextOptions);
+#else
+  return nullptr;
+#endif
 }
 
 SkIRect Request::getBounds() {
     SkIRect bounds;
     if (fPicture) {
         bounds = fPicture->cullRect().roundOut();
         if (fGPUEnabled) {
+#if SK_SUPPORT_GPU
             int maxRTSize = this->getContext()->caps()->maxRenderTargetSize();
             bounds = SkIRect::MakeWH(SkTMin(bounds.width(), maxRTSize),
                                      SkTMin(bounds.height(), maxRTSize));
+#endif
         }
     } else {
         bounds = SkIRect::MakeWH(kDefaultWidth, kDefaultHeight);
     }
 
     // We clip to kDefaultWidth / kDefaultHeight for performance reasons
     // TODO make this configurable
     bounds = SkIRect::MakeWH(SkTMin(bounds.width(), kDefaultWidth),
                              SkTMin(bounds.height(), kDefaultHeight));
     return bounds;
@@ skipping 104 matching lines @@
     canvas->flush();
     SkAutoTDelete<SkBitmap> bitmap(this->getBitmapFromCanvas(canvas));
     SkASSERT(bitmap);
     bitmap->lockPixels();
     uint8_t* start = ((uint8_t*) bitmap->getPixels()) + (y * bitmap->width() + x) * 4;
     SkColor result = SkColorSetARGB(start[3], start[0], start[1], start[2]);
     bitmap->unlockPixels();
     return result;
 }