commit 42d1c1cca78f9cd2f64136dcf99fad207c9f4099
author Wei Li <weili@chromium.org> Tue Mar 22 12:52:50 2016 -0700
committer Wei Li <weili@chromium.org> Tue Mar 22 12:52:50 2016 -0700
tree 4609912e5d5c3633247eb71d37b915defe1db754
parent d074e9787fe5f21d49269a504969cfcf4eec016b

Fix CPDFSDK_Widget::OnXFAAAction()

Fix a couple issues with OnXFAAAction():
-- radio button widget should not call ProcessEvent() twice;
-- UpdateDocView should be called before returning;

R=jun_fang@foxitsoftware.com

Review URL: https://codereview.chromium.org/1809073004 .

fpdfsdk/fsdk_baseform.cpp

diff --git a/fpdfsdk/fsdk_baseform.cpp b/fpdfsdk/fsdk_baseform.cpp
index bfdcb2d..4124ebf 100644
--- a/fpdfsdk/fsdk_baseform.cpp
+++ b/fpdfsdk/fsdk_baseform.cpp
@@ -237,25 +237,20 @@
           if (IXFA_Widget* hGroupWidget = GetGroupMixXFAWidget()) {
             CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hGroupWidget);
             param.m_pTarget = pAcc;
-            pXFAWidgetHandler->ProcessEvent(pAcc, &param);
+            if (pXFAWidgetHandler->ProcessEvent(pAcc, &param) !=
+                XFA_EVENTERROR_Success) {
+              return FALSE;
+            }
           }
-
-          {
-            CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hWidget);
-            param.m_pTarget = pAcc;
-            int32_t nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);
-            return nRet == XFA_EVENTERROR_Success;
-          }
-        } else {
-          CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hWidget);
-          param.m_pTarget = pAcc;
-          int32_t nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);
-          return nRet == XFA_EVENTERROR_Success;
         }
+        CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hWidget);
+        param.m_pTarget = pAcc;
+        int32_t nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);
 
         if (IXFA_DocView* pDocView = pDoc->GetXFADocView()) {
           pDocView->UpdateDocView();
         }
+        return nRet == XFA_EVENTERROR_Success;
       }
     }
   }