Refactor read and write buffers.

src/effects/SkEmbossMaskFilter.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkEmbossMaskFilter.h"
 #include "SkBlurMaskFilter.h"
 #include "SkBlurMask.h"
 #include "SkEmbossMask.h"
-#include "SkFlattenableBuffers.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
 #include "SkString.h"
 
 static inline int pin2byte(int n) {
     if (n < 0) {
         n = 0;
     } else if (n > 0xFF) {
         n = 0xFF;
     }
     return n;
 }
@@ skipping 97 matching lines @@
                    SkPoint::Length(fLight.fDirection[0], fLight.fDirection[1]));
 
     SkEmbossMask::Emboss(dst, light);
 
     // restore original alpha
     memcpy(dst->fImage, src.fImage, src.computeImageSize());
 
     return true;
 }
 
-SkEmbossMaskFilter::SkEmbossMaskFilter(SkFlattenableReadBuffer& buffer)
+SkEmbossMaskFilter::SkEmbossMaskFilter(SkReadBuffer& buffer)
         : SkMaskFilter(buffer) {
     SkASSERT(buffer.getArrayCount() == sizeof(Light));
     buffer.readByteArray(&fLight, sizeof(Light));
     SkASSERT(fLight.fPad == 0); // for the font-cache lookup to be clean
     fBlurSigma = buffer.readScalar();
 }
 
-void SkEmbossMaskFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
+void SkEmbossMaskFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
 
     Light tmpLight = fLight;
     tmpLight.fPad = 0;    // for the font-cache lookup to be clean
     buffer.writeByteArray(&tmpLight, sizeof(tmpLight));
     buffer.writeScalar(fBlurSigma);
 }
 
 #ifdef SK_DEVELOPER
 void SkEmbossMaskFilter::toString(SkString* str) const {
     str->append("SkEmbossMaskFilter: (");
 
     str->append("direction: (");
     str->appendScalar(fLight.fDirection[0]);
     str->append(", ");
     str->appendScalar(fLight.fDirection[1]);
     str->append(", ");
     str->appendScalar(fLight.fDirection[2]);
     str->append(") ");
 
     str->appendf("ambient: %d specular: %d ",
         fLight.fAmbient, fLight.fSpecular);
 
     str->append("blurSigma: ");
     str->appendScalar(fBlurSigma);
     str->append(")");
 }
 #endif