commit 11a7ef868253df9bd50626eb0d5072ea36afc7e2
author Tom Sepez <tsepez@chromium.org> Thu Aug 04 18:36:42 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Aug 04 18:36:42 2022 +0000
tree 62ad5ac11a1bb03ccd4f9427d1da9fa6fd41d16d
parent 565437d28cc700712e7c0dd70c6cd64c14b59d16

Remove unreachable CPDFSDK_PageView::TakePageOwnership()

TakePageOwnership is only reachable directly from the embedder
via FPDF_PageClose() when the page is locked. But the page is only
locked while LoadXFAAnnots() is running, in which case the embedder
doesn't have control to call FPDF_PageClose() in the first place.

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

fpdfsdk/cpdfsdk_pageview.h

diff --git a/fpdfsdk/cpdfsdk_pageview.h b/fpdfsdk/cpdfsdk_pageview.h
index a079c3f..1cb25d5 100644
--- a/fpdfsdk/cpdfsdk_pageview.h
+++ b/fpdfsdk/cpdfsdk_pageview.h
@@ -14,7 +14,6 @@
 
 #include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fxcrt/mask.h"
-#include "core/fxcrt/retain_ptr.h"
 #include "core/fxcrt/unowned_ptr.h"
 #include "fpdfsdk/cpdfsdk_annot.h"
 
@@ -102,7 +101,6 @@
   bool IsLocked() const { return m_bLocked; }
   void SetBeingDestroyed() { m_bBeingDestroyed = true; }
   bool IsBeingDestroyed() const { return m_bBeingDestroyed; }
-  void TakePageOwnership() { m_pOwnsPage.Reset(ToPDFPage(m_page)); }
 
  private:
 #ifdef PDF_ENABLE_XFA
@@ -126,7 +124,6 @@
   std::vector<std::unique_ptr<CPDFSDK_Annot>> m_SDKAnnotArray;
   UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
   ObservedPtr<CPDFSDK_Annot> m_pCaptureWidget;
-  RetainPtr<CPDF_Page> m_pOwnsPage;
   bool m_bOnWidget = false;
   bool m_bValid = false;
   bool m_bLocked = false;

fpdfsdk/fpdf_view.cpp

diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index 0932335..6def39b 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -721,11 +721,6 @@
   if (!pPageView || pPageView->IsBeingDestroyed())
     return;
 
-  if (pPageView->IsLocked()) {
-    pPageView->TakePageOwnership();
-    return;
-  }
-
   // This will delete the |pPageView| object. We must cleanup the PageView
   // first because it will attempt to reset the View on the |pPage| during
   // destruction.