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 --- tests/ColorFilterTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/ColorFilterTest.cpp') diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp index e8cf8ba019..f3f6a0a8e8 100644 --- a/tests/ColorFilterTest.cpp +++ b/tests/ColorFilterTest.cpp @@ -9,22 +9,22 @@ #include "SkColorFilter.h" #include "SkColorPriv.h" #include "SkLumaColorFilter.h" -#include "SkOrderedReadBuffer.h" -#include "SkOrderedWriteBuffer.h" +#include "SkReadBuffer.h" +#include "SkWriteBuffer.h" #include "SkRandom.h" #include "SkXfermode.h" #include "Test.h" static SkColorFilter* reincarnate_colorfilter(SkFlattenable* obj) { - SkOrderedWriteBuffer wb; + SkWriteBuffer wb; wb.writeFlattenable(obj); - size_t size = wb.size(); + size_t size = wb.bytesWritten(); SkAutoSMalloc<1024> storage(size); // make a copy into storage wb.writeToMemory(storage.get()); - SkOrderedReadBuffer rb(storage.get(), size); + SkReadBuffer rb(storage.get(), size); return rb.readColorFilter(); } -- cgit v1.2.3