commit e858d1fb244dff2855ad86d30b5bc510371d896c
author Lei Zhang <thestig@chromium.org> Mon Jul 29 23:43:41 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Jul 29 23:43:41 2019 +0000
tree 97735a0925f80d15cb48d3f72498314490c35da1
parent 3b37f6b44087b3e1dfc67e84add00fd889d14759

Rename XFA version of CPDFSDK_Widget::ResetAppearance().

Rename it to ResetXFAAppearance() to avoid overloading.

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

fpdfsdk/cpdfsdk_widget.cpp

diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index 2889410..2eae13f 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -532,7 +532,7 @@
                            notify);
 #ifdef PDF_ENABLE_XFA
   if (!IsWidgetAppearanceValid(CPDF_Annot::Normal))
-    ResetAppearance(true);
+    ResetXFAAppearance(true);
   if (notify == NotificationOption::kDoNotNotify)
     Synchronize(true);
 #endif  // PDF_ENABLE_XFA
@@ -583,7 +583,7 @@
 }
 
 #ifdef PDF_ENABLE_XFA
-void CPDFSDK_Widget::ResetAppearance(bool bValueChanged) {
+void CPDFSDK_Widget::ResetXFAAppearance(bool bValueChanged) {
   switch (GetFieldType()) {
     case FormFieldType::kTextField:
     case FormFieldType::kComboBox: {

fpdfsdk/cpdfsdk_widget.h

diff --git a/fpdfsdk/cpdfsdk_widget.h b/fpdfsdk/cpdfsdk_widget.h
index 7953b5e..b24ef37 100644
--- a/fpdfsdk/cpdfsdk_widget.h
+++ b/fpdfsdk/cpdfsdk_widget.h
@@ -87,7 +87,8 @@
   void SetTopVisibleIndex(int index);
 
 #ifdef PDF_ENABLE_XFA
-  void ResetAppearance(bool bValueChanged);
+  // TODO(thestig): Figure out if the parameter should be used or removed.
+  void ResetXFAAppearance(bool bValueChanged);
 #endif  // PDF_ENABLE_XFA
   void ResetAppearance(Optional<WideString> sValue, bool bValueChanged);
   void ResetFieldAppearance();

fpdfsdk/cpdfsdk_widgethandler.cpp

diff --git a/fpdfsdk/cpdfsdk_widgethandler.cpp b/fpdfsdk/cpdfsdk_widgethandler.cpp
index 5919ab4..74e7512 100644
--- a/fpdfsdk/cpdfsdk_widgethandler.cpp
+++ b/fpdfsdk/cpdfsdk_widgethandler.cpp
@@ -224,7 +224,7 @@
   CPDFXFA_Context* pContext = pPageView->GetFormFillEnv()->GetXFAContext();
   if (pContext->GetFormType() == FormType::kXFAForeground) {
     if (!pWidget->IsAppearanceValid() && !pWidget->GetValue().IsEmpty())
-      pWidget->ResetAppearance(false);
+      pWidget->ResetXFAAppearance(false);
   }
 #endif  // PDF_ENABLE_XFA
 }