commit 19e39e97dba8079d612437abe7c5a318cd4f3729
author Tom Sepez <tsepez@chromium.org> Tue Sep 22 21:00:32 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Sep 22 21:00:32 2020 +0000
tree 340b0598fab1f32ed1d9891e35a5729b1f322f63
parent 4afa19fa5917e2df9ea32eb6ca53bad1022e5e51

Rename XFA_GetWidgetFromLayoutItem() to CXFA_FFWidget::FromLayoutItem()

Making it a static method of the CXFA_FFWidget class gives a strong
hint as to what the return type will be.

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

xfa/fxfa/cxfa_ffnotify.cpp

diff --git a/xfa/fxfa/cxfa_ffnotify.cpp b/xfa/fxfa/cxfa_ffnotify.cpp
index 515691f..be1ce9e 100644
--- a/xfa/fxfa/cxfa_ffnotify.cpp
+++ b/xfa/fxfa/cxfa_ffnotify.cpp
@@ -264,7 +264,7 @@
   if (!pLayoutItem)
     return;
 
-  CXFA_FFWidget* hWidget = XFA_GetWidgetFromLayoutItem(pLayoutItem);
+  CXFA_FFWidget* hWidget = CXFA_FFWidget::FromLayoutItem(pLayoutItem);
   if (!hWidget)
     return;
 
@@ -475,7 +475,7 @@
   if (!pDocView)
     return;
 
-  CXFA_FFWidget* pWidget = XFA_GetWidgetFromLayoutItem(pSender);
+  CXFA_FFWidget* pWidget = CXFA_FFWidget::FromLayoutItem(pSender);
   if (!pWidget)
     return;
 
@@ -509,7 +509,7 @@
   if (!pDocView)
     return;
 
-  CXFA_FFWidget* pWidget = XFA_GetWidgetFromLayoutItem(pSender);
+  CXFA_FFWidget* pWidget = CXFA_FFWidget::FromLayoutItem(pSender);
   if (!pWidget)
     return;
 

xfa/fxfa/cxfa_ffpageview.cpp

diff --git a/xfa/fxfa/cxfa_ffpageview.cpp b/xfa/fxfa/cxfa_ffpageview.cpp
index 367e5ec..3eb8fca 100644
--- a/xfa/fxfa/cxfa_ffpageview.cpp
+++ b/xfa/fxfa/cxfa_ffpageview.cpp
@@ -236,7 +236,7 @@
 
 CXFA_FFWidget* CXFA_FFPageWidgetIterator::GetCurrentWidget() {
   CXFA_LayoutItem* pLayoutItem = m_sIterator.GetCurrent();
-  return pLayoutItem ? XFA_GetWidgetFromLayoutItem(pLayoutItem) : nullptr;
+  return pLayoutItem ? CXFA_FFWidget::FromLayoutItem(pLayoutItem) : nullptr;
 }
 
 bool CXFA_FFPageWidgetIterator::SetCurrentWidget(CXFA_FFWidget* pWidget) {
@@ -245,7 +245,7 @@
 
 CXFA_FFWidget* CXFA_FFPageWidgetIterator::GetWidget(
     CXFA_LayoutItem* pLayoutItem) {
-  CXFA_FFWidget* pWidget = XFA_GetWidgetFromLayoutItem(pLayoutItem);
+  CXFA_FFWidget* pWidget = CXFA_FFWidget::FromLayoutItem(pLayoutItem);
   if (!pWidget)
     return nullptr;
 
@@ -487,7 +487,7 @@
 
 CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::GetWidget(
     CXFA_LayoutItem* pLayoutItem) {
-  CXFA_FFWidget* pWidget = XFA_GetWidgetFromLayoutItem(pLayoutItem);
+  CXFA_FFWidget* pWidget = CXFA_FFWidget::FromLayoutItem(pLayoutItem);
   if (!pWidget)
     return nullptr;
 

xfa/fxfa/cxfa_ffwidget.cpp

diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp
index 408dbe4..43cec04 100644
--- a/xfa/fxfa/cxfa_ffwidget.cpp
+++ b/xfa/fxfa/cxfa_ffwidget.cpp
@@ -217,7 +217,8 @@
               margin->GetRightInset(), margin->GetBottomInset());
 }
 
-CXFA_FFWidget* XFA_GetWidgetFromLayoutItem(CXFA_LayoutItem* pLayoutItem) {
+// static
+CXFA_FFWidget* CXFA_FFWidget::FromLayoutItem(CXFA_LayoutItem* pLayoutItem) {
   if (!pLayoutItem->GetFormNode()->HasCreatedUIWidget())
     return nullptr;
 

xfa/fxfa/cxfa_ffwidget.h

diff --git a/xfa/fxfa/cxfa_ffwidget.h b/xfa/fxfa/cxfa_ffwidget.h
index 023f09d..4cd5acd 100644
--- a/xfa/fxfa/cxfa_ffwidget.h
+++ b/xfa/fxfa/cxfa_ffwidget.h
@@ -58,7 +58,6 @@
     int32_t& iImageYDpi);
 
 void XFA_RectWithoutMargin(CFX_RectF* rt, const CXFA_Margin* margin);
-CXFA_FFWidget* XFA_GetWidgetFromLayoutItem(CXFA_LayoutItem* pLayoutItem);
 
 class CXFA_FFWidget : public cppgc::GarbageCollected<CXFA_FFWidget>,
                       public CFWL_Widget::AdapterIface {
@@ -68,6 +67,8 @@
   enum FocusOption { kDoNotDrawFocus = 0, kDrawFocus };
   enum HighlightOption { kNoHighlight = 0, kHighlight };
 
+  static CXFA_FFWidget* FromLayoutItem(CXFA_LayoutItem* pLayoutItem);
+
   CONSTRUCT_VIA_MAKE_GARBAGE_COLLECTED;
   ~CXFA_FFWidget() override;