AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add /img/n/m endpoint to skiaserve

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1755563003

Review URL: https://codereview.chromium.org/1755563003
This commit is contained in:
joshualitt 2016-03-02 08:32:37 -08:00 committed by Commit bot
parent 89bd99bed8
commit 46b301d222
7 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/private/GrAuditTrail.h
View File

@ -119,6 +119,7 @@ public:
};
void getBoundsByClientID(SkTArray<BatchInfo>* outInfo, int clientID);
void getBoundsByBatchListID(BatchInfo* outInfo, int batchListID);
void fullReset();
@ -147,6 +148,8 @@ private:
};
typedef SkTArray<SkAutoTDelete<BatchNode>, true> BatchList;
void copyOutFromBatchList(BatchInfo* outBatchInfo, int batchListID);
template <typename T>
static void JsonifyTArray(SkString* json, const char* name, const T& array,
bool addComma);

28
src/gpu/GrAuditTrail.cpp
View File

@ -71,6 +71,19 @@ void GrAuditTrail::batchingResultNew(GrBatch* batch) {
fBatchList.emplace_back(batchNode);
}
void GrAuditTrail::copyOutFromBatchList(BatchInfo* outBatchInfo, int batchListID) {
SkASSERT(batchListID < fBatchList.count());
const BatchNode* bn = fBatchList[batchListID];
outBatchInfo->fBounds = bn->fBounds;
outBatchInfo->fRenderTargetUniqueID = bn->fRenderTargetUniqueID;
for (int j = 0; j < bn->fChildren.count(); j++) {
BatchInfo::Batch& outBatch = outBatchInfo->fBatches.push_back();
const Batch* currentBatch = bn->fChildren[j];
outBatch.fBounds = currentBatch->fBounds;
outBatch.fClientID = currentBatch->fClientID;
}
}
void GrAuditTrail::getBoundsByClientID(SkTArray<BatchInfo>* outInfo, int clientID) {
Batches** batchesLookup = fClientIDLookup.find(clientID);
if (batchesLookup) {
@ -87,24 +100,19 @@ void GrAuditTrail::getBoundsByClientID(SkTArray<BatchInfo>* outInfo, int clientI
if (kGrAuditTrailInvalidID == currentBatchListID ||
batch->fBatchListID != currentBatchListID) {
BatchInfo& outBatchInfo = outInfo->push_back();
currentBatchListID = batch->fBatchListID;
// copy out all of the batches so the client can display them even if
// they have a different clientID
const BatchNode* bn = fBatchList[currentBatchListID];
outBatchInfo.fBounds = bn->fBounds;
outBatchInfo.fRenderTargetUniqueID = bn->fRenderTargetUniqueID;
for (int j = 0; j < bn->fChildren.count(); j++) {
BatchInfo::Batch& outBatch = outBatchInfo.fBatches.push_back();
const Batch* currentBatch = bn->fChildren[j];
outBatch.fBounds = currentBatch->fBounds;
outBatch.fClientID = currentBatch->fClientID;
}
this->copyOutFromBatchList(&outBatchInfo, batch->fBatchListID);
}
}
}
}
void GrAuditTrail::getBoundsByBatchListID(BatchInfo* outInfo, int batchListID) {
this->copyOutFromBatchList(outInfo, batchListID);
}
void GrAuditTrail::fullReset() {
SkASSERT(fEnabled);
fBatchList.reset();

11
tools/debugger/SkDebugCanvas.cpp
View File

@ -196,7 +196,7 @@ void SkDebugCanvas::markActiveCommands(int index) {
}
void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
void SkDebugCanvas::drawTo(SkCanvas* canvas, int index, int m) {
SkASSERT(!fCommandVector.isEmpty());
SkASSERT(index < fCommandVector.count());
@ -228,7 +228,7 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
#if SK_SUPPORT_GPU
GrAuditTrail* at = nullptr;
GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
if (rt && fDrawGpuBatchBounds) {
if (rt && (fDrawGpuBatchBounds || m != -1)) {
GrContext* ctx = rt->getContext();
if (ctx) {
at = ctx->getAuditTrail();
@ -344,7 +344,12 @@ void SkDebugCanvas::drawTo(SkCanvas* canvas, int index) {
// get the bounding boxes to draw
GrAuditTrail::AutoEnable ae(at);
SkTArray<GrAuditTrail::BatchInfo> childrenBounds;
at->getBoundsByClientID(&childrenBounds, index);
if (m == -1) {
at->getBoundsByClientID(&childrenBounds, index);
} else {
// the client wants us to draw the mth batch
at->getBoundsByBatchListID(&childrenBounds.push_back(), m);
}
SkPaint paint;
paint.setStyle(SkPaint::kStroke_Style);
paint.setStrokeWidth(1);

3
tools/debugger/SkDebugCanvas.h
View File

@ -68,8 +68,9 @@ public:
Executes the draw calls up to the specified index.
@param canvas The canvas being drawn to
@param index The index of the final command being executed
@param m an optional Mth gpu batch to highlight, or -1
*/
void drawTo(SkCanvas* canvas, int index);
void drawTo(SkCanvas* canvas, int index, int m = -1);
/**
Returns the most recently calculated transformation matrix

8
tools/skiaserve/Request.cpp
View File

@ -93,13 +93,13 @@ SkCanvas* Request::getCanvas() {
return target;
}
void Request::drawToCanvas(int n) {
void Request::drawToCanvas(int n, int m) {
SkCanvas* target = this->getCanvas();
fDebugCanvas->drawTo(target, n);
fDebugCanvas->drawTo(target, n, m);
}
SkData* Request::drawToPng(int n) {
this->drawToCanvas(n);
SkData* Request::drawToPng(int n, int m) {
this->drawToCanvas(n, m);
return writeCanvasToPng(this->getCanvas());
}

5
tools/skiaserve/Request.h
View File

@ -29,7 +29,8 @@ struct UploadContext {
struct Request {
Request(SkString rootUrl);
SkData* drawToPng(int n);
// draws to skia draw op N, highlighting the Mth batch(-1 means no highlight)
SkData* drawToPng(int n, int m = -1);
SkCanvas* getCanvas();
SkBitmap* getBitmapFromCanvas(SkCanvas* canvas);
bool enableGPU(bool enable);
@ -57,7 +58,7 @@ struct Request {
private:
SkData* writeCanvasToPng(SkCanvas* canvas);
void drawToCanvas(int n);
void drawToCanvas(int n, int m = -1);
SkSurface* createCPUSurface();
SkSurface* createGPUSurface();
GrAuditTrail* getAuditTrail(SkCanvas*);

9
tools/skiaserve/urlhandlers/ImgHandler.cpp
View File

@ -25,19 +25,22 @@ int ImgHandler::handle(Request* request, MHD_Connection* connection,
SkTArray<SkString> commands;
SkStrSplit(url, "/", &commands);
if (!request->hasPicture() || commands.count() > 2) {
if (!request->hasPicture() || commands.count() > 3) {
return MHD_NO;
}
int n;
int n, m = -1;
// /img or /img/N
if (commands.count() == 1) {
n = request->fDebugCanvas->getSize() - 1;
} else if (commands.count() == 2) {
sscanf(commands[1].c_str(), "%d", &n);
} else {
sscanf(commands[1].c_str(), "%d", &n);
sscanf(commands[2].c_str(), "%d", &m);
}
SkAutoTUnref<SkData> data(request->drawToPng(n));
SkAutoTUnref<SkData> data(request->drawToPng(n, m));
return SendData(connection, data, "image/png");
}