commit eaa68be67e487928ef7b3a86447b4dd128004a6c
author Tom Sepez <tsepez@chromium.org> Mon May 08 21:01:13 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon May 08 21:01:13 2023 +0000
tree 7c1fe792ac10aeea2b14f1471f4ce4d3283e00a0
parent e6895bd323e645677103b589afe3b68b08c66236

Resolve remaining unowned_ptr exculsion warnings [android, win].

This should extend enabling the GN argument
    pdf_enable_unowned_ptr_exclusion = true

on the android and win bots.

Change-Id: I61051ddbe2b9eef718898dee5b27be31fc67a5dc
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/107230
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

core/fxcrt/cfx_fileaccess_windows.h

diff --git a/core/fxcrt/cfx_fileaccess_windows.h b/core/fxcrt/cfx_fileaccess_windows.h
index 2928d18..89c79e9 100644
--- a/core/fxcrt/cfx_fileaccess_windows.h
+++ b/core/fxcrt/cfx_fileaccess_windows.h
@@ -13,6 +13,7 @@
 #include "build/build_config.h"
 #include "core/fxcrt/fileaccess_iface.h"
 #include "core/fxcrt/fx_types.h"
+#include "core/fxcrt/unowned_ptr_exclusion.h"
 
 #if !BUILDFLAG(IS_WIN)
 #error "Included on the wrong platform"
@@ -39,7 +40,7 @@
   bool Truncate(FX_FILESIZE szFile) override;
 
  private:
-  void* m_hFile = nullptr;
+  UNOWNED_PTR_EXCLUSION void* m_hFile = nullptr;  // void type incompatible.
 };
 
 #endif  // CORE_FXCRT_CFX_FILEACCESS_WINDOWS_H_

core/fxge/android/fx_android_impl.cpp

diff --git a/core/fxge/android/fx_android_impl.cpp b/core/fxge/android/fx_android_impl.cpp
index e06d611..12783f5 100644
--- a/core/fxge/android/fx_android_impl.cpp
+++ b/core/fxge/android/fx_android_impl.cpp
@@ -7,6 +7,7 @@
 #include <memory>
 #include <utility>
 
+#include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/android/cfpf_skiadevicemodule.h"
 #include "core/fxge/android/cfx_androidfontinfo.h"
 #include "core/fxge/cfx_fontmgr.h"
@@ -33,7 +34,7 @@
   }
 
  private:
-  CFPF_SkiaDeviceModule* m_pDeviceModule = nullptr;
+  UnownedPtr<CFPF_SkiaDeviceModule> m_pDeviceModule;
 };
 
 // static