| Index: tests/SerializationTest.cpp
|
| diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
|
| index f8d6ea4297da670f9116c14fc4a20c6d51af2107..f6b1275f00c92fc3a028a147511e6d2e37a4084b 100644
|
| --- a/tests/SerializationTest.cpp
|
| +++ b/tests/SerializationTest.cpp
|
| @@ -293,7 +293,7 @@ static void TestColorFilterSerialization(skiatest::Reporter* reporter) {
|
|
|
| static SkBitmap draw_picture(SkPicture& picture) {
|
| SkBitmap bitmap;
|
| - bitmap.allocN32Pixels(SkScalarCeilToInt(picture.cullRect().width()),
|
| + bitmap.allocN32Pixels(SkScalarCeilToInt(picture.cullRect().width()),
|
| SkScalarCeilToInt(picture.cullRect().height()));
|
| SkCanvas canvas(bitmap);
|
| picture.playback(&canvas);
|
| @@ -333,8 +333,8 @@ static void serialize_and_compare_typeface(SkTypeface* typeface, const char* tex
|
| // Paint some text.
|
| SkPictureRecorder recorder;
|
| SkIRect canvasRect = SkIRect::MakeWH(kBitmapSize, kBitmapSize);
|
| - SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(canvasRect.width()),
|
| - SkIntToScalar(canvasRect.height()),
|
| + SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(canvasRect.width()),
|
| + SkIntToScalar(canvasRect.height()),
|
| nullptr, 0);
|
| canvas->drawColor(SK_ColorWHITE);
|
| canvas->drawText(text, 2, 24, 32, paint);
|
| @@ -599,17 +599,17 @@ protected:
|
| DEF_TEST(Annotations, reporter) {
|
| SkPictureRecorder recorder;
|
| SkCanvas* recordingCanvas = recorder.beginRecording(SkRect::MakeWH(100, 100));
|
| -
|
| +
|
| const char* str0 = "rect-with-url";
|
| const SkRect r0 = SkRect::MakeWH(10, 10);
|
| SkAutoTUnref<SkData> d0(SkData::NewWithCString(str0));
|
| SkAnnotateRectWithURL(recordingCanvas, r0, d0);
|
| -
|
| +
|
| const char* str1 = "named-destination";
|
| const SkRect r1 = SkRect::MakeXYWH(5, 5, 0, 0); // collapsed to a point
|
| SkAutoTUnref<SkData> d1(SkData::NewWithCString(str1));
|
| SkAnnotateNamedDestination(recordingCanvas, {r1.x(), r1.y()}, d1);
|
| -
|
| +
|
| const char* str2 = "link-to-destination";
|
| const SkRect r2 = SkRect::MakeXYWH(20, 20, 5, 6);
|
| SkAutoTUnref<SkData> d2(SkData::NewWithCString(str2));
|
| @@ -627,4 +627,3 @@ DEF_TEST(Annotations, reporter) {
|
| TestAnnotationCanvas canvas(reporter, recs, SK_ARRAY_COUNT(recs));
|
| canvas.drawPicture(pict1);
|
| }
|
| -
|
|
|