Merge to XFA: Remove header files that only have includes.

fpdfsdk/src/formfiller/FFL_FormFiller.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+
 #include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"
-#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
+#include "fpdfsdk/include/fsdk_common.h"
+#include "fpdfsdk/include/fsdk_mgr.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
 
 #define GetRed(rgb) ((uint8_t)(rgb))
 #define GetGreen(rgb) ((uint8_t)(((FX_WORD)(rgb)) >> 8))
 #define GetBlue(rgb) ((uint8_t)((rgb) >> 16))
 
 #define FFL_HINT_ELAPSE 800
 
-/* ------------------------- CFFL_FormFiller ------------------------- */
-
 CFFL_FormFiller::CFFL_FormFiller(CPDFDoc_Environment* pApp,
                                  CPDFSDK_Annot* pAnnot)
     : m_pApp(pApp), m_pAnnot(pAnnot), m_bValid(FALSE), m_ptOldPos(0, 0) {
   m_pWidget = (CPDFSDK_Widget*)pAnnot;
 }
 
 CFFL_FormFiller::~CFFL_FormFiller() {
   for (auto& it : m_Maps) {
     CPWL_Wnd* pWnd = it.second;
     CFFL_PrivateData* pData = (CFFL_PrivateData*)pWnd->GetAttachedData();
@@ skipping 587 matching lines @@
 }
 
 void CFFL_FormFiller::InvalidateRect(double left,
                                      double top,
                                      double right,
                                      double bottom) {
   UnderlyingPageType* pPage = m_pWidget->GetUnderlyingPage();
   m_pApp->FFI_Invalidate(pPage, left, top, right, bottom);
 }
 
-/* ------------------------- CFFL_Button ------------------------- */
-
 CFFL_Button::CFFL_Button(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget)
     : CFFL_FormFiller(pApp, pWidget), m_bMouseIn(FALSE), m_bMouseDown(FALSE) {}
 
 CFFL_Button::~CFFL_Button() {}
 
 void CFFL_Button::OnMouseEnter(CPDFSDK_PageView* pPageView,
                                CPDFSDK_Annot* pAnnot) {
   m_bMouseIn = TRUE;
   FX_RECT rect = GetViewBBox(pPageView, pAnnot);
   InvalidateRect(rect.left, rect.top, rect.right, rect.bottom);
@@ skipping 52 matching lines @@
 void CFFL_Button::OnDraw(CPDFSDK_PageView* pPageView,
                          CPDFSDK_Annot* pAnnot,
                          CFX_RenderDevice* pDevice,
                          CFX_Matrix* pUser2Device,
                          FX_DWORD dwFlags) {
   ASSERT(pPageView);
   CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
   CPDF_FormControl* pCtrl = pWidget->GetFormControl();
   CPDF_FormControl::HighlightingMode eHM = pCtrl->GetHighlightingMode();
 
-  if (eHM == CPDF_FormControl::Push) {
-    if (m_bMouseDown) {
-      if (pWidget->IsWidgetAppearanceValid(CPDF_Annot::Down))
-        pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Down, NULL);
-      else
-        pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal,
-                                NULL);
-    } else if (m_bMouseIn) {
-      if (pWidget->IsWidgetAppearanceValid(CPDF_Annot::Rollover))
-        pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Rollover,
-                                NULL);
-      else
-        pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal,
-                                NULL);
-    } else {
+  if (eHM != CPDF_FormControl::Push) {
+    pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
+    return;
+  }
+
+  if (m_bMouseDown) {
+    if (pWidget->IsWidgetAppearanceValid(CPDF_Annot::Down))
+      pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Down, NULL);
+    else
       pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
-    }
-  } else
+  } else if (m_bMouseIn) {
+    if (pWidget->IsWidgetAppearanceValid(CPDF_Annot::Rollover))
+      pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Rollover,
+                              NULL);
+    else
+      pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
+  } else {
     pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
+  }
 }
 
 void CFFL_Button::OnDrawDeactive(CPDFSDK_PageView* pPageView,
                                  CPDFSDK_Annot* pAnnot,
                                  CFX_RenderDevice* pDevice,
                                  CFX_Matrix* pUser2Device,
                                  FX_DWORD dwFlags) {
   OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
 }