2012-09-14 17:26:37 +00:00
|
|
|
/*
|
|
|
|
* Copyright 2012 Google Inc.
|
|
|
|
*
|
|
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
|
|
* found in the LICENSE file.
|
|
|
|
*/
|
2013-12-12 21:11:12 +00:00
|
|
|
|
2014-08-18 20:39:11 +00:00
|
|
|
#include "SkBBoxHierarchy.h"
|
2014-05-06 12:02:22 +00:00
|
|
|
#include "SkBlurImageFilter.h"
|
2012-10-02 17:42:15 +00:00
|
|
|
#include "SkCanvas.h"
|
2014-10-30 23:45:02 +00:00
|
|
|
#include "SkColorMatrixFilter.h"
|
2012-11-29 21:00:39 +00:00
|
|
|
#include "SkColorPriv.h"
|
2014-04-24 21:53:13 +00:00
|
|
|
#include "SkDashPathEffect.h"
|
2012-11-29 21:00:39 +00:00
|
|
|
#include "SkData.h"
|
2015-01-08 02:04:45 +00:00
|
|
|
#include "SkImageGenerator.h"
|
2013-04-25 18:29:32 +00:00
|
|
|
#include "SkError.h"
|
Add Options to SkDecodingImageGenerator, simplify API.
Motivation: We want to remove redundant classes from Skia. To
that end we want to remove SkImageRef and its subclasses and
replace their uses with SkDiscardablePixelRef +
SkDecodingImageGenerator. Since Android uses SkImageRef, we need
to make sure that SkDecodingImageGenerator allows all of the
settings that Android exposes in BitmapFactory.Options.
To that end, we have created an Options struct for the
SkDecodingImageGenerator which lets the client of the generator set
sample size, dithering, and bitmap config.
We have made the SkDecodingImageGenerator constructor private
and replaced the SkDecodingImageGenerator::Install functions
with a SkDecodingImageGenerator::Create functions (one for
SkData and one for SkStream) which now take a
SkDecodingImageGenerator::Options struct.
Also added a ImageDecoderOptions test which loops through a list
of sets of options and tries them on a set of 5 small encoded
images.
Also updated several users of SkDecodingImageGenerator::Install to
follow new call signature - gm/factory.cpp, LazyDecodeBitmap.cpp,
and PictureTest.cpp, CachedDecodingPixelRefTest.cpp.
We also added a new ImprovedBitmapFactory Test which simulates the
exact function that Android will need to modify to use this,
installPixelRef() in BitmapFactory.
R=reed@google.com, scroggo@google.com
Committed: https://code.google.com/p/skia/source/detail?r=12744
Review URL: https://codereview.chromium.org/93703004
git-svn-id: http://skia.googlecode.com/svn/trunk@12855 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-02 13:15:13 +00:00
|
|
|
#include "SkImageEncoder.h"
|
|
|
|
#include "SkImageGenerator.h"
|
2014-11-12 17:32:34 +00:00
|
|
|
#include "SkLayerInfo.h"
|
2012-10-02 17:42:15 +00:00
|
|
|
#include "SkPaint.h"
|
2012-09-14 17:26:37 +00:00
|
|
|
#include "SkPicture.h"
|
2014-04-18 18:04:41 +00:00
|
|
|
#include "SkPictureRecorder.h"
|
2013-08-29 11:54:56 +00:00
|
|
|
#include "SkPictureUtils.h"
|
2014-08-27 19:12:23 +00:00
|
|
|
#include "SkPixelRef.h"
|
2014-12-11 18:53:58 +00:00
|
|
|
#include "SkPixelSerializer.h"
|
2013-01-24 18:27:42 +00:00
|
|
|
#include "SkRRect.h"
|
2014-01-24 20:56:26 +00:00
|
|
|
#include "SkRandom.h"
|
2014-11-19 18:41:14 +00:00
|
|
|
#include "SkRecord.h"
|
2012-11-29 21:00:39 +00:00
|
|
|
#include "SkShader.h"
|
2012-09-14 17:26:37 +00:00
|
|
|
#include "SkStream.h"
|
2014-05-06 12:02:22 +00:00
|
|
|
|
|
|
|
#if SK_SUPPORT_GPU
|
|
|
|
#include "SkSurface.h"
|
|
|
|
#include "GrContextFactory.h"
|
|
|
|
#endif
|
2014-01-24 20:56:26 +00:00
|
|
|
#include "Test.h"
|
2012-09-14 17:26:37 +00:00
|
|
|
|
2014-05-14 18:58:16 +00:00
|
|
|
#include "SkLumaColorFilter.h"
|
|
|
|
#include "SkColorFilterImageFilter.h"
|
|
|
|
|
2012-11-29 21:00:39 +00:00
|
|
|
static void make_bm(SkBitmap* bm, int w, int h, SkColor color, bool immutable) {
|
2014-02-13 14:41:43 +00:00
|
|
|
bm->allocN32Pixels(w, h);
|
2012-11-29 21:00:39 +00:00
|
|
|
bm->eraseColor(color);
|
|
|
|
if (immutable) {
|
|
|
|
bm->setImmutable();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-20 12:29:41 +00:00
|
|
|
/* Hit a few SkPicture::Analysis cases not handled elsewhere. */
|
2014-10-01 16:29:35 +00:00
|
|
|
static void test_analysis(skiatest::Reporter* reporter) {
|
2014-08-20 12:29:41 +00:00
|
|
|
SkPictureRecorder recorder;
|
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(100, 100);
|
2014-08-20 12:29:41 +00:00
|
|
|
{
|
|
|
|
canvas->drawRect(SkRect::MakeWH(10, 10), SkPaint ());
|
|
|
|
}
|
|
|
|
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, !picture->willPlayBackBitmaps());
|
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
canvas = recorder.beginRecording(100, 100);
|
2014-08-20 12:29:41 +00:00
|
|
|
{
|
|
|
|
SkPaint paint;
|
|
|
|
// CreateBitmapShader is too smart for us; an empty (or 1x1) bitmap shader
|
|
|
|
// gets optimized into a non-bitmap form, so we create a 2x2 bitmap here.
|
|
|
|
SkBitmap bitmap;
|
|
|
|
bitmap.allocPixels(SkImageInfo::MakeN32Premul(2, 2));
|
|
|
|
bitmap.eraseColor(SK_ColorBLUE);
|
|
|
|
*(bitmap.getAddr32(0, 0)) = SK_ColorGREEN;
|
|
|
|
SkShader* shader = SkShader::CreateBitmapShader(bitmap, SkShader::kClamp_TileMode,
|
|
|
|
SkShader::kClamp_TileMode);
|
|
|
|
paint.setShader(shader)->unref();
|
|
|
|
REPORTER_ASSERT(reporter,
|
|
|
|
shader->asABitmap(NULL, NULL, NULL) == SkShader::kDefault_BitmapType);
|
|
|
|
|
|
|
|
canvas->drawRect(SkRect::MakeWH(10, 10), paint);
|
|
|
|
}
|
|
|
|
picture.reset(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, picture->willPlayBackBitmaps());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-09-14 17:26:37 +00:00
|
|
|
#ifdef SK_DEBUG
|
2014-08-18 20:39:11 +00:00
|
|
|
// Ensure that deleting an empty SkPicture does not assert. Asserts only fire
|
2014-07-01 15:47:04 +00:00
|
|
|
// in debug mode, so only run in debug mode.
|
|
|
|
static void test_deleting_empty_picture() {
|
2014-04-13 19:09:42 +00:00
|
|
|
SkPictureRecorder recorder;
|
2012-09-14 17:26:37 +00:00
|
|
|
// Creates an SkPictureRecord
|
2014-06-09 13:25:34 +00:00
|
|
|
recorder.beginRecording(0, 0);
|
2014-07-01 15:47:04 +00:00
|
|
|
// Turns that into an SkPicture
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
|
2014-07-01 15:47:04 +00:00
|
|
|
// Ceates a new SkPictureRecord
|
2014-06-09 13:25:34 +00:00
|
|
|
recorder.beginRecording(0, 0);
|
2012-09-14 17:26:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Ensure that serializing an empty picture does not assert. Likewise only runs in debug mode.
|
|
|
|
static void test_serializing_empty_picture() {
|
2014-04-13 19:09:42 +00:00
|
|
|
SkPictureRecorder recorder;
|
2014-06-09 13:25:34 +00:00
|
|
|
recorder.beginRecording(0, 0);
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
|
2012-09-14 17:26:37 +00:00
|
|
|
SkDynamicMemoryWStream stream;
|
2014-04-13 19:09:42 +00:00
|
|
|
picture->serialize(&stream);
|
2012-09-14 17:26:37 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-09-09 20:09:12 +00:00
|
|
|
static void rand_op(SkCanvas* canvas, SkRandom& rand) {
|
2012-10-02 17:42:15 +00:00
|
|
|
SkPaint paint;
|
|
|
|
SkRect rect = SkRect::MakeWH(50, 50);
|
|
|
|
|
|
|
|
SkScalar unit = rand.nextUScalar1();
|
|
|
|
if (unit <= 0.3) {
|
|
|
|
// SkDebugf("save\n");
|
|
|
|
canvas->save();
|
|
|
|
} else if (unit <= 0.6) {
|
|
|
|
// SkDebugf("restore\n");
|
|
|
|
canvas->restore();
|
|
|
|
} else if (unit <= 0.9) {
|
|
|
|
// SkDebugf("clip\n");
|
|
|
|
canvas->clipRect(rect);
|
|
|
|
} else {
|
|
|
|
// SkDebugf("draw\n");
|
|
|
|
canvas->drawPaint(paint);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-25 00:02:12 +00:00
|
|
|
#if SK_SUPPORT_GPU
|
2014-08-20 12:29:41 +00:00
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
static void test_gpu_veto(skiatest::Reporter* reporter) {
|
2014-04-24 21:53:13 +00:00
|
|
|
SkPictureRecorder recorder;
|
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(100, 100);
|
2014-04-24 21:53:13 +00:00
|
|
|
{
|
|
|
|
SkPath path;
|
|
|
|
path.moveTo(0, 0);
|
|
|
|
path.lineTo(50, 50);
|
|
|
|
|
|
|
|
SkScalar intervals[] = { 1.0f, 1.0f };
|
|
|
|
SkAutoTUnref<SkDashPathEffect> dash(SkDashPathEffect::Create(intervals, 2, 0));
|
|
|
|
|
|
|
|
SkPaint paint;
|
|
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
|
|
paint.setPathEffect(dash);
|
|
|
|
|
2015-01-26 19:29:36 +00:00
|
|
|
for (int i = 0; i < 50; ++i) {
|
|
|
|
canvas->drawPath(path, paint);
|
|
|
|
}
|
2014-04-24 21:53:13 +00:00
|
|
|
}
|
|
|
|
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
|
|
|
|
// path effects currently render an SkPicture undesireable for GPU rendering
|
2014-05-30 21:52:52 +00:00
|
|
|
|
|
|
|
const char *reason = NULL;
|
|
|
|
REPORTER_ASSERT(reporter, !picture->suitableForGpuRasterization(NULL, &reason));
|
2014-09-05 20:34:00 +00:00
|
|
|
REPORTER_ASSERT(reporter, reason);
|
2014-04-24 21:53:13 +00:00
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
canvas = recorder.beginRecording(100, 100);
|
2014-04-24 21:53:13 +00:00
|
|
|
{
|
|
|
|
SkPath path;
|
|
|
|
|
|
|
|
path.moveTo(0, 0);
|
|
|
|
path.lineTo(0, 50);
|
|
|
|
path.lineTo(25, 25);
|
|
|
|
path.lineTo(50, 50);
|
|
|
|
path.lineTo(50, 0);
|
|
|
|
path.close();
|
|
|
|
REPORTER_ASSERT(reporter, !path.isConvex());
|
|
|
|
|
|
|
|
SkPaint paint;
|
|
|
|
paint.setAntiAlias(true);
|
|
|
|
for (int i = 0; i < 50; ++i) {
|
|
|
|
canvas->drawPath(path, paint);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
picture.reset(recorder.endRecording());
|
2014-11-04 16:50:15 +00:00
|
|
|
// A lot of small AA concave paths should be fine for GPU rendering
|
|
|
|
REPORTER_ASSERT(reporter, picture->suitableForGpuRasterization(NULL));
|
|
|
|
|
|
|
|
canvas = recorder.beginRecording(100, 100);
|
|
|
|
{
|
|
|
|
SkPath path;
|
|
|
|
|
|
|
|
path.moveTo(0, 0);
|
|
|
|
path.lineTo(0, 100);
|
|
|
|
path.lineTo(50, 50);
|
|
|
|
path.lineTo(100, 100);
|
|
|
|
path.lineTo(100, 0);
|
|
|
|
path.close();
|
|
|
|
REPORTER_ASSERT(reporter, !path.isConvex());
|
|
|
|
|
|
|
|
SkPaint paint;
|
|
|
|
paint.setAntiAlias(true);
|
|
|
|
for (int i = 0; i < 50; ++i) {
|
|
|
|
canvas->drawPath(path, paint);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
picture.reset(recorder.endRecording());
|
|
|
|
// A lot of large AA concave paths currently render an SkPicture undesireable for GPU rendering
|
2014-04-24 21:53:13 +00:00
|
|
|
REPORTER_ASSERT(reporter, !picture->suitableForGpuRasterization(NULL));
|
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
canvas = recorder.beginRecording(100, 100);
|
2014-04-24 21:53:13 +00:00
|
|
|
{
|
|
|
|
SkPath path;
|
|
|
|
|
|
|
|
path.moveTo(0, 0);
|
|
|
|
path.lineTo(0, 50);
|
|
|
|
path.lineTo(25, 25);
|
|
|
|
path.lineTo(50, 50);
|
|
|
|
path.lineTo(50, 0);
|
|
|
|
path.close();
|
|
|
|
REPORTER_ASSERT(reporter, !path.isConvex());
|
|
|
|
|
|
|
|
SkPaint paint;
|
|
|
|
paint.setAntiAlias(true);
|
|
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
|
|
paint.setStrokeWidth(0);
|
|
|
|
for (int i = 0; i < 50; ++i) {
|
|
|
|
canvas->drawPath(path, paint);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
picture.reset(recorder.endRecording());
|
|
|
|
// hairline stroked AA concave paths are fine for GPU rendering
|
|
|
|
REPORTER_ASSERT(reporter, picture->suitableForGpuRasterization(NULL));
|
2014-08-20 12:29:41 +00:00
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
canvas = recorder.beginRecording(100, 100);
|
2014-08-20 12:29:41 +00:00
|
|
|
{
|
|
|
|
SkPaint paint;
|
|
|
|
SkScalar intervals [] = { 10, 20 };
|
|
|
|
SkPathEffect* pe = SkDashPathEffect::Create(intervals, 2, 25);
|
|
|
|
paint.setPathEffect(pe)->unref();
|
|
|
|
|
|
|
|
SkPoint points [2] = { { 0, 0 }, { 100, 0 } };
|
2015-01-26 19:29:36 +00:00
|
|
|
|
|
|
|
for (int i = 0; i < 50; ++i) {
|
|
|
|
canvas->drawPoints(SkCanvas::kLines_PointMode, 2, points, paint);
|
|
|
|
}
|
2014-08-20 12:29:41 +00:00
|
|
|
}
|
|
|
|
picture.reset(recorder.endRecording());
|
|
|
|
// fast-path dashed effects are fine for GPU rendering ...
|
|
|
|
REPORTER_ASSERT(reporter, picture->suitableForGpuRasterization(NULL));
|
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
canvas = recorder.beginRecording(100, 100);
|
2014-08-20 12:29:41 +00:00
|
|
|
{
|
|
|
|
SkPaint paint;
|
|
|
|
SkScalar intervals [] = { 10, 20 };
|
|
|
|
SkPathEffect* pe = SkDashPathEffect::Create(intervals, 2, 25);
|
|
|
|
paint.setPathEffect(pe)->unref();
|
|
|
|
|
2015-01-26 19:29:36 +00:00
|
|
|
for (int i = 0; i < 50; ++i) {
|
|
|
|
canvas->drawRect(SkRect::MakeWH(10, 10), paint);
|
|
|
|
}
|
2014-08-20 12:29:41 +00:00
|
|
|
}
|
|
|
|
picture.reset(recorder.endRecording());
|
|
|
|
// ... but only when applied to drawPoint() calls
|
|
|
|
REPORTER_ASSERT(reporter, !picture->suitableForGpuRasterization(NULL));
|
2014-08-21 16:11:37 +00:00
|
|
|
|
|
|
|
// Nest the previous picture inside a new one.
|
2014-10-01 16:29:35 +00:00
|
|
|
canvas = recorder.beginRecording(100, 100);
|
|
|
|
{
|
|
|
|
canvas->drawPicture(picture.get());
|
2014-08-21 16:11:37 +00:00
|
|
|
}
|
2014-10-01 16:29:35 +00:00
|
|
|
picture.reset(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, !picture->suitableForGpuRasterization(NULL));
|
2014-04-24 21:53:13 +00:00
|
|
|
}
|
2014-05-06 12:02:22 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
#endif
|
2014-05-06 12:02:22 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
static void test_savelayer_extraction(skiatest::Reporter* reporter) {
|
|
|
|
static const int kWidth = 100;
|
|
|
|
static const int kHeight = 100;
|
2014-05-06 12:02:22 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
// Create complex paint that the bounding box computation code can't
|
|
|
|
// optimize away
|
|
|
|
SkScalar blueToRedMatrix[20] = { 0 };
|
|
|
|
blueToRedMatrix[2] = blueToRedMatrix[18] = SK_Scalar1;
|
|
|
|
SkAutoTUnref<SkColorFilter> blueToRed(SkColorMatrixFilter::Create(blueToRedMatrix));
|
|
|
|
SkAutoTUnref<SkImageFilter> filter(SkColorFilterImageFilter::Create(blueToRed.get()));
|
2014-05-06 12:02:22 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
SkPaint complexPaint;
|
|
|
|
complexPaint.setImageFilter(filter);
|
2014-07-17 17:50:59 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
SkAutoTUnref<SkPicture> pict, child;
|
|
|
|
SkRTreeFactory bbhFactory;
|
2014-05-06 12:02:22 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
{
|
|
|
|
SkPictureRecorder recorder;
|
2014-10-30 23:45:02 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
SkCanvas* c = recorder.beginRecording(SkIntToScalar(kWidth), SkIntToScalar(kHeight),
|
|
|
|
&bbhFactory,
|
|
|
|
SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag);
|
2014-10-30 23:45:02 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
c->saveLayer(NULL, &complexPaint);
|
|
|
|
c->restore();
|
2014-08-27 18:53:28 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
child.reset(recorder.endRecording());
|
|
|
|
}
|
2014-08-27 18:53:28 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
// create a picture with the structure:
|
|
|
|
// 1)
|
|
|
|
// SaveLayer
|
|
|
|
// Restore
|
|
|
|
// 2)
|
|
|
|
// SaveLayer
|
|
|
|
// Translate
|
|
|
|
// SaveLayer w/ bound
|
|
|
|
// Restore
|
|
|
|
// Restore
|
|
|
|
// 3)
|
|
|
|
// SaveLayer w/ copyable paint
|
|
|
|
// Restore
|
|
|
|
// 4)
|
|
|
|
// SaveLayer
|
|
|
|
// DrawPicture (which has a SaveLayer/Restore pair)
|
|
|
|
// Restore
|
|
|
|
// 5)
|
|
|
|
// SaveLayer
|
|
|
|
// DrawPicture with Matrix & Paint (with SaveLayer/Restore pair)
|
|
|
|
// Restore
|
|
|
|
{
|
|
|
|
SkPictureRecorder recorder;
|
2014-08-27 18:53:28 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
SkCanvas* c = recorder.beginRecording(SkIntToScalar(kWidth),
|
|
|
|
SkIntToScalar(kHeight),
|
|
|
|
&bbhFactory,
|
|
|
|
SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag);
|
|
|
|
// 1)
|
|
|
|
c->saveLayer(NULL, &complexPaint); // layer #0
|
|
|
|
c->restore();
|
|
|
|
|
|
|
|
// 2)
|
|
|
|
c->saveLayer(NULL, NULL); // layer #1
|
2014-12-01 17:09:27 +00:00
|
|
|
c->translate(kWidth / 2.0f, kHeight / 2.0f);
|
2014-11-12 17:32:34 +00:00
|
|
|
SkRect r = SkRect::MakeXYWH(0, 0, kWidth/2, kHeight/2);
|
|
|
|
c->saveLayer(&r, &complexPaint); // layer #2
|
2014-08-27 18:53:28 +00:00
|
|
|
c->restore();
|
2014-11-12 17:32:34 +00:00
|
|
|
c->restore();
|
2014-08-27 18:53:28 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
// 3)
|
|
|
|
{
|
|
|
|
c->saveLayer(NULL, &complexPaint); // layer #3
|
|
|
|
c->restore();
|
2014-08-27 18:53:28 +00:00
|
|
|
}
|
2014-07-17 17:50:59 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
SkPaint layerPaint;
|
|
|
|
layerPaint.setColor(SK_ColorRED); // Non-alpha only to avoid SaveLayerDrawRestoreNooper
|
2014-05-06 12:02:22 +00:00
|
|
|
// 4)
|
|
|
|
{
|
2014-11-12 17:32:34 +00:00
|
|
|
c->saveLayer(NULL, &layerPaint); // layer #4
|
|
|
|
c->drawPicture(child); // layer #5 inside picture
|
2014-05-06 12:02:22 +00:00
|
|
|
c->restore();
|
2014-11-12 17:32:34 +00:00
|
|
|
}
|
|
|
|
// 5
|
|
|
|
{
|
|
|
|
SkPaint picturePaint;
|
|
|
|
SkMatrix trans;
|
|
|
|
trans.setTranslate(10, 10);
|
2014-05-06 12:02:22 +00:00
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
c->saveLayer(NULL, &layerPaint); // layer #6
|
|
|
|
c->drawPicture(child, &trans, &picturePaint); // layer #7 inside picture
|
2014-07-17 17:50:59 +00:00
|
|
|
c->restore();
|
|
|
|
}
|
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
pict.reset(recorder.endRecording());
|
2014-05-06 12:02:22 +00:00
|
|
|
}
|
|
|
|
|
2014-11-12 17:32:34 +00:00
|
|
|
// Now test out the SaveLayer extraction
|
2014-12-22 19:58:30 +00:00
|
|
|
if (!SkCanvas::Internal_Private_GetIgnoreSaveLayerBounds()) {
|
2014-11-12 17:32:34 +00:00
|
|
|
SkPicture::AccelData::Key key = SkLayerInfo::ComputeKey();
|
|
|
|
|
|
|
|
const SkPicture::AccelData* data = pict->EXPERIMENTAL_getAccelData(key);
|
|
|
|
REPORTER_ASSERT(reporter, data);
|
|
|
|
|
|
|
|
const SkLayerInfo *gpuData = static_cast<const SkLayerInfo*>(data);
|
|
|
|
REPORTER_ASSERT(reporter, 8 == gpuData->numBlocks());
|
|
|
|
|
|
|
|
const SkLayerInfo::BlockInfo& info0 = gpuData->block(0);
|
|
|
|
// The parent/child layers appear in reverse order
|
|
|
|
const SkLayerInfo::BlockInfo& info1 = gpuData->block(2);
|
|
|
|
const SkLayerInfo::BlockInfo& info2 = gpuData->block(1);
|
|
|
|
|
|
|
|
const SkLayerInfo::BlockInfo& info3 = gpuData->block(3);
|
|
|
|
|
|
|
|
// The parent/child layers appear in reverse order
|
|
|
|
const SkLayerInfo::BlockInfo& info4 = gpuData->block(5);
|
|
|
|
const SkLayerInfo::BlockInfo& info5 = gpuData->block(4);
|
|
|
|
|
|
|
|
// The parent/child layers appear in reverse order
|
|
|
|
const SkLayerInfo::BlockInfo& info6 = gpuData->block(7);
|
|
|
|
const SkLayerInfo::BlockInfo& info7 = gpuData->block(6);
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, NULL == info0.fPicture);
|
|
|
|
REPORTER_ASSERT(reporter, kWidth == info0.fBounds.width() &&
|
|
|
|
kHeight == info0.fBounds.height());
|
|
|
|
REPORTER_ASSERT(reporter, info0.fLocalMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, info0.fPreMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, 0 == info0.fBounds.fLeft && 0 == info0.fBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, NULL != info0.fPaint);
|
|
|
|
REPORTER_ASSERT(reporter, !info0.fIsNested && !info0.fHasNestedLayers);
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, NULL == info1.fPicture);
|
|
|
|
REPORTER_ASSERT(reporter, kWidth/2.0 == info1.fBounds.width() &&
|
|
|
|
kHeight/2.0 == info1.fBounds.height());
|
|
|
|
REPORTER_ASSERT(reporter, info1.fLocalMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, info1.fPreMat.isIdentity());
|
2014-11-24 16:20:57 +00:00
|
|
|
REPORTER_ASSERT(reporter, kWidth/2.0 == info1.fBounds.fLeft &&
|
2014-11-12 17:32:34 +00:00
|
|
|
kHeight/2.0 == info1.fBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, NULL == info1.fPaint);
|
|
|
|
REPORTER_ASSERT(reporter, !info1.fIsNested &&
|
|
|
|
info1.fHasNestedLayers); // has a nested SL
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, NULL == info2.fPicture);
|
|
|
|
REPORTER_ASSERT(reporter, kWidth / 2 == info2.fBounds.width() &&
|
|
|
|
kHeight / 2 == info2.fBounds.height()); // bound reduces size
|
|
|
|
REPORTER_ASSERT(reporter, !info2.fLocalMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, info2.fPreMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, kWidth / 2 == info2.fBounds.fLeft && // translated
|
|
|
|
kHeight / 2 == info2.fBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, NULL != info2.fPaint);
|
|
|
|
REPORTER_ASSERT(reporter, info2.fIsNested && !info2.fHasNestedLayers); // is nested
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, NULL == info3.fPicture);
|
|
|
|
REPORTER_ASSERT(reporter, kWidth == info3.fBounds.width() &&
|
|
|
|
kHeight == info3.fBounds.height());
|
|
|
|
REPORTER_ASSERT(reporter, info3.fLocalMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, info3.fPreMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, 0 == info3.fBounds.fLeft && 0 == info3.fBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, info3.fPaint);
|
|
|
|
REPORTER_ASSERT(reporter, !info3.fIsNested && !info3.fHasNestedLayers);
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, NULL == info4.fPicture);
|
|
|
|
REPORTER_ASSERT(reporter, kWidth == info4.fBounds.width() &&
|
|
|
|
kHeight == info4.fBounds.height());
|
|
|
|
REPORTER_ASSERT(reporter, 0 == info4.fBounds.fLeft && 0 == info4.fBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, info4.fLocalMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, info4.fPreMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, info4.fPaint);
|
|
|
|
REPORTER_ASSERT(reporter, !info4.fIsNested &&
|
|
|
|
info4.fHasNestedLayers); // has a nested SL
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, child == info5.fPicture); // in a child picture
|
|
|
|
REPORTER_ASSERT(reporter, kWidth == info5.fBounds.width() &&
|
|
|
|
kHeight == info5.fBounds.height());
|
|
|
|
REPORTER_ASSERT(reporter, 0 == info5.fBounds.fLeft && 0 == info5.fBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, info5.fLocalMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, info5.fPreMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, NULL != info5.fPaint);
|
|
|
|
REPORTER_ASSERT(reporter, info5.fIsNested && !info5.fHasNestedLayers); // is nested
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, NULL == info6.fPicture);
|
|
|
|
REPORTER_ASSERT(reporter, kWidth-10 == info6.fBounds.width() &&
|
|
|
|
kHeight-10 == info6.fBounds.height());
|
|
|
|
REPORTER_ASSERT(reporter, 10 == info6.fBounds.fLeft && 10 == info6.fBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, info6.fLocalMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, info6.fPreMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, info6.fPaint);
|
|
|
|
REPORTER_ASSERT(reporter, !info6.fIsNested &&
|
|
|
|
info6.fHasNestedLayers); // has a nested SL
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, child == info7.fPicture); // in a child picture
|
|
|
|
REPORTER_ASSERT(reporter, kWidth == info7.fBounds.width() &&
|
|
|
|
kHeight == info7.fBounds.height());
|
|
|
|
REPORTER_ASSERT(reporter, 0 == info7.fBounds.fLeft && 0 == info7.fBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, info7.fLocalMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, info7.fPreMat.isIdentity());
|
|
|
|
REPORTER_ASSERT(reporter, NULL != info7.fPaint);
|
|
|
|
REPORTER_ASSERT(reporter, info7.fIsNested && !info7.fHasNestedLayers); // is nested
|
|
|
|
}
|
|
|
|
}
|
2014-04-24 21:53:13 +00:00
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
static void test_has_text(skiatest::Reporter* reporter) {
|
2014-08-18 19:59:55 +00:00
|
|
|
SkPictureRecorder recorder;
|
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(100,100);
|
2014-08-18 19:59:55 +00:00
|
|
|
{
|
2014-08-20 15:09:46 +00:00
|
|
|
canvas->drawRect(SkRect::MakeWH(20, 20), SkPaint());
|
2014-08-18 19:59:55 +00:00
|
|
|
}
|
|
|
|
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, !picture->hasText());
|
|
|
|
|
2014-08-20 15:09:46 +00:00
|
|
|
SkPoint point = SkPoint::Make(10, 10);
|
2014-10-01 16:29:35 +00:00
|
|
|
canvas = recorder.beginRecording(100,100);
|
2014-08-18 19:59:55 +00:00
|
|
|
{
|
2014-08-20 15:09:46 +00:00
|
|
|
canvas->drawText("Q", 1, point.fX, point.fY, SkPaint());
|
2014-08-18 19:59:55 +00:00
|
|
|
}
|
|
|
|
picture.reset(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, picture->hasText());
|
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
canvas = recorder.beginRecording(100,100);
|
2014-08-18 19:59:55 +00:00
|
|
|
{
|
2014-08-20 15:09:46 +00:00
|
|
|
canvas->drawPosText("Q", 1, &point, SkPaint());
|
2014-08-18 19:59:55 +00:00
|
|
|
}
|
|
|
|
picture.reset(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, picture->hasText());
|
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
canvas = recorder.beginRecording(100,100);
|
2014-08-18 19:59:55 +00:00
|
|
|
{
|
2014-08-20 15:09:46 +00:00
|
|
|
canvas->drawPosTextH("Q", 1, &point.fX, point.fY, SkPaint());
|
2014-08-18 19:59:55 +00:00
|
|
|
}
|
|
|
|
picture.reset(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, picture->hasText());
|
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
canvas = recorder.beginRecording(100,100);
|
2014-08-18 19:59:55 +00:00
|
|
|
{
|
|
|
|
SkPath path;
|
|
|
|
path.moveTo(0, 0);
|
|
|
|
path.lineTo(50, 50);
|
|
|
|
|
2014-08-20 15:09:46 +00:00
|
|
|
canvas->drawTextOnPathHV("Q", 1, path, point.fX, point.fY, SkPaint());
|
2014-08-18 19:59:55 +00:00
|
|
|
}
|
|
|
|
picture.reset(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, picture->hasText());
|
|
|
|
|
2014-10-01 16:29:35 +00:00
|
|
|
canvas = recorder.beginRecording(100,100);
|
2014-08-18 19:59:55 +00:00
|
|
|
{
|
|
|
|
SkPath path;
|
|
|
|
path.moveTo(0, 0);
|
|
|
|
path.lineTo(50, 50);
|
|
|
|
|
2014-08-20 15:09:46 +00:00
|
|
|
canvas->drawTextOnPath("Q", 1, path, NULL, SkPaint());
|
2014-08-18 19:59:55 +00:00
|
|
|
}
|
|
|
|
picture.reset(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, picture->hasText());
|
2014-08-21 16:11:37 +00:00
|
|
|
|
|
|
|
// Nest the previous picture inside a new one.
|
2014-10-01 16:29:35 +00:00
|
|
|
canvas = recorder.beginRecording(100,100);
|
|
|
|
{
|
|
|
|
canvas->drawPicture(picture.get());
|
2014-08-21 16:11:37 +00:00
|
|
|
}
|
2014-10-01 16:29:35 +00:00
|
|
|
picture.reset(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, picture->hasText());
|
2014-08-18 19:59:55 +00:00
|
|
|
}
|
|
|
|
|
2014-02-13 16:00:51 +00:00
|
|
|
static void set_canvas_to_save_count_4(SkCanvas* canvas) {
|
|
|
|
canvas->restoreToCount(1);
|
|
|
|
canvas->save();
|
|
|
|
canvas->save();
|
|
|
|
canvas->save();
|
|
|
|
}
|
|
|
|
|
2014-05-27 23:41:45 +00:00
|
|
|
/**
|
|
|
|
* A canvas that records the number of saves, saveLayers and restores.
|
|
|
|
*/
|
|
|
|
class SaveCountingCanvas : public SkCanvas {
|
|
|
|
public:
|
|
|
|
SaveCountingCanvas(int width, int height)
|
|
|
|
: INHERITED(width, height)
|
|
|
|
, fSaveCount(0)
|
|
|
|
, fSaveLayerCount(0)
|
|
|
|
, fRestoreCount(0){
|
|
|
|
}
|
|
|
|
|
|
|
|
virtual SaveLayerStrategy willSaveLayer(const SkRect* bounds, const SkPaint* paint,
|
|
|
|
SaveFlags flags) SK_OVERRIDE {
|
|
|
|
++fSaveLayerCount;
|
|
|
|
return this->INHERITED::willSaveLayer(bounds, paint, flags);
|
|
|
|
}
|
|
|
|
|
2015-01-09 18:06:39 +00:00
|
|
|
void willSave() SK_OVERRIDE {
|
2014-05-27 23:41:45 +00:00
|
|
|
++fSaveCount;
|
2014-06-30 14:13:28 +00:00
|
|
|
this->INHERITED::willSave();
|
2014-05-27 23:41:45 +00:00
|
|
|
}
|
|
|
|
|
2015-01-09 18:06:39 +00:00
|
|
|
void willRestore() SK_OVERRIDE {
|
2014-05-27 23:41:45 +00:00
|
|
|
++fRestoreCount;
|
|
|
|
this->INHERITED::willRestore();
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned int getSaveCount() const { return fSaveCount; }
|
|
|
|
unsigned int getSaveLayerCount() const { return fSaveLayerCount; }
|
|
|
|
unsigned int getRestoreCount() const { return fRestoreCount; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
unsigned int fSaveCount;
|
|
|
|
unsigned int fSaveLayerCount;
|
|
|
|
unsigned int fRestoreCount;
|
|
|
|
|
|
|
|
typedef SkCanvas INHERITED;
|
|
|
|
};
|
|
|
|
|
2014-05-28 03:06:06 +00:00
|
|
|
void check_save_state(skiatest::Reporter* reporter, SkPicture* picture,
|
2014-05-27 23:41:45 +00:00
|
|
|
unsigned int numSaves, unsigned int numSaveLayers,
|
|
|
|
unsigned int numRestores) {
|
2014-09-08 14:31:18 +00:00
|
|
|
SaveCountingCanvas canvas(SkScalarCeilToInt(picture->cullRect().width()),
|
2014-08-29 15:03:56 +00:00
|
|
|
SkScalarCeilToInt(picture->cullRect().height()));
|
2014-05-27 23:41:45 +00:00
|
|
|
|
2014-09-04 15:42:50 +00:00
|
|
|
picture->playback(&canvas);
|
2014-05-27 23:41:45 +00:00
|
|
|
|
2014-09-08 14:31:18 +00:00
|
|
|
// Optimizations may have removed these,
|
|
|
|
// so expect to have seen no more than num{Saves,SaveLayers,Restores}.
|
|
|
|
REPORTER_ASSERT(reporter, numSaves >= canvas.getSaveCount());
|
|
|
|
REPORTER_ASSERT(reporter, numSaveLayers >= canvas.getSaveLayerCount());
|
|
|
|
REPORTER_ASSERT(reporter, numRestores >= canvas.getRestoreCount());
|
2014-05-27 23:41:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// This class exists so SkPicture can friend it and give it access to
|
|
|
|
// the 'partialReplay' method.
|
|
|
|
class SkPictureRecorderReplayTester {
|
|
|
|
public:
|
|
|
|
static SkPicture* Copy(SkPictureRecorder* recorder) {
|
|
|
|
SkPictureRecorder recorder2;
|
|
|
|
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder2.beginRecording(10, 10);
|
2014-05-27 23:41:45 +00:00
|
|
|
|
|
|
|
recorder->partialReplay(canvas);
|
|
|
|
|
|
|
|
return recorder2.endRecording();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-06-10 18:45:46 +00:00
|
|
|
static void create_imbalance(SkCanvas* canvas) {
|
|
|
|
SkRect clipRect = SkRect::MakeWH(2, 2);
|
|
|
|
SkRect drawRect = SkRect::MakeWH(10, 10);
|
|
|
|
canvas->save();
|
|
|
|
canvas->clipRect(clipRect, SkRegion::kReplace_Op);
|
|
|
|
canvas->translate(1.0f, 1.0f);
|
|
|
|
SkPaint p;
|
|
|
|
p.setColor(SK_ColorGREEN);
|
|
|
|
canvas->drawRect(drawRect, p);
|
|
|
|
// no restore
|
|
|
|
}
|
|
|
|
|
|
|
|
// This tests that replaying a potentially unbalanced picture into a canvas
|
|
|
|
// doesn't affect the canvas' save count or matrix/clip state.
|
|
|
|
static void check_balance(skiatest::Reporter* reporter, SkPicture* picture) {
|
|
|
|
SkBitmap bm;
|
|
|
|
bm.allocN32Pixels(4, 3);
|
|
|
|
SkCanvas canvas(bm);
|
|
|
|
|
|
|
|
int beforeSaveCount = canvas.getSaveCount();
|
|
|
|
|
|
|
|
SkMatrix beforeMatrix = canvas.getTotalMatrix();
|
|
|
|
|
|
|
|
SkRect beforeClip;
|
|
|
|
|
|
|
|
canvas.getClipBounds(&beforeClip);
|
|
|
|
|
|
|
|
canvas.drawPicture(picture);
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, beforeSaveCount == canvas.getSaveCount());
|
|
|
|
REPORTER_ASSERT(reporter, beforeMatrix == canvas.getTotalMatrix());
|
|
|
|
|
|
|
|
SkRect afterClip;
|
|
|
|
|
|
|
|
canvas.getClipBounds(&afterClip);
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, afterClip == beforeClip);
|
|
|
|
}
|
|
|
|
|
2014-05-27 23:41:45 +00:00
|
|
|
// Test out SkPictureRecorder::partialReplay
|
|
|
|
DEF_TEST(PictureRecorder_replay, reporter) {
|
|
|
|
// check save/saveLayer state
|
|
|
|
{
|
|
|
|
SkPictureRecorder recorder;
|
|
|
|
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(10, 10);
|
2014-05-27 23:41:45 +00:00
|
|
|
|
|
|
|
canvas->saveLayer(NULL, NULL);
|
|
|
|
|
|
|
|
SkAutoTUnref<SkPicture> copy(SkPictureRecorderReplayTester::Copy(&recorder));
|
|
|
|
|
|
|
|
// The extra save and restore comes from the Copy process.
|
|
|
|
check_save_state(reporter, copy, 2, 1, 3);
|
|
|
|
|
|
|
|
canvas->saveLayer(NULL, NULL);
|
|
|
|
|
|
|
|
SkAutoTUnref<SkPicture> final(recorder.endRecording());
|
|
|
|
|
|
|
|
check_save_state(reporter, final, 1, 2, 3);
|
|
|
|
|
|
|
|
// The copy shouldn't pick up any operations added after it was made
|
|
|
|
check_save_state(reporter, copy, 2, 1, 3);
|
|
|
|
}
|
|
|
|
|
|
|
|
// (partially) check leakage of draw ops
|
|
|
|
{
|
|
|
|
SkPictureRecorder recorder;
|
|
|
|
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(10, 10);
|
2014-05-27 23:41:45 +00:00
|
|
|
|
|
|
|
SkRect r = SkRect::MakeWH(5, 5);
|
|
|
|
SkPaint p;
|
|
|
|
|
|
|
|
canvas->drawRect(r, p);
|
|
|
|
|
|
|
|
SkAutoTUnref<SkPicture> copy(SkPictureRecorderReplayTester::Copy(&recorder));
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, !copy->willPlayBackBitmaps());
|
|
|
|
|
|
|
|
SkBitmap bm;
|
|
|
|
make_bm(&bm, 10, 10, SK_ColorRED, true);
|
|
|
|
|
|
|
|
r.offset(5.0f, 5.0f);
|
|
|
|
canvas->drawBitmapRectToRect(bm, NULL, r);
|
|
|
|
|
|
|
|
SkAutoTUnref<SkPicture> final(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, final->willPlayBackBitmaps());
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, copy->uniqueID() != final->uniqueID());
|
|
|
|
|
|
|
|
// The snapshot shouldn't pick up any operations added after it was made
|
|
|
|
REPORTER_ASSERT(reporter, !copy->willPlayBackBitmaps());
|
|
|
|
}
|
2014-06-10 18:45:46 +00:00
|
|
|
|
|
|
|
// Recreate the Android partialReplay test case
|
|
|
|
{
|
|
|
|
SkPictureRecorder recorder;
|
|
|
|
|
|
|
|
SkCanvas* canvas = recorder.beginRecording(4, 3, NULL, 0);
|
|
|
|
create_imbalance(canvas);
|
|
|
|
|
|
|
|
int expectedSaveCount = canvas->getSaveCount();
|
|
|
|
|
|
|
|
SkAutoTUnref<SkPicture> copy(SkPictureRecorderReplayTester::Copy(&recorder));
|
|
|
|
check_balance(reporter, copy);
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, expectedSaveCount = canvas->getSaveCount());
|
|
|
|
|
|
|
|
// End the recording of source to test the picture finalization
|
|
|
|
// process isn't complicated by the partialReplay step
|
|
|
|
SkAutoTUnref<SkPicture> final(recorder.endRecording());
|
|
|
|
}
|
2014-05-27 23:41:45 +00:00
|
|
|
}
|
|
|
|
|
2014-02-13 16:00:51 +00:00
|
|
|
static void test_unbalanced_save_restores(skiatest::Reporter* reporter) {
|
|
|
|
SkCanvas testCanvas(100, 100);
|
|
|
|
set_canvas_to_save_count_4(&testCanvas);
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, 4 == testCanvas.getSaveCount());
|
|
|
|
|
|
|
|
SkPaint paint;
|
|
|
|
SkRect rect = SkRect::MakeLTRB(-10000000, -10000000, 10000000, 10000000);
|
|
|
|
|
2014-04-13 19:09:42 +00:00
|
|
|
SkPictureRecorder recorder;
|
2014-02-13 16:00:51 +00:00
|
|
|
|
2014-04-13 19:09:42 +00:00
|
|
|
{
|
|
|
|
// Create picture with 2 unbalanced saves
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(100, 100);
|
2014-04-13 19:09:42 +00:00
|
|
|
canvas->save();
|
|
|
|
canvas->translate(10, 10);
|
|
|
|
canvas->drawRect(rect, paint);
|
|
|
|
canvas->save();
|
|
|
|
canvas->translate(10, 10);
|
|
|
|
canvas->drawRect(rect, paint);
|
|
|
|
SkAutoTUnref<SkPicture> extraSavePicture(recorder.endRecording());
|
|
|
|
|
2014-06-04 12:40:44 +00:00
|
|
|
testCanvas.drawPicture(extraSavePicture);
|
2014-04-13 19:09:42 +00:00
|
|
|
REPORTER_ASSERT(reporter, 4 == testCanvas.getSaveCount());
|
|
|
|
}
|
2014-02-13 16:00:51 +00:00
|
|
|
|
|
|
|
set_canvas_to_save_count_4(&testCanvas);
|
|
|
|
|
2014-04-13 19:09:42 +00:00
|
|
|
{
|
|
|
|
// Create picture with 2 unbalanced restores
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(100, 100);
|
2014-04-13 19:09:42 +00:00
|
|
|
canvas->save();
|
|
|
|
canvas->translate(10, 10);
|
|
|
|
canvas->drawRect(rect, paint);
|
|
|
|
canvas->save();
|
|
|
|
canvas->translate(10, 10);
|
|
|
|
canvas->drawRect(rect, paint);
|
|
|
|
canvas->restore();
|
|
|
|
canvas->restore();
|
|
|
|
canvas->restore();
|
|
|
|
canvas->restore();
|
|
|
|
SkAutoTUnref<SkPicture> extraRestorePicture(recorder.endRecording());
|
2014-02-13 16:00:51 +00:00
|
|
|
|
2014-06-04 12:40:44 +00:00
|
|
|
testCanvas.drawPicture(extraRestorePicture);
|
2014-04-13 19:09:42 +00:00
|
|
|
REPORTER_ASSERT(reporter, 4 == testCanvas.getSaveCount());
|
|
|
|
}
|
2014-02-13 16:00:51 +00:00
|
|
|
|
2014-04-13 19:09:42 +00:00
|
|
|
set_canvas_to_save_count_4(&testCanvas);
|
|
|
|
|
|
|
|
{
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(100, 100);
|
2014-04-13 19:09:42 +00:00
|
|
|
canvas->translate(10, 10);
|
|
|
|
canvas->drawRect(rect, paint);
|
|
|
|
SkAutoTUnref<SkPicture> noSavePicture(recorder.endRecording());
|
|
|
|
|
2014-06-04 12:40:44 +00:00
|
|
|
testCanvas.drawPicture(noSavePicture);
|
2014-04-13 19:09:42 +00:00
|
|
|
REPORTER_ASSERT(reporter, 4 == testCanvas.getSaveCount());
|
|
|
|
REPORTER_ASSERT(reporter, testCanvas.getTotalMatrix().isIdentity());
|
|
|
|
}
|
2014-02-13 16:00:51 +00:00
|
|
|
}
|
|
|
|
|
2013-02-27 19:17:41 +00:00
|
|
|
static void test_peephole() {
|
2013-09-09 20:09:12 +00:00
|
|
|
SkRandom rand;
|
2012-10-02 17:42:15 +00:00
|
|
|
|
2014-04-13 19:09:42 +00:00
|
|
|
SkPictureRecorder recorder;
|
|
|
|
|
2012-10-02 17:42:15 +00:00
|
|
|
for (int j = 0; j < 100; j++) {
|
2013-09-09 20:09:12 +00:00
|
|
|
SkRandom rand2(rand); // remember the seed
|
2012-10-02 17:42:15 +00:00
|
|
|
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(100, 100);
|
2012-10-02 17:42:15 +00:00
|
|
|
|
|
|
|
for (int i = 0; i < 1000; ++i) {
|
|
|
|
rand_op(canvas, rand);
|
|
|
|
}
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
|
2013-03-04 13:56:38 +00:00
|
|
|
|
|
|
|
rand = rand2;
|
2012-10-02 17:42:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(100, 100);
|
2012-10-02 17:42:15 +00:00
|
|
|
SkRect rect = SkRect::MakeWH(50, 50);
|
2012-10-03 02:01:13 +00:00
|
|
|
|
2012-10-02 17:42:15 +00:00
|
|
|
for (int i = 0; i < 100; ++i) {
|
|
|
|
canvas->save();
|
|
|
|
}
|
|
|
|
while (canvas->getSaveCount() > 1) {
|
|
|
|
canvas->clipRect(rect);
|
|
|
|
canvas->restore();
|
|
|
|
}
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
|
2012-10-02 17:42:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-04 15:08:56 +00:00
|
|
|
#ifndef SK_DEBUG
|
|
|
|
// Only test this is in release mode. We deliberately crash in debug mode, since a valid caller
|
|
|
|
// should never do this.
|
|
|
|
static void test_bad_bitmap() {
|
|
|
|
// This bitmap has a width and height but no pixels. As a result, attempting to record it will
|
|
|
|
// fail.
|
|
|
|
SkBitmap bm;
|
2014-05-30 13:26:10 +00:00
|
|
|
bm.setInfo(SkImageInfo::MakeN32Premul(100, 100));
|
2014-04-13 19:09:42 +00:00
|
|
|
SkPictureRecorder recorder;
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* recordingCanvas = recorder.beginRecording(100, 100);
|
2012-12-04 15:08:56 +00:00
|
|
|
recordingCanvas->drawBitmap(bm, 0, 0);
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
|
2012-12-04 15:08:56 +00:00
|
|
|
|
|
|
|
SkCanvas canvas;
|
2014-06-04 12:40:44 +00:00
|
|
|
canvas.drawPicture(picture);
|
2012-12-04 15:08:56 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-12-11 18:53:58 +00:00
|
|
|
// Encodes to PNG, unless there is already encoded data, in which case that gets
|
|
|
|
// used.
|
|
|
|
// FIXME: Share with PictureRenderer.cpp?
|
|
|
|
class PngPixelSerializer : public SkPixelSerializer {
|
|
|
|
public:
|
2014-12-19 20:26:07 +00:00
|
|
|
bool onUseEncodedData(const void*, size_t) SK_OVERRIDE { return true; }
|
|
|
|
SkData* onEncodePixels(const SkImageInfo& info, const void* pixels,
|
|
|
|
size_t rowBytes) SK_OVERRIDE {
|
|
|
|
return SkImageEncoder::EncodeData(info, pixels, rowBytes, SkImageEncoder::kPNG_Type, 100);
|
2014-12-11 18:53:58 +00:00
|
|
|
}
|
|
|
|
};
|
2012-12-10 15:40:55 +00:00
|
|
|
|
|
|
|
static SkData* serialized_picture_from_bitmap(const SkBitmap& bitmap) {
|
2014-04-13 19:09:42 +00:00
|
|
|
SkPictureRecorder recorder;
|
2014-09-08 14:31:18 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(bitmap.width()),
|
2014-08-29 15:03:56 +00:00
|
|
|
SkIntToScalar(bitmap.height()));
|
2012-12-10 15:40:55 +00:00
|
|
|
canvas->drawBitmap(bitmap, 0, 0);
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
|
|
|
|
|
2012-12-10 15:40:55 +00:00
|
|
|
SkDynamicMemoryWStream wStream;
|
2014-12-11 18:53:58 +00:00
|
|
|
PngPixelSerializer serializer;
|
|
|
|
picture->serialize(&wStream, &serializer);
|
2012-12-10 15:40:55 +00:00
|
|
|
return wStream.copyToData();
|
|
|
|
}
|
|
|
|
|
2013-04-25 18:29:32 +00:00
|
|
|
struct ErrorContext {
|
|
|
|
int fErrors;
|
|
|
|
skiatest::Reporter* fReporter;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void assert_one_parse_error_cb(SkError error, void* context) {
|
|
|
|
ErrorContext* errorContext = static_cast<ErrorContext*>(context);
|
|
|
|
errorContext->fErrors++;
|
|
|
|
// This test only expects one error, and that is a kParseError. If there are others,
|
|
|
|
// there is some unknown problem.
|
|
|
|
REPORTER_ASSERT_MESSAGE(errorContext->fReporter, 1 == errorContext->fErrors,
|
|
|
|
"This threw more errors than expected.");
|
|
|
|
REPORTER_ASSERT_MESSAGE(errorContext->fReporter, kParseError_SkError == error,
|
|
|
|
SkGetLastErrorString());
|
|
|
|
}
|
|
|
|
|
2012-12-10 15:40:55 +00:00
|
|
|
static void test_bitmap_with_encoded_data(skiatest::Reporter* reporter) {
|
|
|
|
// Create a bitmap that will be encoded.
|
|
|
|
SkBitmap original;
|
|
|
|
make_bm(&original, 100, 100, SK_ColorBLUE, true);
|
|
|
|
SkDynamicMemoryWStream wStream;
|
|
|
|
if (!SkImageEncoder::EncodeStream(&wStream, original, SkImageEncoder::kPNG_Type, 100)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
SkAutoDataUnref data(wStream.copyToData());
|
|
|
|
|
|
|
|
SkBitmap bm;
|
2015-01-08 02:04:45 +00:00
|
|
|
bool installSuccess = SkInstallDiscardablePixelRef(data, &bm);
|
2013-12-13 19:45:58 +00:00
|
|
|
REPORTER_ASSERT(reporter, installSuccess);
|
2012-12-10 15:40:55 +00:00
|
|
|
|
|
|
|
// Write both bitmaps to pictures, and ensure that the resulting data streams are the same.
|
|
|
|
// Flattening original will follow the old path of performing an encode, while flattening bm
|
|
|
|
// will use the already encoded data.
|
|
|
|
SkAutoDataUnref picture1(serialized_picture_from_bitmap(original));
|
|
|
|
SkAutoDataUnref picture2(serialized_picture_from_bitmap(bm));
|
|
|
|
REPORTER_ASSERT(reporter, picture1->equals(picture2));
|
2013-04-25 18:29:32 +00:00
|
|
|
// Now test that a parse error was generated when trying to create a new SkPicture without
|
|
|
|
// providing a function to decode the bitmap.
|
|
|
|
ErrorContext context;
|
|
|
|
context.fErrors = 0;
|
|
|
|
context.fReporter = reporter;
|
|
|
|
SkSetErrorCallback(assert_one_parse_error_cb, &context);
|
|
|
|
SkMemoryStream pictureStream(picture1);
|
|
|
|
SkClearLastError();
|
2014-11-20 17:18:31 +00:00
|
|
|
SkAutoTUnref<SkPicture> pictureFromStream(SkPicture::CreateFromStream(&pictureStream, NULL));
|
2013-06-28 21:32:00 +00:00
|
|
|
REPORTER_ASSERT(reporter, pictureFromStream.get() != NULL);
|
2013-04-25 18:29:32 +00:00
|
|
|
SkClearLastError();
|
|
|
|
SkSetErrorCallback(NULL, NULL);
|
2012-12-10 15:40:55 +00:00
|
|
|
}
|
|
|
|
|
2013-05-08 15:39:13 +00:00
|
|
|
static void test_clip_bound_opt(skiatest::Reporter* reporter) {
|
|
|
|
// Test for crbug.com/229011
|
|
|
|
SkRect rect1 = SkRect::MakeXYWH(SkIntToScalar(4), SkIntToScalar(4),
|
|
|
|
SkIntToScalar(2), SkIntToScalar(2));
|
|
|
|
SkRect rect2 = SkRect::MakeXYWH(SkIntToScalar(7), SkIntToScalar(7),
|
|
|
|
SkIntToScalar(1), SkIntToScalar(1));
|
|
|
|
SkRect rect3 = SkRect::MakeXYWH(SkIntToScalar(6), SkIntToScalar(6),
|
|
|
|
SkIntToScalar(1), SkIntToScalar(1));
|
|
|
|
|
|
|
|
SkPath invPath;
|
|
|
|
invPath.addOval(rect1);
|
|
|
|
invPath.setFillType(SkPath::kInverseEvenOdd_FillType);
|
|
|
|
SkPath path;
|
|
|
|
path.addOval(rect2);
|
|
|
|
SkPath path2;
|
|
|
|
path2.addOval(rect3);
|
|
|
|
SkIRect clipBounds;
|
2014-04-13 19:09:42 +00:00
|
|
|
SkPictureRecorder recorder;
|
Revert of Revert of allow canvas to force conservative clips (for speed) (patchset #1 id:1 of https://codereview.chromium.org/554033003/)
Reason for revert:
May just rebaseline, plus want to see the results of the chrome tests, so re-trying this CL.
Original issue's description:
> Revert of allow canvas to force conservative clips (for speed) (patchset #7 id:120001 of https://codereview.chromium.org/541593005/)
>
> Reason for revert:
> multipicturedraw failed on nvprmsaa -- don't know why yet
>
> Original issue's description:
> > Allow SkCanvas to be initialized to force conservative rasterclips. This has the following effects:
> >
> > 1. Queries to the current clip will be conservatively large. This can mean the quickReject may return false more often.
> >
> > 2. The conservative clips mean less work is done.
> >
> > 3. Enabled by default for Gpu, Record, and NoSaveLayer canvases.
> >
> > 4. API is private for now.
> >
> > Committed: https://skia.googlesource.com/skia/+/27a5e656c3d6ef22f9cb34de18e1b960da3aa241
>
> TBR=robertphillips@google.com,bsalomon@google.com,mtklein@google.com,junov@google.com
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: https://skia.googlesource.com/skia/+/6f09709519b79a1159f3826645f1c5fbc101ee11
R=robertphillips@google.com, bsalomon@google.com, mtklein@google.com, junov@google.com, reed@google.com
TBR=bsalomon@google.com, junov@google.com, mtklein@google.com, reed@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/560713002
2014-09-10 01:46:22 +00:00
|
|
|
|
|
|
|
// Testing conservative-raster-clip that is enabled by PictureRecord
|
2013-05-08 15:39:13 +00:00
|
|
|
{
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(10, 10);
|
2013-05-08 15:39:13 +00:00
|
|
|
canvas->clipPath(invPath, SkRegion::kIntersect_Op);
|
|
|
|
bool nonEmpty = canvas->getClipDeviceBounds(&clipBounds);
|
|
|
|
REPORTER_ASSERT(reporter, true == nonEmpty);
|
|
|
|
REPORTER_ASSERT(reporter, 0 == clipBounds.fLeft);
|
|
|
|
REPORTER_ASSERT(reporter, 0 == clipBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, 10 == clipBounds.fBottom);
|
|
|
|
REPORTER_ASSERT(reporter, 10 == clipBounds.fRight);
|
|
|
|
}
|
|
|
|
{
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(10, 10);
|
2013-05-08 15:39:13 +00:00
|
|
|
canvas->clipPath(path, SkRegion::kIntersect_Op);
|
|
|
|
canvas->clipPath(invPath, SkRegion::kIntersect_Op);
|
|
|
|
bool nonEmpty = canvas->getClipDeviceBounds(&clipBounds);
|
|
|
|
REPORTER_ASSERT(reporter, true == nonEmpty);
|
|
|
|
REPORTER_ASSERT(reporter, 7 == clipBounds.fLeft);
|
|
|
|
REPORTER_ASSERT(reporter, 7 == clipBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, 8 == clipBounds.fBottom);
|
|
|
|
REPORTER_ASSERT(reporter, 8 == clipBounds.fRight);
|
|
|
|
}
|
|
|
|
{
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(10, 10);
|
2013-05-08 15:39:13 +00:00
|
|
|
canvas->clipPath(path, SkRegion::kIntersect_Op);
|
|
|
|
canvas->clipPath(invPath, SkRegion::kUnion_Op);
|
|
|
|
bool nonEmpty = canvas->getClipDeviceBounds(&clipBounds);
|
|
|
|
REPORTER_ASSERT(reporter, true == nonEmpty);
|
|
|
|
REPORTER_ASSERT(reporter, 0 == clipBounds.fLeft);
|
|
|
|
REPORTER_ASSERT(reporter, 0 == clipBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, 10 == clipBounds.fBottom);
|
|
|
|
REPORTER_ASSERT(reporter, 10 == clipBounds.fRight);
|
|
|
|
}
|
|
|
|
{
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(10, 10);
|
2013-05-08 15:39:13 +00:00
|
|
|
canvas->clipPath(path, SkRegion::kDifference_Op);
|
|
|
|
bool nonEmpty = canvas->getClipDeviceBounds(&clipBounds);
|
|
|
|
REPORTER_ASSERT(reporter, true == nonEmpty);
|
|
|
|
REPORTER_ASSERT(reporter, 0 == clipBounds.fLeft);
|
|
|
|
REPORTER_ASSERT(reporter, 0 == clipBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, 10 == clipBounds.fBottom);
|
|
|
|
REPORTER_ASSERT(reporter, 10 == clipBounds.fRight);
|
|
|
|
}
|
|
|
|
{
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(10, 10);
|
2013-05-08 15:39:13 +00:00
|
|
|
canvas->clipPath(path, SkRegion::kReverseDifference_Op);
|
|
|
|
bool nonEmpty = canvas->getClipDeviceBounds(&clipBounds);
|
|
|
|
// True clip is actually empty in this case, but the best
|
|
|
|
// determination we can make using only bounds as input is that the
|
|
|
|
// clip is included in the bounds of 'path'.
|
|
|
|
REPORTER_ASSERT(reporter, true == nonEmpty);
|
|
|
|
REPORTER_ASSERT(reporter, 7 == clipBounds.fLeft);
|
|
|
|
REPORTER_ASSERT(reporter, 7 == clipBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, 8 == clipBounds.fBottom);
|
|
|
|
REPORTER_ASSERT(reporter, 8 == clipBounds.fRight);
|
|
|
|
}
|
|
|
|
{
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(10, 10);
|
2013-05-08 15:39:13 +00:00
|
|
|
canvas->clipPath(path, SkRegion::kIntersect_Op);
|
|
|
|
canvas->clipPath(path2, SkRegion::kXOR_Op);
|
|
|
|
bool nonEmpty = canvas->getClipDeviceBounds(&clipBounds);
|
|
|
|
REPORTER_ASSERT(reporter, true == nonEmpty);
|
|
|
|
REPORTER_ASSERT(reporter, 6 == clipBounds.fLeft);
|
|
|
|
REPORTER_ASSERT(reporter, 6 == clipBounds.fTop);
|
|
|
|
REPORTER_ASSERT(reporter, 8 == clipBounds.fBottom);
|
|
|
|
REPORTER_ASSERT(reporter, 8 == clipBounds.fRight);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-27 15:50:19 +00:00
|
|
|
/**
|
|
|
|
* A canvas that records the number of clip commands.
|
|
|
|
*/
|
|
|
|
class ClipCountingCanvas : public SkCanvas {
|
|
|
|
public:
|
2014-05-27 23:41:45 +00:00
|
|
|
ClipCountingCanvas(int width, int height)
|
2014-01-31 19:42:58 +00:00
|
|
|
: INHERITED(width, height)
|
2013-08-27 15:50:19 +00:00
|
|
|
, fClipCount(0){
|
|
|
|
}
|
|
|
|
|
2014-03-01 03:02:09 +00:00
|
|
|
virtual void onClipRect(const SkRect& r,
|
|
|
|
SkRegion::Op op,
|
2014-02-28 18:19:39 +00:00
|
|
|
ClipEdgeStyle edgeStyle) SK_OVERRIDE {
|
2013-08-27 15:50:19 +00:00
|
|
|
fClipCount += 1;
|
2014-02-28 18:19:39 +00:00
|
|
|
this->INHERITED::onClipRect(r, op, edgeStyle);
|
2013-08-27 15:50:19 +00:00
|
|
|
}
|
|
|
|
|
2014-03-01 03:02:09 +00:00
|
|
|
virtual void onClipRRect(const SkRRect& rrect,
|
|
|
|
SkRegion::Op op,
|
2014-02-28 18:19:39 +00:00
|
|
|
ClipEdgeStyle edgeStyle)SK_OVERRIDE {
|
2013-08-27 15:50:19 +00:00
|
|
|
fClipCount += 1;
|
2014-02-28 18:19:39 +00:00
|
|
|
this->INHERITED::onClipRRect(rrect, op, edgeStyle);
|
2013-08-27 15:50:19 +00:00
|
|
|
}
|
|
|
|
|
2014-03-01 03:02:09 +00:00
|
|
|
virtual void onClipPath(const SkPath& path,
|
|
|
|
SkRegion::Op op,
|
2014-02-28 18:19:39 +00:00
|
|
|
ClipEdgeStyle edgeStyle) SK_OVERRIDE {
|
2013-08-27 15:50:19 +00:00
|
|
|
fClipCount += 1;
|
2014-02-28 18:19:39 +00:00
|
|
|
this->INHERITED::onClipPath(path, op, edgeStyle);
|
|
|
|
}
|
|
|
|
|
2015-01-09 18:06:39 +00:00
|
|
|
void onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) SK_OVERRIDE {
|
2014-02-28 18:19:39 +00:00
|
|
|
fClipCount += 1;
|
|
|
|
this->INHERITED::onClipRegion(deviceRgn, op);
|
2013-08-27 15:50:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
unsigned getClipCount() const { return fClipCount; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
unsigned fClipCount;
|
|
|
|
|
|
|
|
typedef SkCanvas INHERITED;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void test_clip_expansion(skiatest::Reporter* reporter) {
|
2014-04-13 19:09:42 +00:00
|
|
|
SkPictureRecorder recorder;
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(10, 10);
|
2013-08-27 15:50:19 +00:00
|
|
|
|
|
|
|
canvas->clipRect(SkRect::MakeEmpty(), SkRegion::kReplace_Op);
|
|
|
|
// The following expanding clip should not be skipped.
|
|
|
|
canvas->clipRect(SkRect::MakeXYWH(4, 4, 3, 3), SkRegion::kUnion_Op);
|
|
|
|
// Draw something so the optimizer doesn't just fold the world.
|
|
|
|
SkPaint p;
|
|
|
|
p.setColor(SK_ColorBLUE);
|
|
|
|
canvas->drawPaint(p);
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
|
2013-08-27 15:50:19 +00:00
|
|
|
|
2014-01-31 19:42:58 +00:00
|
|
|
ClipCountingCanvas testCanvas(10, 10);
|
2014-09-04 15:42:50 +00:00
|
|
|
picture->playback(&testCanvas);
|
2013-08-27 15:50:19 +00:00
|
|
|
|
|
|
|
// Both clips should be present on playback.
|
|
|
|
REPORTER_ASSERT(reporter, testCanvas.getClipCount() == 2);
|
|
|
|
}
|
|
|
|
|
2013-10-24 11:12:47 +00:00
|
|
|
static void test_hierarchical(skiatest::Reporter* reporter) {
|
|
|
|
SkBitmap bm;
|
|
|
|
make_bm(&bm, 10, 10, SK_ColorRED, true);
|
|
|
|
|
2014-04-13 19:09:42 +00:00
|
|
|
SkPictureRecorder recorder;
|
|
|
|
|
2014-06-09 13:25:34 +00:00
|
|
|
recorder.beginRecording(10, 10);
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> childPlain(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, !childPlain->willPlayBackBitmaps()); // 0
|
|
|
|
|
2014-06-09 13:25:34 +00:00
|
|
|
recorder.beginRecording(10, 10)->drawBitmap(bm, 0, 0);
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> childWithBitmap(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, childWithBitmap->willPlayBackBitmaps()); // 1
|
|
|
|
|
|
|
|
{
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(10, 10);
|
2014-06-04 12:40:44 +00:00
|
|
|
canvas->drawPicture(childPlain);
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> parentPP(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, !parentPP->willPlayBackBitmaps()); // 0
|
|
|
|
}
|
|
|
|
{
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(10, 10);
|
2014-06-04 12:40:44 +00:00
|
|
|
canvas->drawPicture(childWithBitmap);
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> parentPWB(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, parentPWB->willPlayBackBitmaps()); // 1
|
|
|
|
}
|
|
|
|
{
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(10, 10);
|
2014-04-13 19:09:42 +00:00
|
|
|
canvas->drawBitmap(bm, 0, 0);
|
2014-06-04 12:40:44 +00:00
|
|
|
canvas->drawPicture(childPlain);
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> parentWBP(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, parentWBP->willPlayBackBitmaps()); // 1
|
|
|
|
}
|
|
|
|
{
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(10, 10);
|
2014-04-13 19:09:42 +00:00
|
|
|
canvas->drawBitmap(bm, 0, 0);
|
2014-06-04 12:40:44 +00:00
|
|
|
canvas->drawPicture(childWithBitmap);
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> parentWBWB(recorder.endRecording());
|
|
|
|
REPORTER_ASSERT(reporter, parentWBWB->willPlayBackBitmaps()); // 2
|
|
|
|
}
|
2013-10-24 11:12:47 +00:00
|
|
|
}
|
|
|
|
|
2014-04-02 23:51:13 +00:00
|
|
|
static void test_gen_id(skiatest::Reporter* reporter) {
|
|
|
|
|
2014-07-13 16:00:50 +00:00
|
|
|
SkPictureRecorder recorder;
|
|
|
|
recorder.beginRecording(0, 0);
|
|
|
|
SkAutoTUnref<SkPicture> empty(recorder.endRecording());
|
2014-04-02 23:51:13 +00:00
|
|
|
|
2014-04-13 19:09:42 +00:00
|
|
|
// Empty pictures should still have a valid ID
|
2014-07-13 16:00:50 +00:00
|
|
|
REPORTER_ASSERT(reporter, empty->uniqueID() != SK_InvalidGenID);
|
2014-04-02 23:51:13 +00:00
|
|
|
|
2014-06-09 13:25:34 +00:00
|
|
|
SkCanvas* canvas = recorder.beginRecording(1, 1);
|
2014-04-13 19:09:42 +00:00
|
|
|
canvas->drawARGB(255, 255, 255, 255);
|
|
|
|
SkAutoTUnref<SkPicture> hasData(recorder.endRecording());
|
|
|
|
// picture should have a non-zero id after recording
|
|
|
|
REPORTER_ASSERT(reporter, hasData->uniqueID() != SK_InvalidGenID);
|
2014-04-02 23:51:13 +00:00
|
|
|
|
2014-04-13 19:09:42 +00:00
|
|
|
// both pictures should have different ids
|
2014-07-13 16:00:50 +00:00
|
|
|
REPORTER_ASSERT(reporter, hasData->uniqueID() != empty->uniqueID());
|
2014-04-02 23:51:13 +00:00
|
|
|
}
|
|
|
|
|
2014-11-19 18:41:14 +00:00
|
|
|
static void test_bytes_used(skiatest::Reporter* reporter) {
|
|
|
|
SkPictureRecorder recorder;
|
|
|
|
|
|
|
|
recorder.beginRecording(0, 0);
|
|
|
|
SkAutoTUnref<SkPicture> empty(recorder.endRecording());
|
|
|
|
|
|
|
|
// Sanity check to make sure we aren't under-measuring.
|
|
|
|
REPORTER_ASSERT(reporter, SkPictureUtils::ApproximateBytesUsed(empty.get()) >=
|
|
|
|
sizeof(SkPicture) + sizeof(SkRecord));
|
|
|
|
|
|
|
|
// Protect against any unintentional bloat.
|
2014-11-24 22:41:51 +00:00
|
|
|
size_t approxUsed = SkPictureUtils::ApproximateBytesUsed(empty.get());
|
|
|
|
REPORTER_ASSERT(reporter, approxUsed <= 136);
|
2014-11-19 18:41:14 +00:00
|
|
|
|
|
|
|
// Sanity check of nested SkPictures.
|
|
|
|
SkPictureRecorder r2;
|
|
|
|
r2.beginRecording(0, 0);
|
|
|
|
r2.getRecordingCanvas()->drawPicture(empty.get());
|
|
|
|
SkAutoTUnref<SkPicture> nested(r2.endRecording());
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, SkPictureUtils::ApproximateBytesUsed(nested.get()) >
|
|
|
|
SkPictureUtils::ApproximateBytesUsed(empty.get()));
|
|
|
|
}
|
|
|
|
|
2013-12-12 21:11:12 +00:00
|
|
|
DEF_TEST(Picture, reporter) {
|
2012-09-14 17:26:37 +00:00
|
|
|
#ifdef SK_DEBUG
|
2014-07-01 15:47:04 +00:00
|
|
|
test_deleting_empty_picture();
|
2012-09-14 17:26:37 +00:00
|
|
|
test_serializing_empty_picture();
|
2012-12-04 15:08:56 +00:00
|
|
|
#else
|
|
|
|
test_bad_bitmap();
|
2012-09-14 17:26:37 +00:00
|
|
|
#endif
|
2014-02-13 16:00:51 +00:00
|
|
|
test_unbalanced_save_restores(reporter);
|
2013-02-27 19:17:41 +00:00
|
|
|
test_peephole();
|
2014-04-25 00:02:12 +00:00
|
|
|
#if SK_SUPPORT_GPU
|
2014-10-01 16:29:35 +00:00
|
|
|
test_gpu_veto(reporter);
|
2014-04-25 00:02:12 +00:00
|
|
|
#endif
|
2014-10-01 16:29:35 +00:00
|
|
|
test_has_text(reporter);
|
|
|
|
test_analysis(reporter);
|
2012-12-10 15:40:55 +00:00
|
|
|
test_bitmap_with_encoded_data(reporter);
|
2013-05-08 15:39:13 +00:00
|
|
|
test_clip_bound_opt(reporter);
|
2013-08-27 15:50:19 +00:00
|
|
|
test_clip_expansion(reporter);
|
2013-10-24 11:12:47 +00:00
|
|
|
test_hierarchical(reporter);
|
2014-04-02 23:51:13 +00:00
|
|
|
test_gen_id(reporter);
|
2014-11-12 17:32:34 +00:00
|
|
|
test_savelayer_extraction(reporter);
|
2014-11-19 18:41:14 +00:00
|
|
|
test_bytes_used(reporter);
|
2012-09-14 17:26:37 +00:00
|
|
|
}
|
2014-02-10 18:29:10 +00:00
|
|
|
|
|
|
|
static void draw_bitmaps(const SkBitmap bitmap, SkCanvas* canvas) {
|
|
|
|
const SkPaint paint;
|
|
|
|
const SkRect rect = { 5.0f, 5.0f, 8.0f, 8.0f };
|
|
|
|
const SkIRect irect = { 2, 2, 3, 3 };
|
|
|
|
|
|
|
|
// Don't care what these record, as long as they're legal.
|
|
|
|
canvas->drawBitmap(bitmap, 0.0f, 0.0f, &paint);
|
|
|
|
canvas->drawBitmapRectToRect(bitmap, &rect, rect, &paint, SkCanvas::kNone_DrawBitmapRectFlag);
|
|
|
|
canvas->drawBitmapNine(bitmap, irect, rect, &paint);
|
|
|
|
canvas->drawSprite(bitmap, 1, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_draw_bitmaps(SkCanvas* canvas) {
|
|
|
|
SkBitmap empty;
|
|
|
|
draw_bitmaps(empty, canvas);
|
2014-05-30 13:26:10 +00:00
|
|
|
empty.setInfo(SkImageInfo::MakeN32Premul(10, 10));
|
2014-02-10 18:29:10 +00:00
|
|
|
draw_bitmaps(empty, canvas);
|
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(Picture_EmptyBitmap, r) {
|
2014-04-13 19:09:42 +00:00
|
|
|
SkPictureRecorder recorder;
|
2014-06-09 13:25:34 +00:00
|
|
|
test_draw_bitmaps(recorder.beginRecording(10, 10));
|
2014-04-13 19:09:42 +00:00
|
|
|
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
|
2014-02-10 18:29:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(Canvas_EmptyBitmap, r) {
|
|
|
|
SkBitmap dst;
|
2014-02-13 14:41:43 +00:00
|
|
|
dst.allocN32Pixels(10, 10);
|
2014-02-10 18:29:10 +00:00
|
|
|
SkCanvas canvas(dst);
|
|
|
|
|
|
|
|
test_draw_bitmaps(&canvas);
|
|
|
|
}
|
Fix end-of-pattern matching for Skia recording optimization.
The recorder optimizer's pattern matcher was accepting command sequences
when it shouldn't have.
In the submitted case, and the pattern matcher was looking for:
saveLayer, drawBitmap, restore
and in the rendering for the submitted case, the sequence of commands
were:
saveLayer, drawBitmap, drawBitmap, restore
This sequence was improperly accepted by the matcher, and the optimizer
reduced the sequence to:
drawBitmap, drawBitmap
where the opacity from the saveLayer paint argument was applied
to the first drawBitmap only.
The user-visible effect in Chrome was a flashing effect on an image
caused by incorrect (too-high) opacity.
The patch adds a Skia test to check for pixel colour values in
a similarly structured recording. All other Skia tests pass.
Blink layout tests also pass with this change.
BUG=chromium:344987
R=robertphillips@google.com, reed@google.com, mtklein@google.com
Author: dneto@chromium.org
Review URL: https://codereview.chromium.org/430503004
2014-07-30 22:42:22 +00:00
|
|
|
|
|
|
|
DEF_TEST(DontOptimizeSaveLayerDrawDrawRestore, reporter) {
|
|
|
|
// This test is from crbug.com/344987.
|
|
|
|
// The commands are:
|
|
|
|
// saveLayer with paint that modifies alpha
|
|
|
|
// drawBitmapRectToRect
|
|
|
|
// drawBitmapRectToRect
|
|
|
|
// restore
|
|
|
|
// The bug was that this structure was modified so that:
|
|
|
|
// - The saveLayer and restore were eliminated
|
|
|
|
// - The alpha was only applied to the first drawBitmapRectToRect
|
|
|
|
|
|
|
|
// This test draws blue and red squares inside a 50% transparent
|
|
|
|
// layer. Both colours should show up muted.
|
|
|
|
// When the bug is present, the red square (the second bitmap)
|
|
|
|
// shows upwith full opacity.
|
|
|
|
|
|
|
|
SkBitmap blueBM;
|
|
|
|
make_bm(&blueBM, 100, 100, SkColorSetARGB(255, 0, 0, 255), true);
|
|
|
|
SkBitmap redBM;
|
|
|
|
make_bm(&redBM, 100, 100, SkColorSetARGB(255, 255, 0, 0), true);
|
|
|
|
SkPaint semiTransparent;
|
|
|
|
semiTransparent.setAlpha(0x80);
|
|
|
|
|
|
|
|
SkPictureRecorder recorder;
|
|
|
|
SkCanvas* canvas = recorder.beginRecording(100, 100);
|
|
|
|
canvas->drawARGB(0, 0, 0, 0);
|
|
|
|
|
|
|
|
canvas->saveLayer(0, &semiTransparent);
|
|
|
|
canvas->drawBitmap(blueBM, 25, 25);
|
|
|
|
canvas->drawBitmap(redBM, 50, 50);
|
|
|
|
canvas->restore();
|
|
|
|
|
|
|
|
SkAutoTUnref<SkPicture> picture(recorder.endRecording());
|
|
|
|
|
|
|
|
// Now replay the picture back on another canvas
|
|
|
|
// and check a couple of its pixels.
|
|
|
|
SkBitmap replayBM;
|
|
|
|
make_bm(&replayBM, 100, 100, SK_ColorBLACK, false);
|
|
|
|
SkCanvas replayCanvas(replayBM);
|
2014-09-04 15:42:50 +00:00
|
|
|
picture->playback(&replayCanvas);
|
Fix end-of-pattern matching for Skia recording optimization.
The recorder optimizer's pattern matcher was accepting command sequences
when it shouldn't have.
In the submitted case, and the pattern matcher was looking for:
saveLayer, drawBitmap, restore
and in the rendering for the submitted case, the sequence of commands
were:
saveLayer, drawBitmap, drawBitmap, restore
This sequence was improperly accepted by the matcher, and the optimizer
reduced the sequence to:
drawBitmap, drawBitmap
where the opacity from the saveLayer paint argument was applied
to the first drawBitmap only.
The user-visible effect in Chrome was a flashing effect on an image
caused by incorrect (too-high) opacity.
The patch adds a Skia test to check for pixel colour values in
a similarly structured recording. All other Skia tests pass.
Blink layout tests also pass with this change.
BUG=chromium:344987
R=robertphillips@google.com, reed@google.com, mtklein@google.com
Author: dneto@chromium.org
Review URL: https://codereview.chromium.org/430503004
2014-07-30 22:42:22 +00:00
|
|
|
replayCanvas.flush();
|
|
|
|
|
|
|
|
// With the bug present, at (55, 55) we would get a fully opaque red
|
|
|
|
// intead of a dark red.
|
|
|
|
REPORTER_ASSERT(reporter, replayBM.getColor(30, 30) == 0xff000080);
|
|
|
|
REPORTER_ASSERT(reporter, replayBM.getColor(55, 55) == 0xff800000);
|
|
|
|
}
|
2014-08-18 20:39:11 +00:00
|
|
|
|
|
|
|
struct CountingBBH : public SkBBoxHierarchy {
|
|
|
|
mutable int searchCalls;
|
2015-03-07 00:20:28 +00:00
|
|
|
SkRect rootBound;
|
2014-08-18 20:39:11 +00:00
|
|
|
|
2015-03-07 00:20:28 +00:00
|
|
|
CountingBBH(const SkRect& bound) : searchCalls(0), rootBound(bound) {}
|
2014-08-18 20:39:11 +00:00
|
|
|
|
2015-01-09 18:06:39 +00:00
|
|
|
void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE {
|
2014-08-18 20:39:11 +00:00
|
|
|
this->searchCalls++;
|
|
|
|
}
|
|
|
|
|
2015-02-10 21:44:27 +00:00
|
|
|
void insert(const SkRect[], int) SK_OVERRIDE {}
|
2015-02-02 20:08:18 +00:00
|
|
|
virtual size_t bytesUsed() const SK_OVERRIDE { return 0; }
|
2015-03-07 00:20:28 +00:00
|
|
|
SkRect getRootBound() const SK_OVERRIDE { return rootBound; }
|
2014-08-18 20:39:11 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
class SpoonFedBBHFactory : public SkBBHFactory {
|
|
|
|
public:
|
|
|
|
explicit SpoonFedBBHFactory(SkBBoxHierarchy* bbh) : fBBH(bbh) {}
|
2014-11-19 16:04:34 +00:00
|
|
|
SkBBoxHierarchy* operator()(const SkRect&) const SK_OVERRIDE {
|
2014-08-18 20:39:11 +00:00
|
|
|
return SkRef(fBBH);
|
|
|
|
}
|
|
|
|
private:
|
|
|
|
SkBBoxHierarchy* fBBH;
|
|
|
|
};
|
|
|
|
|
|
|
|
// When the canvas clip covers the full picture, we don't need to call the BBH.
|
|
|
|
DEF_TEST(Picture_SkipBBH, r) {
|
2015-03-07 00:20:28 +00:00
|
|
|
SkRect bound = SkRect::MakeWH(320, 240);
|
|
|
|
CountingBBH bbh(bound);
|
2014-08-18 20:39:11 +00:00
|
|
|
SpoonFedBBHFactory factory(&bbh);
|
|
|
|
|
|
|
|
SkPictureRecorder recorder;
|
2015-03-07 00:20:28 +00:00
|
|
|
recorder.beginRecording(bound, &factory);
|
2014-08-18 20:39:11 +00:00
|
|
|
SkAutoTUnref<const SkPicture> picture(recorder.endRecording());
|
|
|
|
|
|
|
|
SkCanvas big(640, 480), small(300, 200);
|
|
|
|
|
2014-09-04 15:42:50 +00:00
|
|
|
picture->playback(&big);
|
2014-08-18 20:39:11 +00:00
|
|
|
REPORTER_ASSERT(r, bbh.searchCalls == 0);
|
|
|
|
|
2014-09-04 15:42:50 +00:00
|
|
|
picture->playback(&small);
|
2014-08-18 20:39:11 +00:00
|
|
|
REPORTER_ASSERT(r, bbh.searchCalls == 1);
|
|
|
|
}
|
2014-08-27 19:12:23 +00:00
|
|
|
|
|
|
|
DEF_TEST(Picture_BitmapLeak, r) {
|
|
|
|
SkBitmap mut, immut;
|
|
|
|
mut.allocN32Pixels(300, 200);
|
|
|
|
immut.allocN32Pixels(300, 200);
|
|
|
|
immut.setImmutable();
|
|
|
|
SkASSERT(!mut.isImmutable());
|
|
|
|
SkASSERT(immut.isImmutable());
|
|
|
|
|
|
|
|
// No one can hold a ref on our pixels yet.
|
|
|
|
REPORTER_ASSERT(r, mut.pixelRef()->unique());
|
|
|
|
REPORTER_ASSERT(r, immut.pixelRef()->unique());
|
|
|
|
|
2014-11-24 22:41:51 +00:00
|
|
|
SkAutoTUnref<const SkPicture> pic;
|
|
|
|
{
|
|
|
|
// we want the recorder to go out of scope before our subsequent checks, so we
|
|
|
|
// place it inside local braces.
|
|
|
|
SkPictureRecorder rec;
|
|
|
|
SkCanvas* canvas = rec.beginRecording(1920, 1200);
|
|
|
|
canvas->drawBitmap(mut, 0, 0);
|
|
|
|
canvas->drawBitmap(immut, 800, 600);
|
|
|
|
pic.reset(rec.endRecording());
|
|
|
|
}
|
2014-08-27 19:12:23 +00:00
|
|
|
|
|
|
|
// The picture shares the immutable pixels but copies the mutable ones.
|
|
|
|
REPORTER_ASSERT(r, mut.pixelRef()->unique());
|
|
|
|
REPORTER_ASSERT(r, !immut.pixelRef()->unique());
|
|
|
|
|
|
|
|
// When the picture goes away, it's just our bitmaps holding the refs.
|
|
|
|
pic.reset(NULL);
|
|
|
|
REPORTER_ASSERT(r, mut.pixelRef()->unique());
|
|
|
|
REPORTER_ASSERT(r, immut.pixelRef()->unique());
|
|
|
|
}
|