diff options
author | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-28 15:41:32 +0000 |
---|---|---|
committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-28 15:41:32 +0000 |
commit | 565254bc9343d0befdfbbb97a3dc6d44c6e18658 (patch) | |
tree | 4cad02846e3619d293810dfb4de652ecdb47f05c /include | |
parent | dbc936dff3357f74fc60e124d912a2179b909b0d (diff) |
Fix SkGPipe drawing, and turn it on by default.
A recent change broke SkGPipe. Fix it, and turn on pipe drawing
in GM by default so we will catch these in the future.
We already had a bug where SkGPipeWriter had to use its Cross Process
flag to work, so for a quick fix, force the reader to use the Cross
Process flag as well. The bug to allow both cross and non cross process
is http://code.google.com/p/skia/issues/detail?id=663
Review URL: https://codereview.appspot.com/6333071
git-svn-id: http://skia.googlecode.com/svn/trunk@4384 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r-- | include/pipe/SkGPipe.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/include/pipe/SkGPipe.h b/include/pipe/SkGPipe.h index e0b52e044b..3237993251 100644 --- a/include/pipe/SkGPipe.h +++ b/include/pipe/SkGPipe.h @@ -78,7 +78,17 @@ public: bool isRecording() const { return NULL != fCanvas; } enum Flags { - kCrossProcess_Flag = 1 << 0, + /** + * Tells the writer that the reader will be in a different process, so + * (for example) we cannot put function pointers in the stream. + */ + kCrossProcess_Flag = 1 << 0, + /** + * Only meaningful if kCrossProcess_Flag is set. Tells the writer that + * in spite of being cross process, it will have shared address space + * with the reader, so the two can share large objects (like SkBitmaps) + */ + kSharedAddressSpace_SkGPipeFlag = 1 << 1 }; SkCanvas* startRecording(SkGPipeController*, uint32_t flags = 0); @@ -91,7 +101,7 @@ private: class SkGPipeCanvas* fCanvas; SkGPipeController* fController; SkFactorySet fFactorySet; - SkWriter32 fWriter; + SkWriter32 fWriter; }; #endif |