commit 1918c8da8af0d1d8a604795913ab0670754a1d30
author Tom Sepez <tsepez@chromium.org> Tue May 09 16:35:30 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue May 09 16:35:30 2023 +0000
tree 00d81c77b4ae079aa99c9b8dedd05adbc04e8c26
parent 1ce0f0424b524f75bd112217baa191432f4ebac1

Fix Skia build under pdf_enable_unowned_ptr_exclusion

Convert two T* pointers to UnownedPtr<T>.

Change-Id: Ib0ea9fe4b633df20324b3443e3f13f07ceac295d
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/107290
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@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 9ea0b24..a8d22eb 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -898,7 +898,7 @@
   }
 
   if (!m_pRecorder) {
-    delete m_pCanvas;
+    delete m_pCanvas.ExtractAsDangling();
   }
 }
 

core/fxge/skia/fx_skia_device.h

diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h
index beed9a3..e6b2529 100644
--- a/core/fxge/skia/fx_skia_device.h
+++ b/core/fxge/skia/fx_skia_device.h
@@ -12,6 +12,7 @@
 #include "core/fxcrt/data_vector.h"
 #include "core/fxcrt/fx_memory_wrappers.h"
 #include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/cfx_fillrenderoptions.h"
 #include "core/fxge/cfx_path.h"
 #include "core/fxge/renderdevicedriver_iface.h"
@@ -217,8 +218,8 @@
   // bitmap is 24 bpp and cannot be directly used as the back of a SkCanvas.
   RetainPtr<CFX_DIBitmap> m_pOriginalBitmap;
 
-  SkCanvas* m_pCanvas;
-  SkPictureRecorder* const m_pRecorder;
+  UnownedPtr<SkCanvas> m_pCanvas;
+  UnownedPtr<SkPictureRecorder> const m_pRecorder;
   CFX_FillRenderOptions m_FillOptions;
   bool m_bRgbByteOrder;
   bool m_bGroupKnockout;