aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/skiaserve/skiaserve.cpp
diff options
context:
space:
mode:
authorGravatar ethannicholas <ethannicholas@google.com>2016-02-12 10:09:34 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-12 10:09:34 -0800
commitde8e54ccfd54db927b53cb86213ed7020a59d1e1 (patch)
treeb2fb2ed57e11d77af8b074dfabbf2051ed98e330 /tools/skiaserve/skiaserve.cpp
parent2a8fcb4647115ce5e9b6127a716b6f50b2a9fd55 (diff)
skiaserve now retains the graphics context rather than creating a new one each request
Diffstat (limited to 'tools/skiaserve/skiaserve.cpp')
-rw-r--r--tools/skiaserve/skiaserve.cpp30
1 files changed, 17 insertions, 13 deletions
diff --git a/tools/skiaserve/skiaserve.cpp b/tools/skiaserve/skiaserve.cpp
index 7d62b1728c..1db8261bd4 100644
--- a/tools/skiaserve/skiaserve.cpp
+++ b/tools/skiaserve/skiaserve.cpp
@@ -70,6 +70,8 @@ struct Request {
UploadContext* fUploadContext;
SkAutoTUnref<SkPicture> fPicture;
SkAutoTUnref<SkDebugCanvas> fDebugCanvas;
+ SkAutoTDelete<GrContextFactory> fContextFactory;
+ SkAutoTUnref<SkSurface> fSurface;
UrlDataManager fUrlDataManager;
};
@@ -87,9 +89,6 @@ SkSurface* setupSurface(GrContextFactory* factory) {
&props);
SkASSERT(surface);
- SkGLContext* gl = factory->getContextInfo(GrContextFactory::kNative_GLContextType,
- GrContextFactory::kNone_GLContextOptions).fGLContext;
- gl->makeCurrent();
return surface;
}
@@ -112,15 +111,15 @@ SkData* writeCanvasToPng(SkCanvas* canvas) {
return png;
}
-SkData* setupAndDrawToCanvasReturnPng(SkDebugCanvas* debugCanvas, int n) {
- GrContextOptions grContextOpts;
- SkAutoTDelete<GrContextFactory> factory(new GrContextFactory(grContextOpts));
- SkAutoTUnref<SkSurface> surface(setupSurface(factory.get()));
-
- SkASSERT(debugCanvas);
- SkCanvas* canvas = surface->getCanvas();
- debugCanvas->drawTo(canvas, n);
- return writeCanvasToPng(canvas);
+SkData* setupAndDrawToCanvasReturnPng(Request* request, int n) {
+ GrContextFactory* factory = request->fContextFactory;
+ SkGLContext* gl = factory->getContextInfo(GrContextFactory::kNative_GLContextType,
+ GrContextFactory::kNone_GLContextOptions).fGLContext;
+ gl->makeCurrent();
+ SkASSERT(request->fDebugCanvas);
+ SkCanvas* target = request->fSurface->getCanvas();
+ request->fDebugCanvas->drawTo(target, n);
+ return writeCanvasToPng(target);
}
SkSurface* setupCpuSurface() {
@@ -287,7 +286,7 @@ public:
sscanf(commands[1].c_str(), "%d", &n);
}
- SkAutoTUnref<SkData> data(setupAndDrawToCanvasReturnPng(request->fDebugCanvas, n));
+ SkAutoTUnref<SkData> data(setupAndDrawToCanvasReturnPng(request, n));
return SendData(connection, data, "image/png");
}
};
@@ -337,6 +336,11 @@ public:
return MHD_NO;
}
+ // create surface
+ GrContextOptions grContextOpts;
+ request->fContextFactory.reset(new GrContextFactory(grContextOpts));
+ request->fSurface.reset(setupSurface(request->fContextFactory.get()));
+
// pour picture into debug canvas
request->fDebugCanvas.reset(new SkDebugCanvas(kImageWidth, kImageHeight));
request->fDebugCanvas->drawPicture(request->fPicture);