commit 9ce9d6772df650ceb0511f275e1a83dffa78ff72
author reed <reed@google.com> Thu Mar 17 10:51:11 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Mar 17 10:51:11 2016 -0700
tree 1c0d54a75945863947490ec45cccf7c30eaa2ca4
parent 42d95a0afb26560586232961445ba36de387ca37

update callsites for Make image factories

not forced yet, as we still have the build-guard. waiting on chrome CL

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1810813003

TBR=

Review URL: https://codereview.chromium.org/1810813003

tests/PDFJpegEmbedTest.cpp

diff --git a/tests/PDFJpegEmbedTest.cpp b/tests/PDFJpegEmbedTest.cpp
index 9d83fe6..2dcbdd0 100644
--- a/tests/PDFJpegEmbedTest.cpp
+++ b/tests/PDFJpegEmbedTest.cpp
@@ -56,9 +56,8 @@
  */
 DEF_TEST(PDFJpegEmbedTest, r) {
     const char test[] = "PDFJpegEmbedTest";
-    SkAutoTUnref<SkData> mandrillData(
-            load_resource(r, test, "mandrill_512_q075.jpg"));
-    SkAutoTUnref<SkData> cmykData(load_resource(r, test, "CMYK.jpg"));
+    sk_sp<SkData> mandrillData(load_resource(r, test, "mandrill_512_q075.jpg"));
+    sk_sp<SkData> cmykData(load_resource(r, test, "CMYK.jpg"));
     if (!mandrillData || !cmykData) {
         return;
     }
@@ -69,9 +68,9 @@
 
     canvas->clear(SK_ColorLTGRAY);
 
-    SkBitmap bm1(bitmap_from_data(mandrillData));
+    SkBitmap bm1(bitmap_from_data(mandrillData.get()));
     canvas->drawBitmap(bm1, 65.0, 0.0, nullptr);
-    SkBitmap bm2(bitmap_from_data(cmykData));
+    SkBitmap bm2(bitmap_from_data(cmykData.get()));
     canvas->drawBitmap(bm2, 0.0, 512.0, nullptr);
 
     canvas->flush();
@@ -81,11 +80,11 @@
     SkASSERT(pdfData);
     pdf.reset();
 
-    REPORTER_ASSERT(r, is_subset_of(mandrillData, pdfData));
+    REPORTER_ASSERT(r, is_subset_of(mandrillData.get(), pdfData.get()));
 
     // This JPEG uses a nonstandard colorspace - it can not be
     // embedded into the PDF directly.
-    REPORTER_ASSERT(r, !is_subset_of(cmykData, pdfData));
+    REPORTER_ASSERT(r, !is_subset_of(cmykData.get(), pdfData.get()));
     ////////////////////////////////////////////////////////////////////////////
     pdf.reset();
     document.reset(SkDocument::CreatePDF(&pdf));
@@ -93,10 +92,10 @@
 
     canvas->clear(SK_ColorLTGRAY);
 
-    SkAutoTUnref<SkImage> im1(SkImage::NewFromEncoded(mandrillData));
-    canvas->drawImage(im1, 65.0, 0.0, nullptr);
-    SkAutoTUnref<SkImage> im2(SkImage::NewFromEncoded(cmykData));
-    canvas->drawImage(im2, 0.0, 512.0, nullptr);
+    sk_sp<SkImage> im1(SkImage::MakeFromEncoded(mandrillData));
+    canvas->drawImage(im1.get(), 65.0, 0.0, nullptr);
+    sk_sp<SkImage> im2(SkImage::MakeFromEncoded(cmykData));
+    canvas->drawImage(im2.get(), 0.0, 512.0, nullptr);
 
     canvas->flush();
     document->endPage();
@@ -105,11 +104,11 @@
     SkASSERT(pdfData);
     pdf.reset();
 
-    REPORTER_ASSERT(r, is_subset_of(mandrillData, pdfData));
+    REPORTER_ASSERT(r, is_subset_of(mandrillData.get(), pdfData.get()));
 
     // This JPEG uses a nonstandard colorspace - it can not be
     // embedded into the PDF directly.
-    REPORTER_ASSERT(r, !is_subset_of(cmykData, pdfData));
+    REPORTER_ASSERT(r, !is_subset_of(cmykData.get(), pdfData.get()));
 }
 
 #include "SkJpegInfo.h"