Tidy up CPDFDOC_Environment.

fpdfsdk/src/formfiller/FFL_IFormFiller.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 "../../include/formfiller/FFL_FormFiller.h"
 #include "../../include/formfiller/FFL_IFormFiller.h"
 #include "../../include/formfiller/FFL_CheckBox.h"
 #include "../../include/formfiller/FFL_ComboBox.h"
@@ skipping 63 matching lines @@
         ASSERT(pPageView != NULL);
         CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
 
         if (IsVisible(pWidget))
         {
                 if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE))
                 {
                         if (pFormFiller->IsValid())
                         {
                                 pFormFiller->OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
-
                                 pAnnot->GetPDFPage();
 
-
-                                CPDFSDK_Document* pDocument = m_pApp->GetCurrentDoc();
-                                ASSERT(pDocument != NULL);
-
+                                CPDFSDK_Document* pDocument = m_pApp->GetSDKDocument();
                                 if (pDocument->GetFocusAnnot() == pAnnot)
                                 {
                                         CPDF_Rect rcFocus = pFormFiller->GetFocusBox(pPageView);
                                         if (!rcFocus.IsEmpty())
                                         {
                                                 CFX_PathData path;
-
                                                 path.SetPointCount(5);
                                                 path.SetPoint(0, rcFocus.left,  rcFocus.top, FXPT_MOVETO);
                                                 path.SetPoint(1, rcFocus.left,  rcFocus.bottom, FXPT_LINETO);
                                                 path.SetPoint(2, rcFocus.right,  rcFocus.bottom, FXPT_LINETO);
                                                 path.SetPoint(3, rcFocus.right,  rcFocus.top, FXPT_LINETO);
                                                 path.SetPoint(4, rcFocus.left,  rcFocus.top, FXPT_LINETO);
 
                                                 CFX_GraphStateData gsd;
                                                 gsd.SetDashCount(1);
                                                 gsd.m_DashArray[0] = 1.0f;
                                                 gsd.m_DashPhase = 0;
-
                                                 gsd.m_LineWidth = 1.0f;
                                                 pDevice->DrawPath(&path, pUser2Device, &gsd, 0, ArgbEncode(255,0,0,0), FXFILL_ALTERNATE);
-
-                                        //      ::DrawFocusRect(hDC, &rcFocus);
                                         }
                                 }
-
                                 return;
                         }
                 }
 
                 if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE))
                         pFormFiller->OnDrawDeactive(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
                 else
                         pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
 
                 if (!IsReadOnly(pWidget) && IsFillingAllowed(pWidget))
-                {
                         pWidget->DrawShadow(pDevice, pPageView);
-                }
-
         }
 }
 
 void CFFL_IFormFiller::OnCreate(CPDFSDK_Annot* pAnnot)
 {
         if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE))
         {
                 pFormFiller->OnCreate(pAnnot);
         }
 }
@@ skipping 144 matching lines @@
         if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE))
         {
                 return pFormFiller->OnLButtonDown(pPageView, pAnnot, nFlags, point);
         }
 
         return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point)
 {
-        ASSERT(pAnnot != NULL);
         ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
-
         CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
-        //      CReader_Page* pPage = pAnnot->GetPage();
-        //      ASSERT(pPage != NULL);
-        CPDFSDK_Document* pDocument = m_pApp->GetCurrentDoc();
-        ASSERT(pDocument != NULL);
+        CPDFSDK_Document* pDocument = m_pApp->GetSDKDocument();
 
         switch (pWidget->GetFieldType())
         {
         case FIELDTYPE_PUSHBUTTON:
         case FIELDTYPE_CHECKBOX:
         case FIELDTYPE_RADIOBUTTON:
                 if (GetViewBBox(pPageView, pAnnot).Contains((int)point.x, (int)point.y))
-                {
                         pDocument->SetFocusAnnot(pAnnot);
-                }
                 break;
         default:
                 pDocument->SetFocusAnnot(pAnnot);
                 break;
         }
 
         FX_BOOL bRet = FALSE;
 
         if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE))
         {
@@ skipping 663 matching lines @@
         ASSERT(pPrivateData != NULL);
         CFFL_PrivateData* pData = (CFFL_PrivateData*)pPrivateData;
         ASSERT(pData->pWidget != NULL);
 
         CFFL_FormFiller* pFormFiller = GetFormFiller(pData->pWidget, FALSE);
         ASSERT(pFormFiller != NULL);
 
         if (!bEditOrList)
                 pFormFiller->OnKeyStroke(bExit);
 }