commit 144a5c518ae921f210bdd9647c061e57d18f440c
author Brian Salomon <bsalomon@google.com> Tue Dec 20 16:48:59 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 20 22:35:23 2016 +0000
tree 9635e06add734e1b0eb0635e40a05d169f61e509
parent f4e27f68b07c063f00d5ef618f5d4a64e785f9c3

Rename batch->op in skiaserve

Change-Id: Ib831b9a6bcf4f37c0f077b26f68b1cefef81bb73
Reviewed-on: https://skia-review.googlesource.com/6351
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

tools/skiaserve/Request.cpp

diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp
index 2064a46..0e55d92 100644
--- a/tools/skiaserve/Request.cpp
+++ b/tools/skiaserve/Request.cpp
@@ -259,7 +259,7 @@
     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["drawGpuBatchBounds"] = Json::Value(fDebugCanvas->getDrawGpuOpBounds());
     root["colorMode"] = Json::Value(fColorMode);
     SkDynamicMemoryWStream stream;
     stream.writeText(Json::FastWriter().write(root).c_str());
@@ -267,11 +267,11 @@
     return stream.detachAsData();
 }
 
-sk_sp<SkData> Request::getJsonBatchList(int n) {
+sk_sp<SkData> Request::getJsonOpList(int n) {
     SkCanvas* canvas = this->getCanvas();
     SkASSERT(fGPUEnabled);
 
-    Json::Value result = fDebugCanvas->toJSONBatchList(n, canvas);
+    Json::Value result = fDebugCanvas->toJSONOpList(n, canvas);
 
     SkDynamicMemoryWStream stream;
     stream.writeText(Json::FastWriter().write(result).c_str());