Tidy up CPDFDOC_Environment.

Tidy up CPDFDOC_Environment.

- untabify as encountered.
- Only put single-statement method in .h file, move more
  complex methods to .cpp (counting an if without braces as
  a single statement, killing braces as needed).
- Move invariant arguments to constructor and make
  corresponding members const.
- Make all members private and add accessor methods.
- Make existing accessor methods const where possible.
- Kill meaningless asserts.
- Add helper functions in place of duplicate code.
- Rename GetCurrentDoc() to GetSDKDocument(), since the class
  has two document members, one of CPDF_Document and one of
  CPDFSDK_Document, making it clear which one you get.
- Simplify some logic with early returns.

R=thestig@chromium.org

Committed: https://pdfium.googlesource.com/pdfium/+/fb07e2843dad0774d5842c2b08e7792164efc14a

[Tom Sepez, 2015-07-16 00:16:07]

tsepez@chromium.org changed reviewers:
+ thestig@chromium.org

[Tom Sepez, 2015-07-16 00:16:24]

Lei, another cleanup.  Thanks.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fpdfformfill.cpp
File fpdfsdk/src/fpdfformfill.cpp (left):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fpdfformfill.cp...
fpdfsdk/src/fpdfformfill.cpp:43: if (CPDF_Document* pEnvDocument =
pEnv->GetPDFDocument())
Note: this just returns the thing we just passed to the ctor.

[Lei Zhang, 2015-07-16 17:05:06]

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
File fpdfsdk/src/formfiller/FFL_FormFiller.cpp (right):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:21: :m_pApp(pApp),
space after ':'

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:22: m_pAnnot(pAnnot),
nit: indentation

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:84: CFX_RenderDevice* pDevice,
CPDF_Matrix* pUser2Device,
- funny indentation
- remove commented out params?
- ditto below

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:317: ASSERT(m_pWidget != NULL);
remove

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:491: ASSERT(m_pWidget != NULL);
remove

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:569: //  ASSERT(pPageView != NULL);
remove commented out code

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:580: //  FX_RECT rcRet(0,0,0,0);
remove commented out code

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:589: void
CFFL_FormFiller::FFL_FreeData(void* pData)
This is dead code.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:600: //CFFL_IFormFiller* pIFormFiller
= CFFL_Module::GetFormFiller(m_pApp);
remove

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:602: ASSERT(pIFormFiller != NULL);
remove

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:690: //  return NULL;
remove

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:810: ASSERT(pPageView != NULL);
remove

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fpdfformfill.cpp
File fpdfsdk/src/fpdfformfill.cpp (right):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fpdfformfill.cp...
fpdfsdk/src/fpdfformfill.cpp:16: inline CPDFSDK_Document*
FormHandleToSDKDoc(FPDF_FORMHANDLE hHandle)
Do these really need to be inline?

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fpdfformfill.cp...
fpdfsdk/src/fpdfformfill.cpp:30: FX_BOOL bReNew = TRUE)
this is always true

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fsdk_annothandl...
File fpdfsdk/src/fsdk_annothandler.cpp (right):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fsdk_annothandl...
fpdfsdk/src/fsdk_annothandler.cpp:389: CPDFSDK_Document* pSDKDoc =
m_pApp->GetSDKDocument();
kill tabs

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fsdk_annothandl...
fpdfsdk/src/fsdk_annothandler.cpp:399: pWidget->ResetAppearance(NULL, FALSE);
NULL -> nullptr

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fsdk_mgr.cpp
File fpdfsdk/src/fsdk_mgr.cpp (right):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fsdk_mgr.cpp#ne...
fpdfsdk/src/fsdk_mgr.cpp:383: if (!IsJSInitiated())
kill tabs here and below

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fsdk_mgr.cpp#ne...
fpdfsdk/src/fsdk_mgr.cpp:413: m_pInterForm(NULL),
nullptr

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/javascript/JS_O...
File fpdfsdk/src/javascript/JS_Object.cpp (right):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/javascript/JS_O...
fpdfsdk/src/javascript/JS_Object.cpp:22: if (!pApp)
kill the tab

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/javascript/app.cpp
File fpdfsdk/src/javascript/app.cpp (right):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/javascript/app....
fpdfsdk/src/javascript/app.cpp:122: app::app(CJS_Object * pJSObject) :
':' on next line

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/javascript/app....
fpdfsdk/src/javascript/app.cpp:139: if (vp.IsGetting())
if (!vp.IsGetting())
    return FALSE:

// unindent everything else

[Lei Zhang, 2015-07-16 17:05:28]

lgtm since it's all nits

[Tom Sepez, 2015-07-16 18:01:28]

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/include/fsdk_mgr.h
File fpdfsdk/include/fsdk_mgr.h (left):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/include/fsdk_mgr.h#...
fpdfsdk/include/fsdk_mgr.h:39: int RegAppHandle(FPDF_FORMFILLINFO* pFFinfo);
Note to self: RegAppHandle removed, now part of ctor.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
File fpdfsdk/src/formfiller/FFL_FormFiller.cpp (right):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:21: :m_pApp(pApp),
On 2015/07/16 17:05:06, Lei Zhang wrote:
> space after ':'

Done.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:22: m_pAnnot(pAnnot),
On 2015/07/16 17:05:06, Lei Zhang wrote:
> nit: indentation

Done.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:84: CFX_RenderDevice* pDevice,
CPDF_Matrix* pUser2Device,
On 2015/07/16 17:05:06, Lei Zhang wrote:
> - funny indentation
> - remove commented out params?
> - ditto below
Yep, also remove commented out parms in header.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:502: else
note: else after return removed here too.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:569: //  ASSERT(pPageView != NULL);
On 2015/07/16 17:05:06, Lei Zhang wrote:
> remove commented out code

Done.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:580: //  FX_RECT rcRet(0,0,0,0);
On 2015/07/16 17:05:05, Lei Zhang wrote:
> remove commented out code

Done.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:589: void
CFFL_FormFiller::FFL_FreeData(void* pData)
On 2015/07/16 17:05:05, Lei Zhang wrote:
> This is dead code.
removed and also in header.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:690: //  return NULL;
On 2015/07/16 17:05:05, Lei Zhang wrote:
> remove

Done.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/formfiller/FFL_...
fpdfsdk/src/formfiller/FFL_FormFiller.cpp:807: CFX_RenderDevice* pDevice,
CPDF_Matrix* pUser2Device,
note: killed commented params.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fpdfformfill.cpp
File fpdfsdk/src/fpdfformfill.cpp (right):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fpdfformfill.cp...
fpdfsdk/src/fpdfformfill.cpp:16: inline CPDFSDK_Document*
FormHandleToSDKDoc(FPDF_FORMHANDLE hHandle)
On 2015/07/16 17:05:06, Lei Zhang wrote:
> Do these really need to be inline?

Done.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fpdfformfill.cp...
fpdfsdk/src/fpdfformfill.cpp:30: FX_BOOL bReNew = TRUE)
On 2015/07/16 17:05:06, Lei Zhang wrote:
> this is always true
So it is ... done.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fsdk_annothandl...
File fpdfsdk/src/fsdk_annothandler.cpp (right):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fsdk_annothandl...
fpdfsdk/src/fsdk_annothandler.cpp:389: CPDFSDK_Document* pSDKDoc =
m_pApp->GetSDKDocument();
On 2015/07/16 17:05:06, Lei Zhang wrote:
> kill tabs

Untabified file.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fsdk_annothandl...
fpdfsdk/src/fsdk_annothandler.cpp:399: pWidget->ResetAppearance(NULL, FALSE);
On 2015/07/16 17:05:06, Lei Zhang wrote:
> NULL -> nullptr

Done.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fsdk_mgr.cpp
File fpdfsdk/src/fsdk_mgr.cpp (right):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/fsdk_mgr.cpp#ne...
fpdfsdk/src/fsdk_mgr.cpp:383: if (!IsJSInitiated())
On 2015/07/16 17:05:06, Lei Zhang wrote:
> kill tabs here and below
Untabified file.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/javascript/JS_O...
File fpdfsdk/src/javascript/JS_Object.cpp (right):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/javascript/JS_O...
fpdfsdk/src/javascript/JS_Object.cpp:22: if (!pApp)
On 2015/07/16 17:05:06, Lei Zhang wrote:
> kill the tab
Untabified file.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/javascript/app.cpp
File fpdfsdk/src/javascript/app.cpp (right):

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/javascript/app....
fpdfsdk/src/javascript/app.cpp:122: app::app(CJS_Object * pJSObject) :
On 2015/07/16 17:05:06, Lei Zhang wrote:
> ':' on next line

Done.

https://codereview.chromium.org/1235393002/diff/1/fpdfsdk/src/javascript/app....
fpdfsdk/src/javascript/app.cpp:139: if (vp.IsGetting())
On 2015/07/16 17:05:06, Lei Zhang wrote:
> if (!vp.IsGetting())
>     return FALSE:
> 
> // unindent everything else

Done.

[Tom Sepez, 2015-07-16 18:09:16]

Committed patchset #2 (id:20001) manually as
fb07e2843dad0774d5842c2b08e7792164efc14a (presubmit successful).