Remove stray cppgc::Member<>::Get() calls
Unlike, say, RetainPtr<>::Get(), cppgc::Member<>::Get() returns
safe references due to cppgc stack scanning, thus we need not call
attention to places where this happens via an explicit .Get().
Instead, just let it happen implicitly to distinguish the case.
Change-Id: I1a439b85ef20181428a384bde159f0271805e585
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/99490
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/fxjs/xfa/cjx_object.h b/fxjs/xfa/cjx_object.h
index 060d41c..c68b7de 100644
--- a/fxjs/xfa/cjx_object.h
+++ b/fxjs/xfa/cjx_object.h
@@ -110,7 +110,7 @@
CXFA_Document* GetDocument() const;
CXFA_Node* GetXFANode() const;
- CXFA_Object* GetXFAObject() const { return object_.Get(); }
+ CXFA_Object* GetXFAObject() const { return object_; }
void SetCalcRecursionCount(size_t count) { calc_recursion_count_ = count; }
size_t GetCalcRecursionCount() const { return calc_recursion_count_; }
diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h
index f1f1dab..b2b63d9 100644
--- a/xfa/fwl/cfwl_widget.h
+++ b/xfa/fwl/cfwl_widget.h
@@ -146,7 +146,7 @@
return m_pDelegate ? m_pDelegate.Get() : this;
}
- CFWL_App* GetFWLApp() const { return m_pFWLApp.Get(); }
+ CFWL_App* GetFWLApp() const { return m_pFWLApp; }
uint64_t GetEventKey() const { return m_nEventKey; }
void SetEventKey(uint64_t key) { m_nEventKey = key; }
diff --git a/xfa/fxfa/cxfa_ffdoc.h b/xfa/fxfa/cxfa_ffdoc.h
index e443d1c..4ffc4c6 100644
--- a/xfa/fxfa/cxfa_ffdoc.h
+++ b/xfa/fxfa/cxfa_ffdoc.h
@@ -165,7 +165,7 @@
FormType GetFormType() const { return m_FormType; }
cppgc::Heap* GetHeap() const { return m_pHeap.Get(); }
CXFA_Document* GetXFADoc() const { return m_pDocument; }
- CXFA_FFApp* GetApp() const { return m_pApp.Get(); }
+ CXFA_FFApp* GetApp() const { return m_pApp; }
CPDF_Document* GetPDFDoc() const { return m_pPDFDoc.Get(); }
CXFA_FFDocView* GetDocView(CXFA_LayoutProcessor* pLayout);
CXFA_FFDocView* GetDocView();
diff --git a/xfa/fxfa/cxfa_ffdocview.h b/xfa/fxfa/cxfa_ffdocview.h
index d4cbd34..0eaadeb 100644
--- a/xfa/fxfa/cxfa_ffdocview.h
+++ b/xfa/fxfa/cxfa_ffdocview.h
@@ -48,7 +48,7 @@
void Trace(cppgc::Visitor* visitor) const;
- CXFA_FFDoc* GetDoc() const { return m_pDoc.Get(); }
+ CXFA_FFDoc* GetDoc() const { return m_pDoc; }
int32_t StartLayout();
int32_t DoLayout();
void StopLayout();
diff --git a/xfa/fxfa/cxfa_ffnotify.h b/xfa/fxfa/cxfa_ffnotify.h
index 5483b6e..e74af25 100644
--- a/xfa/fxfa/cxfa_ffnotify.h
+++ b/xfa/fxfa/cxfa_ffnotify.h
@@ -69,7 +69,7 @@
bool bIsFormReady,
bool bRecursive);
void AddCalcValidate(CXFA_Node* pNode);
- CXFA_FFDoc* GetFFDoc() const { return m_pDoc.Get(); }
+ CXFA_FFDoc* GetFFDoc() const { return m_pDoc; }
CXFA_FFApp::CallbackIface* GetAppProvider();
CXFA_FFWidgetHandler* GetWidgetHandler();
void OpenDropDownList(CXFA_Node* pNode);
diff --git a/xfa/fxfa/cxfa_ffwidget.h b/xfa/fxfa/cxfa_ffwidget.h
index 3f58cf7..c3f268b 100644
--- a/xfa/fxfa/cxfa_ffwidget.h
+++ b/xfa/fxfa/cxfa_ffwidget.h
@@ -155,8 +155,8 @@
virtual WideString GetText();
virtual FormFieldType GetFormFieldType();
- CXFA_Node* GetNode() const { return m_pNode.Get(); }
- CXFA_ContentLayoutItem* GetLayoutItem() const { return m_pLayoutItem.Get(); }
+ CXFA_Node* GetNode() const { return m_pNode; }
+ CXFA_ContentLayoutItem* GetLayoutItem() const { return m_pLayoutItem; }
void SetLayoutItem(CXFA_ContentLayoutItem* pItem) { m_pLayoutItem = pItem; }
CXFA_FFPageView* GetPageView() const { return m_pPageView; }
void SetPageView(CXFA_FFPageView* pPageView) { m_pPageView = pPageView; }
diff --git a/xfa/fxfa/layout/cxfa_contentlayoutitem.h b/xfa/fxfa/layout/cxfa_contentlayoutitem.h
index c8462d2..f2e9f59 100644
--- a/xfa/fxfa/layout/cxfa_contentlayoutitem.h
+++ b/xfa/fxfa/layout/cxfa_contentlayoutitem.h
@@ -26,8 +26,8 @@
CXFA_ContentLayoutItem* GetFirst();
CXFA_ContentLayoutItem* GetLast();
- CXFA_ContentLayoutItem* GetPrev() const { return m_pPrev.Get(); }
- CXFA_ContentLayoutItem* GetNext() const { return m_pNext.Get(); }
+ CXFA_ContentLayoutItem* GetPrev() const { return m_pPrev; }
+ CXFA_ContentLayoutItem* GetNext() const { return m_pNext; }
void InsertAfter(CXFA_ContentLayoutItem* pNext);
CFX_RectF GetRelativeRect() const;
diff --git a/xfa/fxfa/layout/cxfa_layoutitem.h b/xfa/fxfa/layout/cxfa_layoutitem.h
index 56da4b1..5dfd488 100644
--- a/xfa/fxfa/layout/cxfa_layoutitem.h
+++ b/xfa/fxfa/layout/cxfa_layoutitem.h
@@ -38,7 +38,7 @@
const CXFA_ContentLayoutItem* AsContentLayoutItem() const;
const CXFA_ViewLayoutItem* GetPage() const;
- CXFA_Node* GetFormNode() const { return m_pFormNode.Get(); }
+ CXFA_Node* GetFormNode() const { return m_pFormNode; }
void SetFormNode(CXFA_Node* pNode);
protected:
diff --git a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.h b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.h
index 5b6ffd9..ff534d9 100644
--- a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.h
+++ b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.h
@@ -64,7 +64,7 @@
CXFA_ViewLayoutItem* GetPage(int32_t index) const;
int32_t GetPageIndex(const CXFA_ViewLayoutItem* pPage) const;
CXFA_ViewLayoutItem* GetRootLayoutItem() const {
- return m_pPageSetRootLayoutItem.Get();
+ return m_pPageSetRootLayoutItem;
}
absl::optional<BreakData> ProcessBreakBefore(const CXFA_Node* pBreakNode);
absl::optional<BreakData> ProcessBreakAfter(const CXFA_Node* pBreakNode);
diff --git a/xfa/fxfa/parser/cxfa_document.h b/xfa/fxfa/parser/cxfa_document.h
index 6432dd1..3192a3c 100644
--- a/xfa/fxfa/parser/cxfa_document.h
+++ b/xfa/fxfa/parser/cxfa_document.h
@@ -95,7 +95,7 @@
// won't have an isolate set into it.
CFXJSE_Engine* GetScriptContext() const;
- CXFA_FFNotify* GetNotify() const { return notify_.Get(); }
+ CXFA_FFNotify* GetNotify() const { return notify_; }
CXFA_NodeOwner* GetNodeOwner() { return node_owner_; }
cppgc::Heap* GetHeap() const;
CXFA_LocaleMgr* GetLocaleMgr();
diff --git a/xfa/fxfa/parser/cxfa_thisproxy.h b/xfa/fxfa/parser/cxfa_thisproxy.h
index e21e214..47b451b 100644
--- a/xfa/fxfa/parser/cxfa_thisproxy.h
+++ b/xfa/fxfa/parser/cxfa_thisproxy.h
@@ -21,8 +21,8 @@
void Trace(cppgc::Visitor* visitor) const override;
- CXFA_Node* GetThisNode() const { return m_pThisNode.Get(); }
- CXFA_Script* GetScriptNode() const { return m_pScriptNode.Get(); }
+ CXFA_Node* GetThisNode() const { return m_pThisNode; }
+ CXFA_Script* GetScriptNode() const { return m_pScriptNode; }
private:
CXFA_ThisProxy(CXFA_Node* pThisNode, CXFA_Script* pScriptNode);
