remove experimental treat-skcolor-as-srgb flag

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2097003003

Review-Url: https://codereview.chromium.org/2097003003

5 files changed, 0 insertions, 63 deletions

diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp
index 756f70e24d..f2f10acad1 100644
--- a/tools/skiaserve/Request.cpp
+++ b/tools/skiaserve/Request.cpp
@@ -201,11 +201,6 @@ bool Request::setColorMode(int mode) {
     return enableGPU(fGPUEnabled);
 }
 
-bool Request::setSRGBMode(bool enable) {
-    gTreatSkColorAsSRGB = enable;
-    return true;
-}
-
 bool Request::enableGPU(bool enable) {
     if (enable) {
         SkSurface* surface = this->createGPUSurface();
@@ -258,7 +253,6 @@ SkData* Request::getJsonOps(int n) {
     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());
 
diff --git a/tools/skiaserve/Request.h b/tools/skiaserve/Request.h
index 6cb969170d..f3af6b72ee 100644
--- a/tools/skiaserve/Request.h
+++ b/tools/skiaserve/Request.h
@@ -42,7 +42,6 @@ struct Request {
     SkBitmap* getBitmapFromCanvas(SkCanvas* canvas);
     bool enableGPU(bool enable);
     bool setColorMode(int mode);
-    bool setSRGBMode(bool enable);
     bool hasPicture() const { return SkToBool(fPicture.get()); }
     int getLastOp() const { return fDebugCanvas->getSize() - 1; }
 
diff --git a/tools/skiaserve/skiaserve.cpp b/tools/skiaserve/skiaserve.cpp
index e26af78f9e..3e547a8d70 100644
--- a/tools/skiaserve/skiaserve.cpp
+++ b/tools/skiaserve/skiaserve.cpp
@@ -45,7 +45,6 @@ public:
         fHandlers.push_back(new BatchesHandler);
         fHandlers.push_back(new BatchBoundsHandler);
         fHandlers.push_back(new ColorModeHandler);
-        fHandlers.push_back(new SRGBModeHandler);
         fHandlers.push_back(new QuitHandler);
     }
 
diff --git a/tools/skiaserve/urlhandlers/SRGBModeHandler.cpp b/tools/skiaserve/urlhandlers/SRGBModeHandler.cpp
deleted file mode 100644
index 1dd9789191..0000000000
--- a/tools/skiaserve/urlhandlers/SRGBModeHandler.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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 "../Request.h"
-#include "../Response.h"
-
-using namespace Response;
-
-bool SRGBModeHandler::canHandle(const char* method, const char* url) {
-    static const char* kBasePath = "/srgbMode/";
-    return 0 == strcmp(method, MHD_HTTP_METHOD_POST) &&
-           0 == strncmp(url, kBasePath, strlen(kBasePath));
-}
-
-int SRGBModeHandler::handle(Request* request, MHD_Connection* connection,
-                             const char* url, const char* method,
-                             const char* upload_data, size_t* upload_data_size) {
-    SkTArray<SkString> commands;
-    SkStrSplit(url, "/", &commands);
-
-    if (commands.count() != 2) {
-        return MHD_NO;
-    }
-
-    int enable;
-    if (1 != sscanf(commands[1].c_str(), "%d", &enable)) {
-        return MHD_NO;
-    }
-
-    bool success = request->setSRGBMode(SkToBool(enable));
-    if (!success) {
-        return SendError(connection, "Unable to set requested mode");
-    }
-    return SendOK(connection);
-}
diff --git a/tools/skiaserve/urlhandlers/UrlHandler.h b/tools/skiaserve/urlhandlers/UrlHandler.h
index 76547c5348..2702f480fc 100644
--- a/tools/skiaserve/urlhandlers/UrlHandler.h
+++ b/tools/skiaserve/urlhandlers/UrlHandler.h
@@ -142,19 +142,6 @@ public:
                const char* upload_data, size_t* upload_data_size) override;
 };
 
-/**
- * Controls the global sRGB flag (is SkColor treated as sRGB or not).
- * Posting to /srgbMode/0 causes SkColor to be linear, /colorMode/1
- * causes SkColor to be sRGB;
- */
-class SRGBModeHandler : public UrlHandler {
-public:
-    bool canHandle(const char* method, const char* url) override;
-    int handle(Request* request, MHD_Connection* connection,
-               const char* url, const char* method,
-               const char* upload_data, size_t* upload_data_size) override;
-};
-
 class QuitHandler : public UrlHandler {
 public:
     bool canHandle(const char* method, const char* url) override;