Set write buffer flags only in SkWriteBuffer and SkFlatController constructors.

src/pipe/SkGPipeWrite.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAnnotation.h"
 #include "SkBitmapDevice.h"
@@ skipping 53 matching lines @@
         writer->writePad(data->data(), size);
     }
     return 4 + SkAlign4(size);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 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);
         }
     }
 
     ~FlattenableHeap() {
         fPointers.freeAll();
     }
 
     virtual void* allocThrow(size_t bytes) SK_OVERRIDE;
 
     virtual void unalloc(void* ptr) SK_OVERRIDE;
@@ skipping 13 matching lines @@
     void markAllFlatsSafeToDelete() {
         fFlatsThatMustBeKept.reset();
     }
 
 private:
     // Keep track of the indices (i.e. the result of SkFlatData::index()) of
     // flats that must be kept, since they are on the current paint.
     SkTDArray<int>   fFlatsThatMustBeKept;
     SkTDArray<void*> fPointers;
     const int        fNumFlatsToKeep;
+
+    typedef SkFlatController INHERITED;
 };
 
 void FlattenableHeap::unalloc(void* ptr) {
     int indexToRemove = fPointers.rfind(ptr);
     if (indexToRemove >= 0) {
         sk_free(ptr);
         fPointers.remove(indexToRemove);
     }
 }
 
@@ skipping 1111 matching lines @@
     return fCanvas->shuttleBitmap(bitmap, slot);
 }
 
 void BitmapShuttle::removeCanvas() {
     if (NULL == fCanvas) {
         return;
     }
     fCanvas->unref();
     fCanvas = NULL;
 }