SkDocument: use `auto` for MakeDocument().
A later CL will make this return a unique_ptr<SkDocument>.
Bug: skia:5972
Change-Id: Ie10d6c07d5f2524ecb71d906db0d37427827225d
Reviewed-on: https://skia-review.googlesource.com/c/181660
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/bench/PDFBench.cpp b/bench/PDFBench.cpp
index d411ceb..7720e21 100644
--- a/bench/PDFBench.cpp
+++ b/bench/PDFBench.cpp
@@ -374,7 +374,7 @@
#endif
SkPDF::Metadata metadata;
metadata.fExecutor = fExecutor.get();
- sk_sp<SkDocument> doc = SkPDF::MakeDocument(&wStream, metadata);
+ auto doc = SkPDF::MakeDocument(&wStream, metadata);
big_pdf_test(doc.get(), fBackground);
}
}
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 5e65b50..774b97d 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -1635,7 +1635,7 @@
std::unique_ptr<SkExecutor> executor = SkExecutor::MakeFIFOThreadPool();
metadata.fExecutor = executor.get();
#endif
- sk_sp<SkDocument> doc = SkPDF::MakeDocument(dst, metadata);
+ auto doc = SkPDF::MakeDocument(dst, metadata);
if (!doc) {
return "SkPDF::MakeDocument() returned nullptr";
}
@@ -1665,9 +1665,9 @@
if (!factory) {
return "Failed to create XPS Factory.";
}
- sk_sp<SkDocument> doc(SkXPS::MakeDocument(dst, factory.get()));
+ auto doc = SkXPS::MakeDocument(dst, factory.get());
if (!doc) {
- return "SkXPS::MAkeDocument() returned nullptr";
+ return "SkXPS::MakeDocument() returned nullptr";
}
return draw_skdocument(src, doc.get(), dst);
}
diff --git a/site/user/api/skcanvas_creation.md b/site/user/api/skcanvas_creation.md
index 1ef3b0a..8a6cdfc 100644
--- a/site/user/api/skcanvas_creation.md
+++ b/site/user/api/skcanvas_creation.md
@@ -131,7 +131,7 @@
void (*draw)(SkCanvas*),
const char* path) {
SkFILEWStream pdfStream(path);
- sk_sp<SkDocument> pdfDoc = SkPDF::MakeDocument(&pdfStream);
+ auto pdfDoc = SkPDF::MakeDocument(&pdfStream);
SkCanvas* pdfCanvas = pdfDoc->beginPage(SkIntToScalar(width),
SkIntToScalar(height));
draw(pdfCanvas);
diff --git a/site/user/sample/pdf.md b/site/user/sample/pdf.md
index edfd7d5..b59ae07 100644
--- a/site/user/sample/pdf.md
+++ b/site/user/sample/pdf.md
@@ -20,7 +20,7 @@
SkTime::GetDateTime(&now);
metadata.fCreation = now;
metadata.fModified = now;
- sk_sp<SkDocument> pdfDocument = SkPDF::MakeDocument(outputStream, metadata);
+ auto pdfDocument = SkPDF::MakeDocument(outputStream, metadata);
assert(pdfDocument);
for (int page = 0; page < numberOfPages; ++page) {
diff --git a/src/utils/SkLua.cpp b/src/utils/SkLua.cpp
index 7ef3b2a..c755b61 100644
--- a/src/utils/SkLua.cpp
+++ b/src/utils/SkLua.cpp
@@ -1800,7 +1800,7 @@
if (!file->isValid()) {
return 0;
}
- sk_sp<SkDocument> doc = SkPDF::MakeDocument(file.get());
+ auto doc = SkPDF::MakeDocument(file.get());
if (!doc) {
return 0;
}
diff --git a/tests/AnnotationTest.cpp b/tests/AnnotationTest.cpp
index 70ec327..70c9703 100644
--- a/tests/AnnotationTest.cpp
+++ b/tests/AnnotationTest.cpp
@@ -52,7 +52,7 @@
DEF_TEST(Annotation_PdfLink, reporter) {
REQUIRE_PDF_DOCUMENT(Annotation_PdfLink, reporter);
SkDynamicMemoryWStream outStream;
- sk_sp<SkDocument> doc(SkPDF::MakeDocument(&outStream));
+ auto doc = SkPDF::MakeDocument(&outStream);
SkCanvas* canvas = doc->beginPage(612.0f, 792.0f);
REPORTER_ASSERT(reporter, canvas);
@@ -71,7 +71,7 @@
DEF_TEST(Annotation_PdfDefineNamedDestination, reporter) {
REQUIRE_PDF_DOCUMENT(Annotation_PdfNamedDestination, reporter);
SkDynamicMemoryWStream outStream;
- sk_sp<SkDocument> doc(SkPDF::MakeDocument(&outStream));
+ auto doc = SkPDF::MakeDocument(&outStream);
SkCanvas* canvas = doc->beginPage(612.0f, 792.0f);
REPORTER_ASSERT(reporter, canvas);
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index 8aeb0c4..9bd9fcb 100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -562,7 +562,7 @@
static void TestPdfDevice(skiatest::Reporter* reporter, const TestData& d, CanvasTestStep* step) {
SkDynamicMemoryWStream outStream;
- sk_sp<SkDocument> doc(SkPDF::MakeDocument(&outStream));
+ auto doc = SkPDF::MakeDocument(&outStream);
if (!doc) {
INFOF(reporter, "PDF disabled; TestPdfDevice test skipped.");
return;
diff --git a/tests/PDFDocumentTest.cpp b/tests/PDFDocumentTest.cpp
index 72fc13c..95821e8 100644
--- a/tests/PDFDocumentTest.cpp
+++ b/tests/PDFDocumentTest.cpp
@@ -19,7 +19,7 @@
static void test_empty(skiatest::Reporter* reporter) {
SkDynamicMemoryWStream stream;
- sk_sp<SkDocument> doc(SkPDF::MakeDocument(&stream));
+ auto doc = SkPDF::MakeDocument(&stream);
doc->close();
@@ -28,7 +28,7 @@
static void test_abort(skiatest::Reporter* reporter) {
SkDynamicMemoryWStream stream;
- sk_sp<SkDocument> doc(SkPDF::MakeDocument(&stream));
+ auto doc = SkPDF::MakeDocument(&stream);
SkCanvas* canvas = doc->beginPage(100, 100);
canvas->drawColor(SK_ColorRED);
@@ -57,7 +57,7 @@
// Make sure doc's destructor is called to flush.
{
SkFILEWStream stream(path.c_str());
- sk_sp<SkDocument> doc = SkPDF::MakeDocument(&stream);
+ auto doc = SkPDF::MakeDocument(&stream);
SkCanvas* canvas = doc->beginPage(100, 100);
canvas->drawColor(SK_ColorRED);
@@ -88,7 +88,7 @@
{
SkFILEWStream stream(path.c_str());
- sk_sp<SkDocument> doc = SkPDF::MakeDocument(&stream);
+ auto doc = SkPDF::MakeDocument(&stream);
SkCanvas* canvas = doc->beginPage(100, 100);
canvas->drawColor(SK_ColorRED);
@@ -106,7 +106,7 @@
static void test_close(skiatest::Reporter* reporter) {
SkDynamicMemoryWStream stream;
- sk_sp<SkDocument> doc(SkPDF::MakeDocument(&stream));
+ auto doc = SkPDF::MakeDocument(&stream);
SkCanvas* canvas = doc->beginPage(100, 100);
canvas->drawColor(SK_ColorRED);
@@ -129,7 +129,7 @@
DEF_TEST(SkPDF_document_skbug_4734, r) {
REQUIRE_PDF_DOCUMENT(SkPDF_document_skbug_4734, r);
SkDynamicMemoryWStream stream;
- sk_sp<SkDocument> doc(SkPDF::MakeDocument(&stream));
+ auto doc = SkPDF::MakeDocument(&stream);
SkCanvas* canvas = doc->beginPage(64, 64);
canvas->scale(10000.0f, 10000.0f);
canvas->translate(20.0f, 10.0f);
@@ -251,7 +251,7 @@
std::unique_ptr<SkExecutor> executor = SkExecutor::MakeFIFOThreadPool();
metadata.fExecutor = executor.get();
SkNullWStream dst;
- sk_sp<SkDocument> doc = SkPDF::MakeDocument(&dst, metadata);
+ auto doc = SkPDF::MakeDocument(&dst, metadata);
doc->beginPage(612, 792)->drawBitmap(b, 0, 0);
doc->abort();
}
diff --git a/tests/PDFJpegEmbedTest.cpp b/tests/PDFJpegEmbedTest.cpp
index e1ae59b..6c9a481 100644
--- a/tests/PDFJpegEmbedTest.cpp
+++ b/tests/PDFJpegEmbedTest.cpp
@@ -55,7 +55,7 @@
}
////////////////////////////////////////////////////////////////////////////
SkDynamicMemoryWStream pdf;
- sk_sp<SkDocument> document(SkPDF::MakeDocument(&pdf));
+ auto document = SkPDF::MakeDocument(&pdf);
SkCanvas* canvas = document->beginPage(642, 1028);
canvas->clear(SK_ColorLTGRAY);
diff --git a/tests/PDFMetadataAttributeTest.cpp b/tests/PDFMetadataAttributeTest.cpp
index 1a51217..964d0e7 100644
--- a/tests/PDFMetadataAttributeTest.cpp
+++ b/tests/PDFMetadataAttributeTest.cpp
@@ -23,7 +23,7 @@
metadata.fModified = now;
SkDynamicMemoryWStream pdf;
- sk_sp<SkDocument> doc = SkPDF::MakeDocument(&pdf, metadata);
+ auto doc = SkPDF::MakeDocument(&pdf, metadata);
doc->beginPage(612.0f, 792.0f);
doc->close();
sk_sp<SkData> data = pdf.detachAsData();
diff --git a/tests/PDFOpaqueSrcModeToSrcOverTest.cpp b/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
index 7071192..c3c5fbc 100644
--- a/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
+++ b/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
@@ -11,7 +11,7 @@
#include "Test.h"
static void run_test(SkWStream* out, SkBlendMode mode, U8CPU alpha) {
- sk_sp<SkDocument> pdfDoc(SkPDF::MakeDocument(out));
+ auto pdfDoc = SkPDF::MakeDocument(out);
SkCanvas* c = pdfDoc->beginPage(612.0f, 792.0f);
SkPaint black;
SkPaint background;
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index 1f62a48..f7ea80a 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -83,7 +83,7 @@
// and there is no assert on input data in Debug mode.
static void test_issue1083() {
SkDynamicMemoryWStream outStream;
- sk_sp<SkDocument> doc(SkPDF::MakeDocument(&outStream));
+ auto doc = SkPDF::MakeDocument(&outStream);
SkCanvas* canvas = doc->beginPage(100.0f, 100.0f);
uint16_t glyphID = 65000;
@@ -286,7 +286,7 @@
DEF_TEST(SkPDF_ImageFilter, reporter) {
REQUIRE_PDF_DOCUMENT(SkPDF_ImageFilter, reporter);
SkDynamicMemoryWStream stream;
- sk_sp<SkDocument> doc(SkPDF::MakeDocument(&stream));
+ auto doc = SkPDF::MakeDocument(&stream);
SkCanvas* canvas = doc->beginPage(100.0f, 100.0f);
sk_sp<DummyImageFilter> filter(DummyImageFilter::Make());
diff --git a/tests/Test.h b/tests/Test.h
index faf5521..31be9a0 100644
--- a/tests/Test.h
+++ b/tests/Test.h
@@ -220,8 +220,8 @@
#define REQUIRE_PDF_DOCUMENT(TEST_NAME, REPORTER) \
do { \
- SkDynamicMemoryWStream testStream; \
- sk_sp<SkDocument> testDoc(SkPDF::MakeDocument(&testStream)); \
+ SkNullWStream testStream; \
+ auto testDoc = SkPDF::MakeDocument(&testStream); \
if (!testDoc) { \
INFOF(REPORTER, "PDF disabled; %s test skipped.", #TEST_NAME); \
return; \
diff --git a/tools/fiddle/fiddle_main.cpp b/tools/fiddle/fiddle_main.cpp
index 1a5ad3c..9bee668 100644
--- a/tools/fiddle/fiddle_main.cpp
+++ b/tools/fiddle/fiddle_main.cpp
@@ -301,7 +301,7 @@
}
if (options.pdf) {
SkDynamicMemoryWStream pdfStream;
- sk_sp<SkDocument> document(SkPDF::MakeDocument(&pdfStream));
+ auto document = SkPDF::MakeDocument(&pdfStream);
if (document) {
srand(0);
draw(prepare_canvas(document->beginPage(options.size.width(), options.size.height())));
diff --git a/tools/skhello.cpp b/tools/skhello.cpp
index 3eb9f45..ac2ea56 100644
--- a/tools/skhello.cpp
+++ b/tools/skhello.cpp
@@ -44,7 +44,7 @@
static bool do_document(int w, int h, const char path[], const char text[],
const SkPaint& paint) {
- sk_sp<SkDocument> doc(SkPDF::MakeDocument(path));
+ auto doc = SkPDF::MakeDocument(path);
if (doc.get()) {
SkScalar width = SkIntToScalar(w);
SkScalar height = SkIntToScalar(h);