Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(278)

Side by Side Diff: tests/SerializationTest.cpp

Issue 1842243002: Update SkImageSource to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: update to ToT Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « tests/ImageFilterTest.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkAnnotationKeys.h" 8 #include "SkAnnotationKeys.h"
9 #include "Resources.h" 9 #include "Resources.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 success = SerializationUtils<T>::Read(buffer2, dataRead, kArraySize); 236 success = SerializationUtils<T>::Read(buffer2, dataRead, kArraySize);
237 // This should have succeeded, since there are enough bytes to read this 237 // This should have succeeded, since there are enough bytes to read this
238 REPORTER_ASSERT(reporter, success); 238 REPORTER_ASSERT(reporter, success);
239 } 239 }
240 240
241 static void TestBitmapSerialization(const SkBitmap& validBitmap, 241 static void TestBitmapSerialization(const SkBitmap& validBitmap,
242 const SkBitmap& invalidBitmap, 242 const SkBitmap& invalidBitmap,
243 bool shouldSucceed, 243 bool shouldSucceed,
244 skiatest::Reporter* reporter) { 244 skiatest::Reporter* reporter) {
245 sk_sp<SkImage> validImage(SkImage::MakeFromBitmap(validBitmap)); 245 sk_sp<SkImage> validImage(SkImage::MakeFromBitmap(validBitmap));
246 SkAutoTUnref<SkImageFilter> validBitmapSource(SkImageSource::Create(validIma ge.get())); 246 sk_sp<SkImageFilter> validBitmapSource(SkImageSource::Make(std::move(validIm age)));
247 sk_sp<SkImage> invalidImage(SkImage::MakeFromBitmap(invalidBitmap)); 247 sk_sp<SkImage> invalidImage(SkImage::MakeFromBitmap(invalidBitmap));
248 SkAutoTUnref<SkImageFilter> invalidBitmapSource(SkImageSource::Create(invali dImage.get())); 248 sk_sp<SkImageFilter> invalidBitmapSource(SkImageSource::Make(std::move(inval idImage)));
249 sk_sp<SkImageFilter> xfermodeImageFilter( 249 sk_sp<SkImageFilter> xfermodeImageFilter(
250 SkXfermodeImageFilter::Make(SkXfermode::Make(SkXfermode::kSrcOver_Mode), 250 SkXfermodeImageFilter::Make(SkXfermode::Make(SkXfermode::kSrcOver_Mode),
251 invalidBitmapSource, validBitmapSource, null ptr)); 251 invalidBitmapSource.get(), validBitmapSource .get(), nullptr));
252 252
253 SkAutoTUnref<SkImageFilter> deserializedFilter( 253 SkAutoTUnref<SkImageFilter> deserializedFilter(
254 TestFlattenableSerialization<SkImageFilter>( 254 TestFlattenableSerialization<SkImageFilter>(
255 xfermodeImageFilter.get(), shouldSucceed, reporter)); 255 xfermodeImageFilter.get(), shouldSucceed, reporter));
256 256
257 // Try to render a small bitmap using the invalid deserialized filter 257 // Try to render a small bitmap using the invalid deserialized filter
258 // to make sure we don't crash while trying to render it 258 // to make sure we don't crash while trying to render it
259 if (shouldSucceed) { 259 if (shouldSucceed) {
260 SkBitmap bitmap; 260 SkBitmap bitmap;
261 bitmap.allocN32Pixels(24, 24); 261 bitmap.allocN32Pixels(24, 24);
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 { r1, SkAnnotationKeys::Define_Named_Dest_Key(), d1 }, 620 { r1, SkAnnotationKeys::Define_Named_Dest_Key(), d1 },
621 { r2, SkAnnotationKeys::Link_Named_Dest_Key(), d2 }, 621 { r2, SkAnnotationKeys::Link_Named_Dest_Key(), d2 },
622 }; 622 };
623 623
624 sk_sp<SkPicture> pict0(recorder.finishRecordingAsPicture()); 624 sk_sp<SkPicture> pict0(recorder.finishRecordingAsPicture());
625 sk_sp<SkPicture> pict1(copy_picture_via_serialization(pict0.get())); 625 sk_sp<SkPicture> pict1(copy_picture_via_serialization(pict0.get()));
626 626
627 TestAnnotationCanvas canvas(reporter, recs, SK_ARRAY_COUNT(recs)); 627 TestAnnotationCanvas canvas(reporter, recs, SK_ARRAY_COUNT(recs));
628 canvas.drawPicture(pict1); 628 canvas.drawPicture(pict1);
629 } 629 }
OLDNEW
« no previous file with comments | « tests/ImageFilterTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698