From 8b0e8ac5f582de80356019406e2975079bf0829d Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 30 Jan 2014 18:58:24 +0000 Subject: Refactor read and write buffers. Eliminates SkFlattenable{Read,Write}Buffer, promoting SkOrdered{Read,Write}Buffer a step each in the hierarchy. What used to be this: SkFlattenableWriteBuffer -> SkOrderedWriteBuffer SkFlattenableReadBuffer -> SkOrderedReadBuffer SkFlattenableReadBuffer -> SkValidatingReadBuffer is now SkWriteBuffer SkReadBuffer -> SkValidatingReadBuffer Benefits: - code is simpler, names are less wordy - the generic SkFlattenableFooBuffer code in SkPaint was incorrect; removed - write buffers are completely devirtualized, important for record speed This refactoring was mostly mechanical. You aren't going to find anything interesting in files with less than 10 lines changed. BUG=skia: R=reed@google.com, scroggo@google.com, djsollen@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/134163010 git-svn-id: http://skia.googlecode.com/svn/trunk@13245 2bbb7eff-a529-9590-31e7-b0007b416f81 --- samplecode/ClockFaceView.cpp | 9 +++++---- samplecode/SampleAll.cpp | 7 ++++--- samplecode/SampleSlides.cpp | 3 ++- samplecode/SampleText.cpp | 13 +++++++------ 4 files changed, 18 insertions(+), 14 deletions(-) (limited to 'samplecode') diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp index 32c8161aca..ed0bce9b66 100644 --- a/samplecode/ClockFaceView.cpp +++ b/samplecode/ClockFaceView.cpp @@ -8,7 +8,8 @@ #include "SampleCode.h" #include "SkView.h" #include "SkCanvas.h" -#include "SkFlattenableBuffers.h" +#include "SkReadBuffer.h" +#include "SkWriteBuffer.h" #include "SkGradientShader.h" #include "SkPath.h" #include "SkRegion.h" @@ -89,12 +90,12 @@ protected: dst->addCircle(loc.fX, loc.fY, fRadius); } - Dot2DPathEffect(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) { + Dot2DPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) { fRadius = buffer.readScalar(); fPts = NULL; } - virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE { + virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { this->INHERITED::flatten(buffer); buffer.writeScalar(fRadius); } @@ -118,7 +119,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(InverseFillPE) protected: - InverseFillPE(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {} + InverseFillPE(SkReadBuffer& buffer) : INHERITED(buffer) {} private: typedef SkPathEffect INHERITED; diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index 6b742b8355..6410670fed 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -19,7 +19,8 @@ #include "SkDashPathEffect.h" #include "SkDiscretePathEffect.h" #include "SkEmbossMaskFilter.h" -#include "SkFlattenableBuffers.h" +#include "SkReadBuffer.h" +#include "SkWriteBuffer.h" #include "SkGradientShader.h" #include "SkImageDecoder.h" #include "SkLayerRasterizer.h" @@ -171,10 +172,10 @@ protected: dst->addCircle(loc.fX, loc.fY, fRadius); } - Dot2DPathEffect(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) { + Dot2DPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) { fRadius = buffer.readScalar(); } - virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE { + virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE { this->INHERITED::flatten(buffer); buffer.writeScalar(fRadius); } diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp index 68651f3ea1..4f6803221c 100644 --- a/samplecode/SampleSlides.cpp +++ b/samplecode/SampleSlides.cpp @@ -10,7 +10,8 @@ #include "SkBlurMaskFilter.h" #include "SkCanvas.h" #include "SkDevice.h" -#include "SkFlattenableBuffers.h" +#include "SkReadBuffer.h" +#include "SkWriteBuffer.h" #include "SkGradientShader.h" #include "SkLayerRasterizer.h" #include "SkPaint.h" diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp index 9aefd2c09b..7e98171daa 100644 --- a/samplecode/SampleText.cpp +++ b/samplecode/SampleText.cpp @@ -8,7 +8,8 @@ #include "SampleCode.h" #include "SkView.h" #include "SkCanvas.h" -#include "SkFlattenableBuffers.h" +#include "SkReadBuffer.h" +#include "SkWriteBuffer.h" #include "SkGradientShader.h" #include "SkGraphics.h" #include "SkImageDecoder.h" @@ -59,7 +60,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(ReduceNoise) private: - ReduceNoise(SkFlattenableReadBuffer& rb) : SkKernel33ProcMaskFilter(rb) {} + ReduceNoise(SkReadBuffer& rb) : SkKernel33ProcMaskFilter(rb) {} typedef SkKernel33ProcMaskFilter INHERITED; }; @@ -91,7 +92,7 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(Darken) private: - Darken(SkFlattenableReadBuffer& rb) : SkKernel33ProcMaskFilter(rb) {} + Darken(SkReadBuffer& rb) : SkKernel33ProcMaskFilter(rb) {} typedef SkKernel33ProcMaskFilter INHERITED; }; @@ -143,7 +144,7 @@ public: virtual void xfer16(uint16_t dst[], const SkPMColor src[], int count, const SkAlpha aa[]) const SK_OVERRIDE; - typedef SkFlattenable* (*Factory)(SkFlattenableReadBuffer&); + typedef SkFlattenable* (*Factory)(SkReadBuffer&); SK_DEVELOPER_TO_STRING() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPowerMode) @@ -153,11 +154,11 @@ private: uint8_t fTable[256]; // cache void init(SkScalar exponent); - SkPowerMode(SkFlattenableReadBuffer& b) : INHERITED(b) { + SkPowerMode(SkReadBuffer& b) : INHERITED(b) { // read the exponent this->init(SkFixedToScalar(b.readFixed())); } - virtual void flatten(SkFlattenableWriteBuffer& b) const SK_OVERRIDE { + virtual void flatten(SkWriteBuffer& b) const SK_OVERRIDE { this->INHERITED::flatten(b); b.writeFixed(SkScalarToFixed(fExp)); } -- cgit v1.2.3