88c3e279ab
This adds back two optimizations from SkPicture: drawPosText strength reduction to drawPosTextH, and pointless save-foo-restore blocks are noop'd away. The small-T optimization in SkRecord gets in the way of implementing replace(), so I removed it. Just to keep the API focused, I removed the methods on SkRecord that iterate over i for you; it's just as efficient to do it yourself, and all of the interesting code does its own custom iteration. BUG=skia:2378 R=fmalita@chromium.org, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/245853002 git-svn-id: http://skia.googlecode.com/svn/trunk@14300 2bbb7eff-a529-9590-31e7-b0007b416f81
71 lines
1.9 KiB
C++
71 lines
1.9 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "Test.h"
|
|
|
|
#include "SkRecord.h"
|
|
#include "SkRecorder.h"
|
|
#include "SkRecords.h"
|
|
|
|
#include "SkEmptyShader.h"
|
|
|
|
#define COUNT(T) + 1
|
|
static const int kRecordTypes = SK_RECORD_TYPES(COUNT);
|
|
#undef COUNT
|
|
|
|
// Tallies the types of commands it sees into a histogram.
|
|
class Tally {
|
|
public:
|
|
Tally() { sk_bzero(&fHistogram, sizeof(fHistogram)); }
|
|
|
|
template <typename T>
|
|
void operator()(const T&) { ++fHistogram[T::kType]; }
|
|
|
|
template <typename T>
|
|
int count() const { return fHistogram[T::kType]; }
|
|
|
|
void apply(const SkRecord& record) {
|
|
for (unsigned i = 0; i < record.count(); i++) {
|
|
record.visit(i, *this);
|
|
}
|
|
}
|
|
|
|
private:
|
|
int fHistogram[kRecordTypes];
|
|
};
|
|
|
|
DEF_TEST(Recorder, r) {
|
|
SkRecord record;
|
|
SkRecorder recorder(SkRecorder::kWriteOnly_Mode, &record, 1920, 1080);
|
|
|
|
recorder.drawRect(SkRect::MakeWH(10, 10), SkPaint());
|
|
|
|
Tally tally;
|
|
tally.apply(record);
|
|
REPORTER_ASSERT(r, 1 == tally.count<SkRecords::DrawRect>());
|
|
}
|
|
|
|
// Regression test for leaking refs held by optional arguments.
|
|
DEF_TEST(Recorder_RefLeaking, r) {
|
|
// We use SaveLayer to test:
|
|
// - its SkRect argument is optional and SkRect is POD. Just testing that that works.
|
|
// - its SkPaint argument is optional and SkPaint is not POD. The bug was here.
|
|
|
|
SkRect bounds = SkRect::MakeWH(320, 240);
|
|
SkPaint paint;
|
|
paint.setShader(SkNEW(SkEmptyShader))->unref();
|
|
|
|
REPORTER_ASSERT(r, paint.getShader()->unique());
|
|
{
|
|
SkRecord record;
|
|
SkRecorder recorder(SkRecorder::kWriteOnly_Mode, &record, 1920, 1080);
|
|
recorder.saveLayer(&bounds, &paint);
|
|
REPORTER_ASSERT(r, !paint.getShader()->unique());
|
|
}
|
|
REPORTER_ASSERT(r, paint.getShader()->unique());
|
|
}
|