From 506db0b7d2905c6bedba9fc5d4aeaf231a9a34ea Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Tue, 8 Apr 2014 23:31:35 +0000 Subject: SkRecord: make culling work if SkRecordAnnotateCullingPairs is called. - Allow stateful functors; allow visit()/mutate() at a given index; add count(). - Annotate cull push/pop pairs on the PushCull records. (tested) - Use those annotations to skip ahead in SkRecordDraw. (not yet tested beyond dm --skr) - Make SkRecordDraw a function, move its implementation to a .cpp. BUG=skia:2378 R=fmalita@chromium.org, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/229523002 git-svn-id: http://skia.googlecode.com/svn/trunk@14101 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/RecordTest.cpp | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'tests/RecordTest.cpp') diff --git a/tests/RecordTest.cpp b/tests/RecordTest.cpp index 1214b1a5de..58e5de106c 100644 --- a/tests/RecordTest.cpp +++ b/tests/RecordTest.cpp @@ -3,18 +3,20 @@ #include "SkRecord.h" #include "SkRecords.h" -// Adds the area of any DrawRect command it sees into area. +// Sums the area of any DrawRect command it sees. class AreaSummer { public: - explicit AreaSummer(int* area) : fArea(area) {} + AreaSummer() : fArea(0) {} template void operator()(const T&) { } + int area() const { return fArea; } + private: - int* fArea; + int fArea; }; template <> void AreaSummer::operator()(const SkRecords::DrawRect& record) { - *fArea += (int) (record.rect.width() * record.rect.height()); + fArea += (int) (record.rect.width() * record.rect.height()); } // Scales out the bottom-right corner of any DrawRect command it sees by 2x. @@ -36,13 +38,15 @@ DEF_TEST(Record, r) { SkNEW_PLACEMENT_ARGS(record.append(), SkRecords::DrawRect, (rect, paint)); // Its area should be 100. - int area = 0; - record.visit(AreaSummer(&area)); - REPORTER_ASSERT(r, area == 100); - - // Scale 2x. Now it's area should be 400. - record.mutate(Stretch()); - area = 0; - record.visit(AreaSummer(&area)); - REPORTER_ASSERT(r, area == 400); + AreaSummer summer; + record.visit(summer); + REPORTER_ASSERT(r, summer.area() == 100); + + // Scale 2x. + Stretch stretch; + record.mutate(stretch); + + // Now its area should be 100 + 400. + record.visit(summer); + REPORTER_ASSERT(r, summer.area() == 500); } -- cgit v1.2.3