commit cfc8f9162d40e73c29f3b1f97818a43868dc2762
author K. Moon <kmoon@chromium.org> Thu Jun 08 17:15:25 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jun 08 17:15:25 2023 +0000
tree 471e9fce69db536178f7234f019969aa163398cb
parent 55e612f5f6e57cb56860579b70bfb2d731545939

Don't infer UnownedPtr::ExtractAsDangling() type

Passes the return value of UnownedPtr::ExtractAsDangling() directly to
the RetainPtr constructor, rather than using pdfium::WrapRetain(). When
UnownedPtr is a raw_ptr (as in Chromium), ExtractAsDangling() returns
another raw_ptr, which cannot be implicitly converted to CFX_DIBBase*
when passed to WrapRetain().

Bug: pdfium:2034
Change-Id: If4fc95694fa76eb0e9da02f87507b1521376e3ff
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/108491
Reviewed-by: Nigi <nigi@chromium.org>
Auto-Submit: K. Moon <kmoon@chromium.org>
Commit-Queue: Nigi <nigi@chromium.org>

core/fxge/skia/fx_skia_device.cpp

diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index c212140..b5e0f6a 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -231,8 +231,8 @@
     }
 
     // Convert unowned pointer to a retained pointer, then "leak" to `SkImage`.
-    RetainPtr<CFX_DIBBase> retained =
-        pdfium::WrapRetain(absl::get<UnownedType>(data_).ExtractAsDangling());
+    RetainPtr<CFX_DIBBase> retained(
+        absl::get<UnownedType>(data_).ExtractAsDangling());
     CFX_DIBBase* source = retained.Leak();
     return SkImages::RasterFromPixmap(
         SkPixmap(info_, source->GetBuffer().data(), row_bytes_),