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) {
+    : SkFlatController(isCrossProcess ? SkWriteBuffer::kCrossProcess_Flag : 0)

[scroggo, 2014/01/30 21:14:14]

nit: We should define INHERITED to be SkFlatController, and use it here.

[mtklein, 2014/01/30 21:16:56]

Done.

+    , 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 1144 matching lines @@
     return fCanvas->shuttleBitmap(bitmap, slot);
 }
 
 void BitmapShuttle::removeCanvas() {
     if (NULL == fCanvas) {
         return;
     }
     fCanvas->unref();
     fCanvas = NULL;
 }