commit 2699dfb7129303a7e58e384d5ece2c0f41496e7e
author Lei Zhang <thestig@chromium.org> Thu Jul 06 01:52:22 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jul 06 01:52:22 2023 +0000
tree 44a67ba7bbc88f9b0e5419c9e17ba50828b6d26f
parent 205826cdab5c1573fd88e10d777ea8cd7e314e04

Tweak some recently added Skia code

Avoid an explicit std::unique_ptr::reset() in TestRenderPageSkp()

Change-Id: I478e897f258d1d42b50b43fa997eb0d8ca8a0b84
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/109213
Reviewed-by: K. Moon <kmoon@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

fpdfsdk/fpdf_view_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index 88477ad..098762c 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -232,16 +232,17 @@
     int width = static_cast<int>(FPDF_GetPageWidth(page));
     int height = static_cast<int>(FPDF_GetPageHeight(page));
 
-    auto recorder = std::make_unique<SkPictureRecorder>();
-    recorder->beginRecording(width, height);
+    sk_sp<SkPicture> picture;
+    {
+      auto recorder = std::make_unique<SkPictureRecorder>();
+      recorder->beginRecording(width, height);
 
-    FPDF_RenderPageSkia(
-        reinterpret_cast<FPDF_SKIA_CANVAS>(recorder->getRecordingCanvas()),
-        page, width, height);
-
-    sk_sp<SkPicture> picture = recorder->finishRecordingAsPicture();
-    recorder.reset();
-    ASSERT_TRUE(picture);
+      FPDF_RenderPageSkia(
+          reinterpret_cast<FPDF_SKIA_CANVAS>(recorder->getRecordingCanvas()),
+          page, width, height);
+      picture = recorder->finishRecordingAsPicture();
+      ASSERT_TRUE(picture);
+    }
 
     ScopedFPDFBitmap bitmap = SkPictureToPdfiumBitmap(
         std::move(picture), SkISize::Make(width, height));