[Merge to 54] Fixup CPDFSDK_PageView and CPDF_Page interactions.

fpdfsdk/include/fsdk_mgr.h

Index: fpdfsdk/include/fsdk_mgr.h
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index a0adf048232ed4227917de82ff76a5a0e73485ea..cf86e38f421de079caef115fc04103d29ce4534e 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -607,7 +607,8 @@ class CPDFSDK_PageView final : public CPDF_Page::View {
   void SetLock(FX_BOOL bLocked) { m_bLocked = bLocked; }
   FX_BOOL IsLocked() { return m_bLocked; }
 #ifndef PDF_ENABLE_XFA
-  void TakeOverPage() { m_bTakeOverPage = TRUE; }
+  bool OwnsPage() const { return m_bOwnsPage; }
+  void TakePageOwnership() { m_bOwnsPage = true; }
 #endif  // PDF_ENABLE_XFA
 
  private:
@@ -622,7 +623,7 @@ class CPDFSDK_PageView final : public CPDF_Page::View {
   CPDFSDK_Annot* m_CaptureWidget;
 #else  // PDF_ENABLE_XFA
   CPDFSDK_Widget* m_CaptureWidget;
-  FX_BOOL m_bTakeOverPage;
+  bool m_bOwnsPage;

[dsinclair, 2016/09/13 18:23:33]

There was a merge conflict here as master removes most of this ifdef.

 #endif  // PDF_ENABLE_XFA
   FX_BOOL m_bEnterWidget;
   FX_BOOL m_bExitWidget;