Refactor read and write buffers.

src/effects/SkKernel33MaskFilter.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 "SkKernel33MaskFilter.h"
 #include "SkColorPriv.h"
-#include "SkFlattenableBuffers.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
 #include "SkString.h"
 
 SkMask::Format SkKernel33ProcMaskFilter::getFormat() const {
     return SkMask::kA8_Format;
 }
 
 bool SkKernel33ProcMaskFilter::filterMask(SkMask* dst, const SkMask& src,
                                       const SkMatrix&, SkIPoint* margin) const {
     // margin???
     dst->fImage = NULL;
@@ skipping 47 matching lines @@
             if (scale < 256) {
                 value = SkAlphaBlend(value, srcRows[1][1], scale);
             }
             *dstRow++ = SkToU8(value);
         }
         dstImage += dst->fRowBytes;
     }
     return true;
 }
 
-void SkKernel33ProcMaskFilter::flatten(SkFlattenableWriteBuffer& wb) const {
+void SkKernel33ProcMaskFilter::flatten(SkWriteBuffer& wb) const {
     this->INHERITED::flatten(wb);
     wb.writeInt(fPercent256);
 }
 
-SkKernel33ProcMaskFilter::SkKernel33ProcMaskFilter(SkFlattenableReadBuffer& rb)
+SkKernel33ProcMaskFilter::SkKernel33ProcMaskFilter(SkReadBuffer& rb)
         : SkMaskFilter(rb) {
     fPercent256 = rb.readInt();
 }
 
 #ifdef SK_DEVELOPER
 void SkKernel33ProcMaskFilter::toString(SkString* str) const {
     str->appendf("percent256: %d, ", fPercent256);
 }
 #endif
 
@@ skipping 11 matching lines @@
     value >>= fShift;
 
     if (value < 0) {
         value = 0;
     } else if (value > 255) {
         value = 255;
     }
     return (uint8_t)value;
 }
 
-void SkKernel33MaskFilter::flatten(SkFlattenableWriteBuffer& wb) const {
+void SkKernel33MaskFilter::flatten(SkWriteBuffer& wb) const {
     this->INHERITED::flatten(wb);
     wb.writeIntArray(&fKernel[0][0], 9);
     wb.writeInt(fShift);
 }
 
-SkKernel33MaskFilter::SkKernel33MaskFilter(SkFlattenableReadBuffer& rb)
+SkKernel33MaskFilter::SkKernel33MaskFilter(SkReadBuffer& rb)
         : SkKernel33ProcMaskFilter(rb) {
     SkDEBUGCODE(bool success = )rb.readIntArray(&fKernel[0][0], 9);
     SkASSERT(success);
     fShift = rb.readInt();
 }
 
 #ifdef SK_DEVELOPER
 void SkKernel33MaskFilter::toString(SkString* str) const {
     str->append("SkKernel33MaskFilter: (");
 
     str->appendf("kernel: (%d, %d, %d, %d, %d, %d, %d, %d, %d), ",
             fKernel[0][0], fKernel[0][1], fKernel[0][2],
             fKernel[1][0], fKernel[1][1], fKernel[1][2],
             fKernel[2][0], fKernel[2][1], fKernel[2][2]);
     str->appendf("shift: %d, ", fShift);
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif