Merge to XFA: Tidy up CPDFDOC_Environment.

Merge to XFA: Tidy up CPDFDOC_Environment.

Original Review URL: https://codereview.chromium.org/1235393002 .
(cherry picked from commit fb07e2843dad0774d5842c2b08e7792164efc14a)

R=thestig@chromium.org

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

[Tom Sepez, 2015-07-16 19:42:32]

Lei, for review, horrendous merge, some new methods changed.

[Lei Zhang, 2015-07-16 21:12:16]

Urge to clang-format.... raising.

https://codereview.chromium.org/1244503002/diff/20001/fpdfsdk/src/fpdfformfil...
File fpdfsdk/src/fpdfformfill.cpp (left):

https://codereview.chromium.org/1244503002/diff/20001/fpdfsdk/src/fpdfformfil...
fpdfsdk/src/fpdfformfill.cpp:102: if(pEnv->GetPDFXFADocument())
This block of code went missing

https://codereview.chromium.org/1244503002/diff/20001/fpdfsdk/src/fpdfformfil...
File fpdfsdk/src/fpdfformfill.cpp (right):

https://codereview.chromium.org/1244503002/diff/20001/fpdfsdk/src/fpdfformfil...
fpdfsdk/src/fpdfformfill.cpp:112: if (!document || !formInfo ||
formInfo->version != 1)
This changed from 2 to 1

https://codereview.chromium.org/1244503002/diff/20001/fpdfsdk/src/fpdfformfil...
fpdfsdk/src/fpdfformfill.cpp:249: CFX_SkiaDevice* pDevice = FX_NEW
CFX_SkiaDevice;
Not going to put in a unique_ptr here?

[Tom Sepez, 2015-07-16 21:39:05]

https://codereview.chromium.org/1244503002/diff/20001/fpdfsdk/src/fpdfformfil...
File fpdfsdk/src/fpdfformfill.cpp (left):

https://codereview.chromium.org/1244503002/diff/20001/fpdfsdk/src/fpdfformfil...
fpdfsdk/src/fpdfformfill.cpp:102: if(pEnv->GetPDFXFADocument())
On 2015/07/16 21:12:15, Lei Zhang wrote:
> This block of code went missing
It should be covered by line 117 in the new code.

pEnv->GetPDFXFADocument() just returns the pDocument we passed in at creation
time.  We know its not null or we would have bailed at [new] line 112. So this
becomes if (1) { ... }

Next, even if pSDKDoc is NULL, we just created the pEnv with a NULL placeholder,
so assigning NULL over null doesn't matter.  So lose this if block.

Lastly, move it higher since it doesnt use the pApp.

https://codereview.chromium.org/1244503002/diff/20001/fpdfsdk/src/fpdfformfil...
File fpdfsdk/src/fpdfformfill.cpp (right):

https://codereview.chromium.org/1244503002/diff/20001/fpdfsdk/src/fpdfformfil...
fpdfsdk/src/fpdfformfill.cpp:112: if (!document || !formInfo ||
formInfo->version != 1)
On 2015/07/16 21:12:15, Lei Zhang wrote:
> This changed from 2 to 1
Nice catch.

https://codereview.chromium.org/1244503002/diff/20001/fpdfsdk/src/fpdfformfil...
fpdfsdk/src/fpdfformfill.cpp:249: CFX_SkiaDevice* pDevice = FX_NEW
CFX_SkiaDevice;
On 2015/07/16 21:12:15, Lei Zhang wrote:
> Not going to put in a unique_ptr here?

Will do.  This seemed different enough in XFA that I reverted to the XFA  
codebase.

[Lei Zhang, 2015-07-17 00:51:29]

lgtm

[Tom Sepez, 2015-07-17 16:16:22]

Committed patchset #3 (id:40001) manually as
dcbc02f15e767e7d427fe6346d415c48da53afe0 (presubmit successful).