Adding support for controlling the global sRGB SkColor switch.

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 "SkPictureRecorder.h"
 #include "SkPixelSerializer.h"
+#include "SkPM4fPriv.h"
 #include "picture_utils.h"
 
 using namespace sk_gpu_test;
 
 static int kDefaultWidth = 1920;
 static int kDefaultHeight = 1080;
 
 
 Request::Request(SkString rootUrl)
     : fUploadContext(nullptr)
@@ skipping 157 matching lines @@
     SkSurface* surface = SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info, 0,
                                                      &props).release();
     return surface;
 }
 
 bool Request::setColorMode(int mode) {
     fColorMode = mode;
     return enableGPU(fGPUEnabled);
 }
 
+bool Request::setSRGBMode(bool enable) {
+    gTreatSkColorAsSRGB = enable;
+    return true;
+}
+
 bool Request::enableGPU(bool enable) {
     if (enable) {
         SkSurface* surface = this->createGPUSurface();
         if (surface) {
             fSurface.reset(surface);
             fGPUEnabled = true;
 
             // When we switch to GPU, there seems to be some mystery draws in the canvas.  So we
             // draw once to flush the pipe
             // TODO understand what is actually happening here
@@ skipping 32 matching lines @@
     this->getCanvas()->flush();
     return true;
 }
 
 SkData* Request::getJsonOps(int n) {
     SkCanvas* canvas = this->getCanvas();
     Json::Value root = fDebugCanvas->toJSON(fUrlDataManager, n, canvas);
     root["mode"] = Json::Value(fGPUEnabled ? "gpu" : "cpu");
     root["drawGpuBatchBounds"] = Json::Value(fDebugCanvas->getDrawGpuBatchBounds());
     root["colorMode"] = Json::Value(fColorMode);
+    root["srgbMode"] = Json::Value(gTreatSkColorAsSRGB);
     SkDynamicMemoryWStream stream;
     stream.writeText(Json::FastWriter().write(root).c_str());
 
     return stream.copyToData();
 }
 
 SkData* Request::getJsonBatchList(int n) {
     SkCanvas* canvas = this->getCanvas();
     SkASSERT(fGPUEnabled);
 
@@ skipping 33 matching lines @@
     SkASSERT(bitmap);
 
     // Convert to format suitable for inspection
     sk_sp<SkData> encodedBitmap = sk_tools::encode_bitmap_for_png(*bitmap);
     SkASSERT(encodedBitmap.get());
 
     const uint8_t* start = encodedBitmap->bytes() + ((y * bitmap->width() + x) * 4);
     SkColor result = SkColorSetARGB(start[3], start[0], start[1], start[2]);
     return result;
 }