2014-04-11 18:33:31 +00:00
|
|
|
/*
|
|
|
|
* Copyright 2014 Google Inc.
|
|
|
|
*
|
|
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
|
|
* found in the LICENSE file.
|
|
|
|
*/
|
|
|
|
|
2019-04-23 17:05:21 +00:00
|
|
|
#include "tests/RecordTestUtils.h"
|
|
|
|
#include "tests/Test.h"
|
|
|
|
|
|
|
|
#include "include/core/SkSurface.h"
|
2019-08-05 14:41:10 +00:00
|
|
|
#include "include/effects/SkImageFilters.h"
|
2019-04-23 17:05:21 +00:00
|
|
|
#include "src/core/SkImagePriv.h"
|
|
|
|
#include "src/core/SkRecord.h"
|
|
|
|
#include "src/core/SkRecordDraw.h"
|
|
|
|
#include "src/core/SkRecordOpts.h"
|
|
|
|
#include "src/core/SkRecorder.h"
|
|
|
|
#include "src/core/SkRecords.h"
|
|
|
|
#include "tools/debugger/DebugCanvas.h"
|
2014-04-09 23:30:28 +00:00
|
|
|
|
|
|
|
static const int W = 1920, H = 1080;
|
|
|
|
|
2015-01-07 15:28:41 +00:00
|
|
|
class JustOneDraw : public SkPicture::AbortCallback {
|
2014-06-24 15:29:06 +00:00
|
|
|
public:
|
|
|
|
JustOneDraw() : fCalls(0) {}
|
|
|
|
|
2015-03-26 01:17:31 +00:00
|
|
|
bool abort() override { return fCalls++ > 0; }
|
2014-06-24 15:29:06 +00:00
|
|
|
private:
|
|
|
|
int fCalls;
|
|
|
|
};
|
|
|
|
|
2014-12-11 15:07:37 +00:00
|
|
|
DEF_TEST(RecordDraw_LazySaves, r) {
|
|
|
|
// Record two commands.
|
|
|
|
SkRecord record;
|
|
|
|
SkRecorder recorder(&record, W, H);
|
|
|
|
|
|
|
|
REPORTER_ASSERT(r, 0 == record.count());
|
|
|
|
recorder.save();
|
|
|
|
REPORTER_ASSERT(r, 0 == record.count()); // the save was not recorded (yet)
|
|
|
|
recorder.drawColor(SK_ColorRED);
|
|
|
|
REPORTER_ASSERT(r, 1 == record.count());
|
|
|
|
recorder.scale(2, 2);
|
|
|
|
REPORTER_ASSERT(r, 3 == record.count()); // now we see the save
|
|
|
|
recorder.restore();
|
|
|
|
REPORTER_ASSERT(r, 4 == record.count());
|
|
|
|
|
|
|
|
assert_type<SkRecords::DrawPaint>(r, record, 0);
|
|
|
|
assert_type<SkRecords::Save> (r, record, 1);
|
2020-01-13 14:40:56 +00:00
|
|
|
assert_type<SkRecords::Scale> (r, record, 2);
|
2014-12-11 15:07:37 +00:00
|
|
|
assert_type<SkRecords::Restore> (r, record, 3);
|
|
|
|
|
|
|
|
recorder.save();
|
|
|
|
recorder.save();
|
|
|
|
recorder.restore();
|
|
|
|
recorder.restore();
|
|
|
|
REPORTER_ASSERT(r, 4 == record.count());
|
|
|
|
}
|
|
|
|
|
2014-06-24 15:29:06 +00:00
|
|
|
DEF_TEST(RecordDraw_Abort, r) {
|
|
|
|
// Record two commands.
|
|
|
|
SkRecord record;
|
|
|
|
SkRecorder recorder(&record, W, H);
|
|
|
|
recorder.drawRect(SkRect::MakeWH(200, 300), SkPaint());
|
|
|
|
recorder.clipRect(SkRect::MakeWH(100, 200));
|
|
|
|
|
|
|
|
SkRecord rerecord;
|
|
|
|
SkRecorder canvas(&rerecord, W, H);
|
|
|
|
|
|
|
|
JustOneDraw callback;
|
2015-08-27 14:41:13 +00:00
|
|
|
SkRecordDraw(record, &canvas, nullptr, nullptr, 0, nullptr/*bbh*/, &callback);
|
2014-06-24 15:29:06 +00:00
|
|
|
|
2014-12-11 15:07:37 +00:00
|
|
|
REPORTER_ASSERT(r, 1 == count_instances_of_type<SkRecords::DrawRect>(rerecord));
|
|
|
|
REPORTER_ASSERT(r, 0 == count_instances_of_type<SkRecords::ClipRect>(rerecord));
|
2014-06-24 15:29:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
DEF_TEST(RecordDraw_Unbalanced, r) {
|
|
|
|
SkRecord record;
|
|
|
|
SkRecorder recorder(&record, W, H);
|
|
|
|
recorder.save(); // We won't balance this, but SkRecordDraw will for us.
|
2014-12-11 15:07:37 +00:00
|
|
|
recorder.scale(2, 2);
|
2014-06-24 15:29:06 +00:00
|
|
|
|
|
|
|
SkRecord rerecord;
|
|
|
|
SkRecorder canvas(&rerecord, W, H);
|
2015-08-27 14:41:13 +00:00
|
|
|
SkRecordDraw(record, &canvas, nullptr, nullptr, 0, nullptr/*bbh*/, nullptr/*callback*/);
|
2014-06-24 15:29:06 +00:00
|
|
|
|
2014-12-11 15:07:37 +00:00
|
|
|
int save_count = count_instances_of_type<SkRecords::Save>(rerecord);
|
|
|
|
int restore_count = count_instances_of_type<SkRecords::Save>(rerecord);
|
|
|
|
REPORTER_ASSERT(r, save_count == restore_count);
|
2014-06-24 15:29:06 +00:00
|
|
|
}
|
|
|
|
|
2014-05-19 15:15:24 +00:00
|
|
|
DEF_TEST(RecordDraw_SetMatrixClobber, r) {
|
|
|
|
// Set up an SkRecord that just scales by 2x,3x.
|
|
|
|
SkRecord scaleRecord;
|
2014-05-29 16:52:40 +00:00
|
|
|
SkRecorder scaleCanvas(&scaleRecord, W, H);
|
2014-05-19 15:15:24 +00:00
|
|
|
SkMatrix scale;
|
|
|
|
scale.setScale(2, 3);
|
|
|
|
scaleCanvas.setMatrix(scale);
|
|
|
|
|
|
|
|
// Set up an SkRecord with an initial +20, +20 translate.
|
|
|
|
SkRecord translateRecord;
|
2014-05-29 16:52:40 +00:00
|
|
|
SkRecorder translateCanvas(&translateRecord, W, H);
|
2014-05-19 15:15:24 +00:00
|
|
|
SkMatrix translate;
|
|
|
|
translate.setTranslate(20, 20);
|
|
|
|
translateCanvas.setMatrix(translate);
|
|
|
|
|
2015-08-27 14:41:13 +00:00
|
|
|
SkRecordDraw(scaleRecord, &translateCanvas, nullptr, nullptr, 0, nullptr/*bbh*/, nullptr/*callback*/);
|
2014-06-24 15:29:06 +00:00
|
|
|
REPORTER_ASSERT(r, 4 == translateRecord.count());
|
2020-11-25 18:37:30 +00:00
|
|
|
assert_type<SkRecords::SetM44>(r, translateRecord, 0);
|
|
|
|
assert_type<SkRecords::Save> (r, translateRecord, 1);
|
|
|
|
assert_type<SkRecords::SetM44>(r, translateRecord, 2);
|
2014-06-24 15:29:06 +00:00
|
|
|
assert_type<SkRecords::Restore> (r, translateRecord, 3);
|
2014-05-19 15:15:24 +00:00
|
|
|
|
|
|
|
// When we look at translateRecord now, it should have its first +20,+20 translate,
|
|
|
|
// then a 2x,3x scale that's been concatted with that +20,+20 translate.
|
2020-11-25 18:37:30 +00:00
|
|
|
const SkRecords::SetM44* setMatrix;
|
|
|
|
setMatrix = assert_type<SkRecords::SetM44>(r, translateRecord, 0);
|
|
|
|
REPORTER_ASSERT(r, setMatrix->matrix == SkM44(translate));
|
|
|
|
|
|
|
|
setMatrix = assert_type<SkRecords::SetM44>(r, translateRecord, 2);
|
|
|
|
SkMatrix expected = scale;
|
|
|
|
expected.postConcat(translate);
|
|
|
|
REPORTER_ASSERT(r, setMatrix->matrix == SkM44(expected));
|
2014-05-19 15:15:24 +00:00
|
|
|
}
|
2014-08-15 18:49:49 +00:00
|
|
|
|
2014-09-02 22:19:48 +00:00
|
|
|
// Like a==b, with a little slop recognizing that float equality can be weird.
|
|
|
|
static bool sloppy_rect_eq(SkRect a, SkRect b) {
|
|
|
|
SkRect inset(a), outset(a);
|
|
|
|
inset.inset(1, 1);
|
|
|
|
outset.outset(1, 1);
|
|
|
|
return outset.contains(b) && !inset.contains(b);
|
|
|
|
}
|
|
|
|
|
2018-05-04 17:51:11 +00:00
|
|
|
// TODO This would be nice, but we can't get it right today.
|
|
|
|
#if 0
|
2015-10-24 14:45:47 +00:00
|
|
|
DEF_TEST(RecordDraw_BasicBounds, r) {
|
2014-08-15 18:49:49 +00:00
|
|
|
SkRecord record;
|
|
|
|
SkRecorder recorder(&record, W, H);
|
|
|
|
recorder.save();
|
|
|
|
recorder.clipRect(SkRect::MakeWH(400, 500));
|
|
|
|
recorder.scale(2, 2);
|
|
|
|
recorder.drawRect(SkRect::MakeWH(320, 240), SkPaint());
|
|
|
|
recorder.restore();
|
|
|
|
|
2015-10-24 14:45:47 +00:00
|
|
|
SkAutoTMalloc<SkRect> bounds(record.count());
|
|
|
|
SkRecordFillBounds(SkRect::MakeWH(SkIntToScalar(W), SkIntToScalar(H)), record, bounds);
|
2014-08-15 18:49:49 +00:00
|
|
|
|
2015-10-24 14:45:47 +00:00
|
|
|
for (int i = 0; i < record.count(); i++) {
|
|
|
|
REPORTER_ASSERT(r, sloppy_rect_eq(SkRect::MakeWH(400, 480), bounds[i]));
|
2014-08-15 18:49:49 +00:00
|
|
|
}
|
|
|
|
}
|
2018-05-04 17:51:11 +00:00
|
|
|
#endif
|
2014-09-02 19:03:31 +00:00
|
|
|
|
|
|
|
// Base test to ensure start/stop range is respected
|
|
|
|
DEF_TEST(RecordDraw_PartialStartStop, r) {
|
|
|
|
static const int kWidth = 10, kHeight = 10;
|
|
|
|
|
|
|
|
SkRect r1 = { 0, 0, kWidth, kHeight };
|
|
|
|
SkRect r2 = { 0, 0, kWidth, kHeight/2 };
|
|
|
|
SkRect r3 = { 0, 0, kWidth/2, kHeight };
|
|
|
|
SkPaint p;
|
|
|
|
|
|
|
|
SkRecord record;
|
|
|
|
SkRecorder recorder(&record, kWidth, kHeight);
|
|
|
|
recorder.drawRect(r1, p);
|
|
|
|
recorder.drawRect(r2, p);
|
|
|
|
recorder.drawRect(r3, p);
|
|
|
|
|
|
|
|
SkRecord rerecord;
|
|
|
|
SkRecorder canvas(&rerecord, kWidth, kHeight);
|
2020-12-03 16:21:31 +00:00
|
|
|
SkRecordPartialDraw(record, &canvas, nullptr, 0, 1, 2, SkM44()); // replay just drawRect of r2
|
2014-09-02 19:03:31 +00:00
|
|
|
|
2014-12-11 15:07:37 +00:00
|
|
|
REPORTER_ASSERT(r, 1 == count_instances_of_type<SkRecords::DrawRect>(rerecord));
|
|
|
|
int index = find_first_instances_of_type<SkRecords::DrawRect>(rerecord);
|
|
|
|
const SkRecords::DrawRect* drawRect = assert_type<SkRecords::DrawRect>(r, rerecord, index);
|
2014-09-02 19:03:31 +00:00
|
|
|
REPORTER_ASSERT(r, drawRect->rect == r2);
|
|
|
|
}
|
|
|
|
|
2015-11-07 13:29:00 +00:00
|
|
|
// A regression test for crbug.com/415468 and https://bug.skia.org/2957 .
|
2014-10-01 19:48:58 +00:00
|
|
|
//
|
|
|
|
// This also now serves as a regression test for crbug.com/418417. We used to adjust the
|
|
|
|
// bounds for the saveLayer, clip, and restore to be greater than the bounds of the picture.
|
|
|
|
// (We were applying the saveLayer paint to the bounds after restore, which makes no sense.)
|
2014-09-23 19:28:38 +00:00
|
|
|
DEF_TEST(RecordDraw_SaveLayerAffectsClipBounds, r) {
|
|
|
|
SkRecord record;
|
|
|
|
SkRecorder recorder(&record, 50, 50);
|
|
|
|
|
|
|
|
// We draw a rectangle with a long drop shadow. We used to not update the clip
|
|
|
|
// bounds based on SaveLayer paints, so the drop shadow could be cut off.
|
|
|
|
SkPaint paint;
|
2019-08-05 14:41:10 +00:00
|
|
|
paint.setImageFilter(SkImageFilters::DropShadow(20, 0, 0, 0, SK_ColorBLACK, nullptr));
|
2014-09-23 19:28:38 +00:00
|
|
|
|
2015-08-27 14:41:13 +00:00
|
|
|
recorder.saveLayer(nullptr, &paint);
|
2014-09-23 19:28:38 +00:00
|
|
|
recorder.clipRect(SkRect::MakeWH(20, 40));
|
|
|
|
recorder.drawRect(SkRect::MakeWH(20, 40), SkPaint());
|
|
|
|
recorder.restore();
|
|
|
|
|
2014-10-01 19:48:58 +00:00
|
|
|
// Under the original bug, the right edge value of the drawRect would be 20 less than asserted
|
|
|
|
// here because we intersected it with a clip that had not been adjusted for the drop shadow.
|
|
|
|
//
|
|
|
|
// The second bug showed up as adjusting the picture bounds (0,0,50,50) by the drop shadow too.
|
|
|
|
// The saveLayer, clipRect, and restore bounds were incorrectly (0,0,70,50).
|
2015-10-24 14:45:47 +00:00
|
|
|
SkAutoTMalloc<SkRect> bounds(record.count());
|
2020-02-26 16:30:29 +00:00
|
|
|
SkAutoTMalloc<SkBBoxHierarchy::Metadata> meta(record.count());
|
|
|
|
SkRecordFillBounds(SkRect::MakeWH(50, 50), record, bounds, meta);
|
2015-10-24 14:45:47 +00:00
|
|
|
REPORTER_ASSERT(r, sloppy_rect_eq(bounds[0], SkRect::MakeLTRB(0, 0, 50, 50)));
|
|
|
|
REPORTER_ASSERT(r, sloppy_rect_eq(bounds[1], SkRect::MakeLTRB(0, 0, 50, 50)));
|
|
|
|
REPORTER_ASSERT(r, sloppy_rect_eq(bounds[2], SkRect::MakeLTRB(0, 0, 40, 40)));
|
|
|
|
REPORTER_ASSERT(r, sloppy_rect_eq(bounds[3], SkRect::MakeLTRB(0, 0, 50, 50)));
|
2014-09-23 19:28:38 +00:00
|
|
|
}
|
2014-10-16 18:58:39 +00:00
|
|
|
|
2020-02-26 16:30:29 +00:00
|
|
|
DEF_TEST(RecordDraw_Metadata, r) {
|
|
|
|
SkRecord record;
|
|
|
|
SkRecorder recorder(&record, 50, 50);
|
|
|
|
|
|
|
|
// Just doing some mildly interesting drawing, mostly grabbed from the unit test above.
|
|
|
|
SkPaint paint;
|
|
|
|
paint.setImageFilter(SkImageFilters::DropShadow(20, 0, 0, 0, SK_ColorBLACK, nullptr));
|
|
|
|
|
|
|
|
recorder.saveLayer(nullptr, &paint);
|
|
|
|
recorder.clipRect(SkRect::MakeWH(20, 40));
|
|
|
|
recorder.save();
|
|
|
|
recorder.translate(10, 10);
|
|
|
|
recorder.drawRect(SkRect::MakeWH(20, 40), SkPaint());
|
|
|
|
recorder.restore();
|
|
|
|
recorder.restore();
|
|
|
|
|
|
|
|
SkAutoTMalloc<SkRect> bounds(record.count());
|
|
|
|
SkAutoTMalloc<SkBBoxHierarchy::Metadata> meta(record.count());
|
|
|
|
SkRecordFillBounds(SkRect::MakeWH(50, 50), record, bounds, meta);
|
|
|
|
|
|
|
|
REPORTER_ASSERT(r, !meta[0].isDraw); // saveLayer (not a draw, but its restore will be)
|
|
|
|
REPORTER_ASSERT(r, !meta[1].isDraw); // clip
|
|
|
|
REPORTER_ASSERT(r, !meta[2].isDraw); // save
|
|
|
|
REPORTER_ASSERT(r, !meta[3].isDraw); // translate
|
|
|
|
REPORTER_ASSERT(r, meta[4].isDraw); // drawRect
|
|
|
|
REPORTER_ASSERT(r, !meta[5].isDraw); // restore (paired with save, not a draw)
|
|
|
|
REPORTER_ASSERT(r, meta[6].isDraw); // restore (paired with saveLayer, a draw)
|
|
|
|
}
|
|
|
|
|
2018-05-04 17:51:11 +00:00
|
|
|
// TODO This would be nice, but we can't get it right today.
|
|
|
|
#if 0
|
2014-11-03 16:19:44 +00:00
|
|
|
// When a saveLayer provides an explicit bound and has a complex paint (e.g., one that
|
|
|
|
// affects transparent black), that bound should serve to shrink the area of the required
|
|
|
|
// backing store.
|
|
|
|
DEF_TEST(RecordDraw_SaveLayerBoundsAffectsClipBounds, r) {
|
|
|
|
SkRecord record;
|
|
|
|
SkRecorder recorder(&record, 50, 50);
|
|
|
|
|
|
|
|
SkPaint p;
|
2016-10-06 00:33:02 +00:00
|
|
|
p.setBlendMode(SkBlendMode::kSrc);
|
2014-11-03 16:19:44 +00:00
|
|
|
|
2015-10-24 14:45:47 +00:00
|
|
|
SkRect layerBounds = SkRect::MakeLTRB(10, 10, 40, 40);
|
|
|
|
recorder.saveLayer(&layerBounds, &p);
|
2014-11-03 16:19:44 +00:00
|
|
|
recorder.drawRect(SkRect::MakeLTRB(20, 20, 30, 30), SkPaint());
|
|
|
|
recorder.restore();
|
|
|
|
|
2015-10-24 14:45:47 +00:00
|
|
|
SkAutoTMalloc<SkRect> bounds(record.count());
|
|
|
|
SkRecordFillBounds(SkRect::MakeWH(50, 50), record, bounds);
|
2018-03-06 18:00:52 +00:00
|
|
|
REPORTER_ASSERT(r, sloppy_rect_eq(bounds[0], SkRect::MakeLTRB(10, 10, 40, 40)));
|
|
|
|
REPORTER_ASSERT(r, sloppy_rect_eq(bounds[1], SkRect::MakeLTRB(20, 20, 30, 30)));
|
|
|
|
REPORTER_ASSERT(r, sloppy_rect_eq(bounds[2], SkRect::MakeLTRB(10, 10, 40, 40)));
|
2014-11-03 16:19:44 +00:00
|
|
|
}
|
2018-05-04 17:51:11 +00:00
|
|
|
#endif
|
2014-11-03 16:19:44 +00:00
|
|
|
|
2014-10-16 18:58:39 +00:00
|
|
|
DEF_TEST(RecordDraw_drawImage, r){
|
|
|
|
class SkCanvasMock : public SkCanvas {
|
|
|
|
public:
|
2014-11-12 02:52:02 +00:00
|
|
|
SkCanvasMock(int width, int height) : SkCanvas(width, height) {
|
2014-10-16 18:58:39 +00:00
|
|
|
this->resetTestValues();
|
|
|
|
}
|
|
|
|
|
Reland "Add new virts, hide old ones"
This reverts commit 8f924ac0ce63806886b7297e8be554984a6e7ce5.
Reason for revert: suppressions landed for fuchsia images to rebaseline
Original change's description:
> Revert "Add new virts, hide old ones"
>
> This reverts commit c56e2e5aa65dd129e5927224d2f6c1f82edff74e.
>
> Reason for revert: suspected of breaking chrome roll
>
> Original change's description:
> > Add new virts, hide old ones
> >
> > Add virtuals for the draw methods that now take sampling/filtermode.
> >
> > drawImage
> > drawImageRect
> > drawImageLattice
> > drawAtlas
> >
> > Add a flag that can remove the older virtuals, once each client has
> > stopped overriding them. In that situation, the older public methods
> > will simplify extract the sampling from the paint, and call the new
> > public methods.
> >
> > Bug: skia:11105, skia:7650
> > Change-Id: I8b0029727295caa983e8148fc743a55cfbecd043
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347022
> > Commit-Queue: Mike Reed <reed@google.com>
> > Reviewed-by: Florin Malita <fmalita@chromium.org>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> TBR=bsalomon@google.com,fmalita@chromium.org,reed@google.com
>
> Change-Id: I0a90952c11a180d918126ea06a630f4a0bf9b49b
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:11105
> Bug: skia:7650
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348194
> Reviewed-by: Derek Sollenberger <djsollen@google.com>
> Commit-Queue: Derek Sollenberger <djsollen@google.com>
TBR=djsollen@google.com,bsalomon@google.com,fmalita@chromium.org,reed@google.com
# Not skipping CQ checks because this is a reland.
Bug: skia:11105
Bug: skia:7650
Change-Id: Ia2b4537a2d330460b7554278d2c05075cf27162a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348876
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2020-12-30 14:22:42 +00:00
|
|
|
#ifdef SK_SUPPORT_LEGACY_ONDRAWIMAGERECT
|
2015-01-05 15:49:08 +00:00
|
|
|
void onDrawImage(const SkImage* image, SkScalar left, SkScalar top,
|
2015-03-26 01:17:31 +00:00
|
|
|
const SkPaint* paint) override {
|
2014-10-16 18:58:39 +00:00
|
|
|
fDrawImageCalled = true;
|
|
|
|
}
|
|
|
|
|
2015-01-05 15:49:08 +00:00
|
|
|
void onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
|
2015-07-28 14:35:14 +00:00
|
|
|
const SkPaint* paint, SrcRectConstraint) override {
|
2014-10-16 18:58:39 +00:00
|
|
|
fDrawImageRectCalled = true;
|
|
|
|
}
|
Reland "Add new virts, hide old ones"
This reverts commit 8f924ac0ce63806886b7297e8be554984a6e7ce5.
Reason for revert: suppressions landed for fuchsia images to rebaseline
Original change's description:
> Revert "Add new virts, hide old ones"
>
> This reverts commit c56e2e5aa65dd129e5927224d2f6c1f82edff74e.
>
> Reason for revert: suspected of breaking chrome roll
>
> Original change's description:
> > Add new virts, hide old ones
> >
> > Add virtuals for the draw methods that now take sampling/filtermode.
> >
> > drawImage
> > drawImageRect
> > drawImageLattice
> > drawAtlas
> >
> > Add a flag that can remove the older virtuals, once each client has
> > stopped overriding them. In that situation, the older public methods
> > will simplify extract the sampling from the paint, and call the new
> > public methods.
> >
> > Bug: skia:11105, skia:7650
> > Change-Id: I8b0029727295caa983e8148fc743a55cfbecd043
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347022
> > Commit-Queue: Mike Reed <reed@google.com>
> > Reviewed-by: Florin Malita <fmalita@chromium.org>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> TBR=bsalomon@google.com,fmalita@chromium.org,reed@google.com
>
> Change-Id: I0a90952c11a180d918126ea06a630f4a0bf9b49b
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:11105
> Bug: skia:7650
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348194
> Reviewed-by: Derek Sollenberger <djsollen@google.com>
> Commit-Queue: Derek Sollenberger <djsollen@google.com>
TBR=djsollen@google.com,bsalomon@google.com,fmalita@chromium.org,reed@google.com
# Not skipping CQ checks because this is a reland.
Bug: skia:11105
Bug: skia:7650
Change-Id: Ia2b4537a2d330460b7554278d2c05075cf27162a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348876
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2020-12-30 14:22:42 +00:00
|
|
|
#endif
|
2014-10-16 18:58:39 +00:00
|
|
|
|
|
|
|
void resetTestValues() {
|
|
|
|
fDrawImageCalled = fDrawImageRectCalled = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool fDrawImageCalled;
|
|
|
|
bool fDrawImageRectCalled;
|
|
|
|
};
|
|
|
|
|
2016-03-24 01:59:25 +00:00
|
|
|
auto surface(SkSurface::MakeRasterN32Premul(10, 10));
|
2014-10-16 18:58:39 +00:00
|
|
|
surface->getCanvas()->clear(SK_ColorGREEN);
|
2016-03-17 17:51:11 +00:00
|
|
|
sk_sp<SkImage> image(surface->makeImageSnapshot());
|
2014-10-16 18:58:39 +00:00
|
|
|
|
|
|
|
SkCanvasMock canvas(10, 10);
|
|
|
|
|
Reland "Add new virts, hide old ones"
This reverts commit 8f924ac0ce63806886b7297e8be554984a6e7ce5.
Reason for revert: suppressions landed for fuchsia images to rebaseline
Original change's description:
> Revert "Add new virts, hide old ones"
>
> This reverts commit c56e2e5aa65dd129e5927224d2f6c1f82edff74e.
>
> Reason for revert: suspected of breaking chrome roll
>
> Original change's description:
> > Add new virts, hide old ones
> >
> > Add virtuals for the draw methods that now take sampling/filtermode.
> >
> > drawImage
> > drawImageRect
> > drawImageLattice
> > drawAtlas
> >
> > Add a flag that can remove the older virtuals, once each client has
> > stopped overriding them. In that situation, the older public methods
> > will simplify extract the sampling from the paint, and call the new
> > public methods.
> >
> > Bug: skia:11105, skia:7650
> > Change-Id: I8b0029727295caa983e8148fc743a55cfbecd043
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347022
> > Commit-Queue: Mike Reed <reed@google.com>
> > Reviewed-by: Florin Malita <fmalita@chromium.org>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> TBR=bsalomon@google.com,fmalita@chromium.org,reed@google.com
>
> Change-Id: I0a90952c11a180d918126ea06a630f4a0bf9b49b
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:11105
> Bug: skia:7650
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348194
> Reviewed-by: Derek Sollenberger <djsollen@google.com>
> Commit-Queue: Derek Sollenberger <djsollen@google.com>
TBR=djsollen@google.com,bsalomon@google.com,fmalita@chromium.org,reed@google.com
# Not skipping CQ checks because this is a reland.
Bug: skia:11105
Bug: skia:7650
Change-Id: Ia2b4537a2d330460b7554278d2c05075cf27162a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348876
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2020-12-30 14:22:42 +00:00
|
|
|
#ifdef SK_SUPPORT_LEGACY_ONDRAWIMAGERECT
|
2014-10-16 18:58:39 +00:00
|
|
|
{
|
|
|
|
SkRecord record;
|
|
|
|
SkRecorder recorder(&record, 10, 10);
|
|
|
|
recorder.drawImage(image, 0, 0);
|
2017-08-28 14:34:05 +00:00
|
|
|
SkRecordDraw(record, &canvas, nullptr, nullptr, 0, nullptr, nullptr);
|
2014-10-16 18:58:39 +00:00
|
|
|
}
|
|
|
|
REPORTER_ASSERT(r, canvas.fDrawImageCalled);
|
|
|
|
canvas.resetTestValues();
|
|
|
|
|
|
|
|
{
|
|
|
|
SkRecord record;
|
|
|
|
SkRecorder recorder(&record, 10, 10);
|
2015-08-06 17:02:53 +00:00
|
|
|
recorder.drawImageRect(image, SkRect::MakeWH(10, 10), nullptr);
|
2017-08-28 14:34:05 +00:00
|
|
|
SkRecordDraw(record, &canvas, nullptr, nullptr, 0, nullptr, nullptr);
|
2014-10-16 18:58:39 +00:00
|
|
|
}
|
|
|
|
REPORTER_ASSERT(r, canvas.fDrawImageRectCalled);
|
Reland "Add new virts, hide old ones"
This reverts commit 8f924ac0ce63806886b7297e8be554984a6e7ce5.
Reason for revert: suppressions landed for fuchsia images to rebaseline
Original change's description:
> Revert "Add new virts, hide old ones"
>
> This reverts commit c56e2e5aa65dd129e5927224d2f6c1f82edff74e.
>
> Reason for revert: suspected of breaking chrome roll
>
> Original change's description:
> > Add new virts, hide old ones
> >
> > Add virtuals for the draw methods that now take sampling/filtermode.
> >
> > drawImage
> > drawImageRect
> > drawImageLattice
> > drawAtlas
> >
> > Add a flag that can remove the older virtuals, once each client has
> > stopped overriding them. In that situation, the older public methods
> > will simplify extract the sampling from the paint, and call the new
> > public methods.
> >
> > Bug: skia:11105, skia:7650
> > Change-Id: I8b0029727295caa983e8148fc743a55cfbecd043
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347022
> > Commit-Queue: Mike Reed <reed@google.com>
> > Reviewed-by: Florin Malita <fmalita@chromium.org>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> TBR=bsalomon@google.com,fmalita@chromium.org,reed@google.com
>
> Change-Id: I0a90952c11a180d918126ea06a630f4a0bf9b49b
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:11105
> Bug: skia:7650
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348194
> Reviewed-by: Derek Sollenberger <djsollen@google.com>
> Commit-Queue: Derek Sollenberger <djsollen@google.com>
TBR=djsollen@google.com,bsalomon@google.com,fmalita@chromium.org,reed@google.com
# Not skipping CQ checks because this is a reland.
Bug: skia:11105
Bug: skia:7650
Change-Id: Ia2b4537a2d330460b7554278d2c05075cf27162a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348876
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2020-12-30 14:22:42 +00:00
|
|
|
#endif
|
2014-10-16 18:58:39 +00:00
|
|
|
}
|