Index: tools/skiaserve/Request.h |
diff --git a/tools/skiaserve/Request.h b/tools/skiaserve/Request.h |
index 568518644c62711e5f4f0f59651c0e2930653960..fd015dc7cf8590f3ca307b2f920b0a6ab6392547 100644 |
--- a/tools/skiaserve/Request.h |
+++ b/tools/skiaserve/Request.h |
@@ -30,14 +30,14 @@ struct Request { |
Request(SkString rootUrl); |
SkData* drawToPng(int n); |
- void drawToCanvas(int n); |
SkCanvas* getCanvas(); |
- SkData* writeCanvasToPng(SkCanvas* canvas); |
SkBitmap* getBitmapFromCanvas(SkCanvas* canvas); |
bool enableGPU(bool enable); |
bool hasPicture() const { return SkToBool(fPicture.get()); } |
int getLastOp() const { return fDebugCanvas->getSize() - 1; } |
+ bool initPictureFromStream(SkStream*); |
+ |
// Returns the json list of ops as an SkData |
SkData* getJsonOps(int n); |
@@ -52,14 +52,16 @@ struct Request { |
static const int kImageHeight; |
UploadContext* fUploadContext; |
- SkAutoTUnref<SkPicture> fPicture; |
SkAutoTUnref<SkDebugCanvas> fDebugCanvas; |
UrlDataManager fUrlDataManager; |
private: |
+ SkData* writeCanvasToPng(SkCanvas* canvas); |
+ void drawToCanvas(int n); |
SkSurface* createCPUSurface(); |
SkSurface* createGPUSurface(); |
+ SkAutoTUnref<SkPicture> fPicture; |
SkAutoTDelete<GrContextFactory> fContextFactory; |
SkAutoTUnref<SkSurface> fSurface; |
bool fGPUEnabled; |