Index: src/pipe/SkGPipeWrite.cpp |
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp |
index ce58ca6122cc95bde1fbe5446c5435bc85356231..54e3bead69d81dfc54c7c3e3acdae92640f4830d 100644 |
--- a/src/pipe/SkGPipeWrite.cpp |
+++ b/src/pipe/SkGPipeWrite.cpp |
@@ -71,11 +71,11 @@ static size_t writeTypeface(SkWriter32* writer, SkTypeface* typeface) { |
class FlattenableHeap : public SkFlatController { |
public: |
FlattenableHeap(int numFlatsToKeep, SkNamedFactorySet* fset, bool isCrossProcess) |
- : fNumFlatsToKeep(numFlatsToKeep) { |
+ : INHERITED(isCrossProcess ? SkWriteBuffer::kCrossProcess_Flag : 0) |
+ , fNumFlatsToKeep(numFlatsToKeep) { |
SkASSERT((isCrossProcess && fset != NULL) || (!isCrossProcess && NULL == fset)); |
if (isCrossProcess) { |
this->setNamedFactorySet(fset); |
- this->setWriteBufferFlags(SkWriteBuffer::kCrossProcess_Flag); |
} |
} |
@@ -109,6 +109,8 @@ private: |
SkTDArray<int> fFlatsThatMustBeKept; |
SkTDArray<void*> fPointers; |
const int fNumFlatsToKeep; |
+ |
+ typedef SkFlatController INHERITED; |
}; |
void FlattenableHeap::unalloc(void* ptr) { |