From c03e1c55a79f00d02ab528945425ff50cb700402 Mon Sep 17 00:00:00 2001
From: Ben Wagner <bungeman@google.com>
Date: Mon, 17 Oct 2016 15:20:02 -0400
Subject: Re-enable overdraw mode in debugger.

Debugger is the last user of the deprecated SkPaintFilterCanvas
constructor. Stop using it and remove the constructor.

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

Change-Id: I3e9180d48abdf86cb2c05bd8d95acabcdaa70427
Reviewed-on: https://skia-review.googlesource.com/3268
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Reed <reed@google.com>
---
 tools/skiaserve/Request.cpp                     |  8 +++++
 tools/skiaserve/Request.h                       |  2 ++
 tools/skiaserve/urlhandlers/OverdrawHandler.cpp | 40 +++++++++++++++++++++++++
 tools/skiaserve/urlhandlers/UrlHandler.h        | 12 ++++++++
 4 files changed, 62 insertions(+)
 create mode 100644 tools/skiaserve/urlhandlers/OverdrawHandler.cpp

(limited to 'tools/skiaserve')

diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp
index eb1ccce039..487da35424 100644
--- a/tools/skiaserve/Request.cpp
+++ b/tools/skiaserve/Request.cpp
@@ -24,6 +24,7 @@ Request::Request(SkString rootUrl)
     : fUploadContext(nullptr)
     , fUrlDataManager(rootUrl)
     , fGPUEnabled(false)
+    , fOverdraw(false)
     , fColorMode(0) {
     // create surface
 #if SK_SUPPORT_GPU
@@ -97,7 +98,9 @@ void Request::drawToCanvas(int n, int m) {
 }
 
 sk_sp<SkData> Request::drawToPng(int n, int m) {
+    //fDebugCanvas->setOverdrawViz(true);
     this->drawToCanvas(n, m);
+    //fDebugCanvas->setOverdrawViz(false);
     return writeCanvasToPng(this->getCanvas());
 }
 
@@ -195,6 +198,11 @@ SkSurface* Request::createGPUSurface() {
     return surface;
 }
 
+bool Request::setOverdraw(bool enable) {
+    fOverdraw = enable;
+    return true;
+}
+
 bool Request::setColorMode(int mode) {
     fColorMode = mode;
     return enableGPU(fGPUEnabled);
diff --git a/tools/skiaserve/Request.h b/tools/skiaserve/Request.h
index 0b6ed3b467..cadf15c6ba 100644
--- a/tools/skiaserve/Request.h
+++ b/tools/skiaserve/Request.h
@@ -43,6 +43,7 @@ struct Request {
     SkCanvas* getCanvas();
     SkBitmap* getBitmapFromCanvas(SkCanvas* canvas);
     bool enableGPU(bool enable);
+    bool setOverdraw(bool enable);
     bool setColorMode(int mode);
     bool hasPicture() const { return SkToBool(fPicture.get()); }
     int getLastOp() const { return fDebugCanvas->getSize() - 1; }
@@ -77,6 +78,7 @@ private:
     sk_gpu_test::GrContextFactory* fContextFactory;
     SkAutoTUnref<SkSurface> fSurface;
     bool fGPUEnabled;
+    bool fOverdraw;
     int fColorMode;
 };
 
diff --git a/tools/skiaserve/urlhandlers/OverdrawHandler.cpp b/tools/skiaserve/urlhandlers/OverdrawHandler.cpp
new file mode 100644
index 0000000000..7f8c404716
--- /dev/null
+++ b/tools/skiaserve/urlhandlers/OverdrawHandler.cpp
@@ -0,0 +1,40 @@
+/*
+ * 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 OverdrawHandler::canHandle(const char* method, const char* url) {
+    static const char* kBasePath = "/overdraw/";
+    return 0 == strcmp(method, MHD_HTTP_METHOD_POST) &&
+           0 == strncmp(url, kBasePath, strlen(kBasePath));
+}
+
+int OverdrawHandler::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;
+    sscanf(commands[1].c_str(), "%d", &enable);
+
+    bool success = request->setOverdraw(SkToBool(enable));
+    if (!success) {
+        return SendError(connection, "Unable to set overdraw");
+    }
+    return SendOK(connection);
+}
diff --git a/tools/skiaserve/urlhandlers/UrlHandler.h b/tools/skiaserve/urlhandlers/UrlHandler.h
index 2702f480fc..1536ef33c7 100644
--- a/tools/skiaserve/urlhandlers/UrlHandler.h
+++ b/tools/skiaserve/urlhandlers/UrlHandler.h
@@ -67,6 +67,18 @@ public:
                const char* upload_data, size_t* upload_data_size) override;
 };
 
+/**
+   Controls whether overdraw rendering is enabled. Posting to /overdraw/1 turns overdraw on,
+   /overdraw/0 disables it.
+ */
+class OverdrawHandler : 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 PostHandler : public UrlHandler {
 public:
     bool canHandle(const char* method, const char* url) override;
-- 
cgit v1.2.3