diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-30 18:58:24 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-30 18:58:24 +0000 |
commit | 8b0e8ac5f582de80356019406e2975079bf0829d (patch) | |
tree | 9f43589895207dfcf422d41318b371c9540f1ada /src/utils/SkUnitMappers.cpp | |
parent | 5fbccb35eb9e7e8cfa3c6b02026206db77990324 (diff) |
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
Diffstat (limited to 'src/utils/SkUnitMappers.cpp')
-rw-r--r-- | src/utils/SkUnitMappers.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/utils/SkUnitMappers.cpp b/src/utils/SkUnitMappers.cpp index f86a4542db..336a26e164 100644 --- a/src/utils/SkUnitMappers.cpp +++ b/src/utils/SkUnitMappers.cpp @@ -6,7 +6,8 @@ * found in the LICENSE file. */ #include "SkUnitMappers.h" -#include "SkFlattenableBuffers.h" +#include "SkReadBuffer.h" +#include "SkWriteBuffer.h" SkDiscreteMapper::SkDiscreteMapper(int segments) { @@ -29,13 +30,13 @@ uint16_t SkDiscreteMapper::mapUnit16(uint16_t input) { return SkToU16(x); } -SkDiscreteMapper::SkDiscreteMapper(SkFlattenableReadBuffer& rb) +SkDiscreteMapper::SkDiscreteMapper(SkReadBuffer& rb) : SkUnitMapper(rb) { fSegments = rb.readInt(); fScale = rb.read32(); } -void SkDiscreteMapper::flatten(SkFlattenableWriteBuffer& wb) const { +void SkDiscreteMapper::flatten(SkWriteBuffer& wb) const { this->INHERITED::flatten(wb); wb.writeInt(fSegments); @@ -56,5 +57,5 @@ uint16_t SkCosineMapper::mapUnit16(uint16_t input) return SkToU16(x); } -SkCosineMapper::SkCosineMapper(SkFlattenableReadBuffer& rb) +SkCosineMapper::SkCosineMapper(SkReadBuffer& rb) : SkUnitMapper(rb) {} |