Cleanup xfa_document_datamerge files

Cleanup xfa_document_datamerge files

This CL moves the static methods into an anonymous namespace, removes default
parameters and moves some other methods only used by this file into the
anonymous namespace.

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

[dsinclair, 2016-07-07 16:16:21]

dsinclair@chromium.org changed reviewers:
+ thestig@chromium.org, weili@chromium.org

[dsinclair, 2016-07-07 16:16:22]

PTAL.

[Lei Zhang, 2016-07-07 19:23:43]

lgtm

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
File xfa/fxfa/parser/xfa_document_datamerger_imp.cpp (right):

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:28: static inline CXFA_Node*
GetFirstChild(CXFA_Node* pDDGroupNode) {
Get rid of the inlines?

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:274: CFX_WideString
wsNormailizeValue;
existing typo

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:476: if (!bForceBind && pNode &&
pNode->HasBindItem())
return (!bForceBind && pNode && pNode->HasBindItem()) ? pNode : nullptr;

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:743: int32_t iMax = 1, iInit =
1, iMin = 1;
One per line

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:839: (pDataMatch =
FindMatchingDataNode(
Not a fan of assignments in the middle of an if statement.

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:1025: ASSERT(pDataNode);
No need

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:1055: ASSERT(pDataNode);
Ditto

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:1339: break;
Not needed

[dsinclair, 2016-07-07 19:36:16]

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
File xfa/fxfa/parser/xfa_document_datamerger_imp.cpp (right):

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:28: static inline CXFA_Node*
GetFirstChild(CXFA_Node* pDDGroupNode) {
On 2016/07/07 19:23:42, Lei Zhang wrote:
> Get rid of the inlines?

Done.

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:274: CFX_WideString
wsNormailizeValue;
On 2016/07/07 19:23:42, Lei Zhang wrote:
> existing typo

Done.

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:476: if (!bForceBind && pNode &&
pNode->HasBindItem())
On 2016/07/07 19:23:42, Lei Zhang wrote:
> return (!bForceBind && pNode && pNode->HasBindItem()) ? pNode : nullptr;

Done, had to flip the logic around.

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:743: int32_t iMax = 1, iInit =
1, iMin = 1;
On 2016/07/07 19:23:43, Lei Zhang wrote:
> One per line

Done.

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:839: (pDataMatch =
FindMatchingDataNode(
On 2016/07/07 19:23:42, Lei Zhang wrote:
> Not a fan of assignments in the middle of an if statement.

Done.

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:1025: ASSERT(pDataNode);
On 2016/07/07 19:23:42, Lei Zhang wrote:
> No need

Done.

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:1055: ASSERT(pDataNode);
On 2016/07/07 19:23:42, Lei Zhang wrote:
> Ditto

Done.

https://codereview.chromium.org/2122373003/diff/1/xfa/fxfa/parser/xfa_documen...
xfa/fxfa/parser/xfa_document_datamerger_imp.cpp:1339: break;
On 2016/07/07 19:23:42, Lei Zhang wrote:
> Not needed

Done.

[dsinclair, 2016-07-07 19:36:20]

The CQ bit was checked by dsinclair@chromium.org

[dsinclair, 2016-07-07 19:36:20]

The patchset sent to the CQ was uploaded after l-g-t-m from thestig@chromium.org
Link to the patchset: https://codereview.chromium.org/2122373003/#ps40001
(title: "Add else")

[commit-bot: I haz the power, 2016-07-07 19:36:24]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-07 19:56:20]

Description was changed from

==========
Cleanup xfa_document_datamerge files

This CL moves the static methods into an anonymous namespace, removes default
parameters and moves some other methods only used by this file into the
anonymous namespace.
==========

to

==========
Cleanup xfa_document_datamerge files

This CL moves the static methods into an anonymous namespace, removes default
parameters and moves some other methods only used by this file into the
anonymous namespace.

Committed:
https://pdfium.googlesource.com/pdfium/+/f1494f0f8a202b5a5437c987ba1509688071...
==========

[commit-bot: I haz the power, 2016-07-07 19:56:21]

Committed patchset #3 (id:40001) as
https://pdfium.googlesource.com/pdfium/+/f1494f0f8a202b5a5437c987ba1509688071...