Remove NULL in xfa/

Remove NULL in xfa/

This CL converts all NULL's to nullptr. All instances of comparison to nullptr
have been removed.

Committed: https://pdfium.googlesource.com/pdfium/+/85d1f2c2f9f1e746bedb1b6f03576613f54fbc27

[dsinclair, 2016-06-23 15:38:04]

Patchset #1 (id:1) has been deleted

[dsinclair, 2016-06-23 15:53:27]

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

[dsinclair, 2016-06-23 15:53:28]

PTAL.

There maybe a bot failure on Windows, there are warnings on there which don't
appear on Linux. The fix will be to add some != or == nullptr's back into
various conditional expressions.

[Lei Zhang, 2016-06-23 17:44:06]

Got red bots still.

I was holding off on this because there was a lot of churn in XFA.

[Lei Zhang, 2016-06-23 17:56:00]

Still looking...

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/crt/fgas_strea...
File xfa/fgas/crt/fgas_stream.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/crt/fgas_strea...
xfa/fgas/crt/fgas_stream.cpp:1085: int32_t iBytes = !pByteSize ? iMaxLength * 2
: *pByteSize;
flip? ditto below

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/crt/fgas_utils...
File xfa/fgas/crt/fgas_utils.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/crt/fgas_utils...
xfa/fgas/crt/fgas_utils.cpp:299: if (!p) {
I think we can call free() on nullptr.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/crt/fgas_utils.h
File xfa/fgas/crt/fgas_utils.h (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/crt/fgas_utils...
xfa/fgas/crt/fgas_utils.h:381: return !p ? (baseType&)defValue : *p;
flip

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/font/fgas_stdf...
File xfa/fgas/font/fgas_stdfontmgr.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/font/fgas_stdf...
xfa/fgas/font/fgas_stdfontmgr.cpp:62: pFD = FindFont(pszFontFamily,
dwFontStyles, TRUE, wCodePage);
Do you want to do what I did in
https://codereview.chromium.org/2031873003/diff/100001/xfa/fgas/font/fgas_std...
?

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/font/fgas_stdf...
xfa/fgas/font/fgas_stdfontmgr.cpp:150: if (!pFD) {
Ditto

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/font/fgas_stdf...
xfa/fgas/font/fgas_stdfontmgr.cpp:495: m_FolderQueue.GetSize() == 0
flip the logic?

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_rt...
File xfa/fgas/layout/fgas_rtfbreak.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_rt...
xfa/fgas/layout/fgas_rtfbreak.cpp:305: if (!pRTFLine) {
ternary operator?

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_rt...
xfa/fgas/layout/fgas_rtfbreak.cpp:1113: if (!pRTFPieces) {
ternary

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_rt...
File xfa/fgas/layout/fgas_rtfbreak.h (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_rt...
xfa/fgas/layout/fgas_rtfbreak.h:198: if (pUnknown)
Just get rid of |pUnknown| ?

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_te...
File xfa/fgas/layout/fgas_textbreak.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_te...
xfa/fgas/layout/fgas_textbreak.cpp:290: } else if (m_iReady == 2) {
get rid of the else after returns

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_te...
xfa/fgas/layout/fgas_textbreak.cpp:1128: return !pTxtLine ? 0 :
pTxtLine->CountChars();
flip

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_te...
xfa/fgas/layout/fgas_textbreak.cpp:1132: if (!pTxtPieces) {
ternary

[Lei Zhang, 2016-06-23 18:21:45]

Almost done...

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_comboboximp.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_comboboximp.cpp:878: } else {
else after return

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
File xfa/fwl/lightwidget/cfwl_combobox.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
xfa/fwl/lightwidget/cfwl_combobox.cpp:174: return pItem->m_pData;
ternary

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
xfa/fwl/lightwidget/cfwl_combobox.cpp:362: return
static_cast<CFWL_ComboBoxItem*>(pItem)->m_pData;
ternary

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
xfa/fwl/lightwidget/cfwl_combobox.cpp:401: return
static_cast<CFWL_ComboBoxItem*>(pItem)->m_pDIB;
ternary

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
File xfa/fwl/lightwidget/cfwl_listbox.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
xfa/fwl/lightwidget/cfwl_listbox.cpp:169: return
static_cast<CFWL_ListItem*>(pItem)->m_pData;
ternary

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
xfa/fwl/lightwidget/cfwl_listbox.cpp:278: return
static_cast<CFWL_ListItem*>(pItem)->m_pData;
ternary

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_ffapp.cpp
File xfa/fxfa/app/xfa_ffapp.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_ffapp....
xfa/fxfa/app/xfa_ffapp.cpp:120: CXFA_FFDoc* pDoc = new CXFA_FFDoc(this,
pProvider);
unique_ptr here and below?

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_ffdocv...
File xfa/fxfa/app/xfa_ffdocview.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_ffdocv...
xfa/fxfa/app/xfa_ffdocview.cpp:321: return new CXFA_WidgetAccIterator(this,
pFormRoot);
ternary

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_ffdocv...
xfa/fxfa/app/xfa_ffdocview.cpp:773: if (!nodeValue) {
flip

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_fontmg...
File xfa/fxfa/app/xfa_fontmgr.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_fontmg...
xfa/fxfa/app/xfa_fontmgr.cpp:1801: if (!pFont)
braces

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
File xfa/fxfa/parser/xfa_layout_itemlayout.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_itemlayout.cpp:2010: CXFA_Node *pOverflowLeaderNode =
nullptr, *pOverflowTrailerNode = nullptr,
One per line

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_itemlayout.cpp:2151: CXFA_Node *pTempLeaderNode =
nullptr, *pTempTrailerNode = nullptr;
One per line

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_itemlayout.cpp:2198: CXFA_Node *pTempLeaderNode =
nullptr, *pTempTrailerNode = nullptr;
One per line

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_itemlayout.cpp:2465: CXFA_Node *pLeaderNode =
nullptr, *pTrailerNode = nullptr;
One per line

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_itemlayout.cpp:2503: CXFA_Node *pLeaderNode =
nullptr, *pTrailerNode = nullptr;
One per line

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
File xfa/fxfa/parser/xfa_layout_itemlayout.h (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_itemlayout.h:82: inline FX_BOOL HasLayoutItem() {
return !!m_pLayoutItem; }
no inline

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
File xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp:840: CXFA_Node *pLeaderTemplate =
nullptr, *pTrailerTemplate = nullptr;
One per line

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp:941: } else if
(pOverflowNode->GetElementType() == XFA_Element::Overflow) {
else after return

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp:985: CXFA_Node *pLeaderTemplate =
nullptr, *pTrailerTemplate = nullptr;
One per line

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp:1157: CXFA_Node *pPreferredPageArea =
nullptr, *pFallbackPageArea = nullptr;
Ditto

[Lei Zhang, 2016-06-23 18:27:41]

Windows bots still dislike you.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/cxfa_wi...
File xfa/fxfa/parser/cxfa_widgetdata.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/cxfa_wi...
xfa/fxfa/parser/cxfa_widgetdata.cpp:1467: return pLocale;
just return nullptr

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/cxfa_wi...
xfa/fxfa/parser/cxfa_widgetdata.cpp:1471: bLocale =
m_pNode->GetLocaleName(wsLocaleName);
Just get rid of the variable and return nullptr if false

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_bas...
File xfa/fxfa/parser/xfa_basic_data.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_bas...
xfa/fxfa/parser/xfa_basic_data.cpp:324: (void*)nullptr},
Get rid of the casts.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_doc...
File xfa/fxfa/parser/xfa_document_imp.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_doc...
xfa/fxfa/parser/xfa_document_imp.cpp:109: return nullptr;
Funny indentation heer.

[dsinclair, 2016-06-23 18:46:54]

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/crt/fgas_strea...
File xfa/fgas/crt/fgas_stream.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/crt/fgas_strea...
xfa/fgas/crt/fgas_stream.cpp:1085: int32_t iBytes = !pByteSize ? iMaxLength * 2
: *pByteSize;
On 2016/06/23 17:56:00, Lei Zhang (Slow) wrote:
> flip? ditto below

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/crt/fgas_utils...
File xfa/fgas/crt/fgas_utils.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/crt/fgas_utils...
xfa/fgas/crt/fgas_utils.cpp:299: if (!p) {
On 2016/06/23 17:56:00, Lei Zhang (Slow) wrote:
> I think we can call free() on nullptr.

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/crt/fgas_utils.h
File xfa/fgas/crt/fgas_utils.h (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/crt/fgas_utils...
xfa/fgas/crt/fgas_utils.h:381: return !p ? (baseType&)defValue : *p;
On 2016/06/23 17:56:00, Lei Zhang (Slow) wrote:
> flip

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/font/fgas_stdf...
File xfa/fgas/font/fgas_stdfontmgr.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/font/fgas_stdf...
xfa/fgas/font/fgas_stdfontmgr.cpp:62: pFD = FindFont(pszFontFamily,
dwFontStyles, TRUE, wCodePage);
On 2016/06/23 17:56:00, Lei Zhang (Slow) wrote:
> Do you want to do what I did in
>
https://codereview.chromium.org/2031873003/diff/100001/xfa/fgas/font/fgas_std...
> ?

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/font/fgas_stdf...
xfa/fgas/font/fgas_stdfontmgr.cpp:150: if (!pFD) {
On 2016/06/23 17:56:00, Lei Zhang (Slow) wrote:
> Ditto

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/font/fgas_stdf...
xfa/fgas/font/fgas_stdfontmgr.cpp:495: m_FolderQueue.GetSize() == 0
On 2016/06/23 17:56:00, Lei Zhang (Slow) wrote:
> flip the logic?

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_rt...
File xfa/fgas/layout/fgas_rtfbreak.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_rt...
xfa/fgas/layout/fgas_rtfbreak.cpp:305: if (!pRTFLine) {
On 2016/06/23 17:56:00, Lei Zhang (Slow) wrote:
> ternary operator?

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_rt...
xfa/fgas/layout/fgas_rtfbreak.cpp:1113: if (!pRTFPieces) {
On 2016/06/23 17:56:00, Lei Zhang (Slow) wrote:
> ternary

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_rt...
File xfa/fgas/layout/fgas_rtfbreak.h (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_rt...
xfa/fgas/layout/fgas_rtfbreak.h:198: if (pUnknown)
On 2016/06/23 17:56:00, Lei Zhang (Slow) wrote:
> Just get rid of |pUnknown| ?

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_te...
File xfa/fgas/layout/fgas_textbreak.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_te...
xfa/fgas/layout/fgas_textbreak.cpp:290: } else if (m_iReady == 2) {
On 2016/06/23 17:56:00, Lei Zhang (Slow) wrote:
> get rid of the else after returns

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_te...
xfa/fgas/layout/fgas_textbreak.cpp:1128: return !pTxtLine ? 0 :
pTxtLine->CountChars();
On 2016/06/23 17:56:00, Lei Zhang (Slow) wrote:
> flip

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fgas/layout/fgas_te...
xfa/fgas/layout/fgas_textbreak.cpp:1132: if (!pTxtPieces) {
On 2016/06/23 17:56:00, Lei Zhang (Slow) wrote:
> ternary

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/basewidget/fwl_...
File xfa/fwl/basewidget/fwl_comboboximp.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/basewidget/fwl_...
xfa/fwl/basewidget/fwl_comboboximp.cpp:878: } else {
On 2016/06/23 18:21:44, Lei Zhang (Slow) wrote:
> else after return

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
File xfa/fwl/lightwidget/cfwl_combobox.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
xfa/fwl/lightwidget/cfwl_combobox.cpp:174: return pItem->m_pData;
On 2016/06/23 18:21:44, Lei Zhang (Slow) wrote:
> ternary

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
xfa/fwl/lightwidget/cfwl_combobox.cpp:362: return
static_cast<CFWL_ComboBoxItem*>(pItem)->m_pData;
On 2016/06/23 18:21:44, Lei Zhang (Slow) wrote:
> ternary

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
xfa/fwl/lightwidget/cfwl_combobox.cpp:401: return
static_cast<CFWL_ComboBoxItem*>(pItem)->m_pDIB;
On 2016/06/23 18:21:44, Lei Zhang (Slow) wrote:
> ternary

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
File xfa/fwl/lightwidget/cfwl_listbox.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
xfa/fwl/lightwidget/cfwl_listbox.cpp:169: return
static_cast<CFWL_ListItem*>(pItem)->m_pData;
On 2016/06/23 18:21:44, Lei Zhang (Slow) wrote:
> ternary

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fwl/lightwidget/cfw...
xfa/fwl/lightwidget/cfwl_listbox.cpp:278: return
static_cast<CFWL_ListItem*>(pItem)->m_pData;
On 2016/06/23 18:21:44, Lei Zhang (Slow) wrote:
> ternary

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_ffapp.cpp
File xfa/fxfa/app/xfa_ffapp.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_ffapp....
xfa/fxfa/app/xfa_ffapp.cpp:120: CXFA_FFDoc* pDoc = new CXFA_FFDoc(this,
pProvider);
On 2016/06/23 18:21:44, Lei Zhang (Slow) wrote:
> unique_ptr here and below?

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_ffdocv...
File xfa/fxfa/app/xfa_ffdocview.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_ffdocv...
xfa/fxfa/app/xfa_ffdocview.cpp:321: return new CXFA_WidgetAccIterator(this,
pFormRoot);
On 2016/06/23 18:21:44, Lei Zhang (Slow) wrote:
> ternary

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_ffdocv...
xfa/fxfa/app/xfa_ffdocview.cpp:773: if (!nodeValue) {
On 2016/06/23 18:21:44, Lei Zhang (Slow) wrote:
> flip

ternery.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_fontmg...
File xfa/fxfa/app/xfa_fontmgr.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/app/xfa_fontmg...
xfa/fxfa/app/xfa_fontmgr.cpp:1801: if (!pFont)
On 2016/06/23 18:21:44, Lei Zhang (Slow) wrote:
> braces

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/cxfa_wi...
File xfa/fxfa/parser/cxfa_widgetdata.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/cxfa_wi...
xfa/fxfa/parser/cxfa_widgetdata.cpp:1467: return pLocale;
On 2016/06/23 18:27:41, Lei Zhang (Slow) wrote:
> just return nullptr

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/cxfa_wi...
xfa/fxfa/parser/cxfa_widgetdata.cpp:1471: bLocale =
m_pNode->GetLocaleName(wsLocaleName);
On 2016/06/23 18:27:41, Lei Zhang (Slow) wrote:
> Just get rid of the variable and return nullptr if false

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_bas...
File xfa/fxfa/parser/xfa_basic_data.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_bas...
xfa/fxfa/parser/xfa_basic_data.cpp:324: (void*)nullptr},
On 2016/06/23 18:27:41, Lei Zhang (Slow) wrote:
> Get rid of the casts.

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_doc...
File xfa/fxfa/parser/xfa_document_imp.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_doc...
xfa/fxfa/parser/xfa_document_imp.cpp:109: return nullptr;
On 2016/06/23 18:27:41, Lei Zhang (Slow) wrote:
> Funny indentation heer.

It's the wacky {} thing they do were they put the break or return outside the
{}'s. So, technically this is the right indentation, just the code is wacky.
Fixed.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
File xfa/fxfa/parser/xfa_layout_itemlayout.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_itemlayout.cpp:2010: CXFA_Node *pOverflowLeaderNode =
nullptr, *pOverflowTrailerNode = nullptr,
On 2016/06/23 18:21:45, Lei Zhang (Slow) wrote:
> One per line

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_itemlayout.cpp:2151: CXFA_Node *pTempLeaderNode =
nullptr, *pTempTrailerNode = nullptr;
On 2016/06/23 18:21:45, Lei Zhang (Slow) wrote:
> One per line

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_itemlayout.cpp:2198: CXFA_Node *pTempLeaderNode =
nullptr, *pTempTrailerNode = nullptr;
On 2016/06/23 18:21:45, Lei Zhang (Slow) wrote:
> One per line

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_itemlayout.cpp:2465: CXFA_Node *pLeaderNode =
nullptr, *pTrailerNode = nullptr;
On 2016/06/23 18:21:45, Lei Zhang (Slow) wrote:
> One per line

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_itemlayout.cpp:2503: CXFA_Node *pLeaderNode =
nullptr, *pTrailerNode = nullptr;
On 2016/06/23 18:21:45, Lei Zhang (Slow) wrote:
> One per line

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
File xfa/fxfa/parser/xfa_layout_itemlayout.h (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_itemlayout.h:82: inline FX_BOOL HasLayoutItem() {
return !!m_pLayoutItem; }
On 2016/06/23 18:21:45, Lei Zhang (Slow) wrote:
> no inline

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
File xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp (right):

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp:840: CXFA_Node *pLeaderTemplate =
nullptr, *pTrailerTemplate = nullptr;
On 2016/06/23 18:21:45, Lei Zhang (Slow) wrote:
> One per line

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp:941: } else if
(pOverflowNode->GetElementType() == XFA_Element::Overflow) {
On 2016/06/23 18:21:45, Lei Zhang (Slow) wrote:
> else after return

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp:985: CXFA_Node *pLeaderTemplate =
nullptr, *pTrailerTemplate = nullptr;
On 2016/06/23 18:21:45, Lei Zhang (Slow) wrote:
> One per line

Done.

https://codereview.chromium.org/2095653002/diff/80001/xfa/fxfa/parser/xfa_lay...
xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp:1157: CXFA_Node *pPreferredPageArea =
nullptr, *pFallbackPageArea = nullptr;
On 2016/06/23 18:21:45, Lei Zhang (Slow) wrote:
> Ditto

Done.

[Lei Zhang, 2016-06-23 18:56:05]

lgtm

[Lei Zhang, 2016-06-23 18:56:59]

Except you still have more Windows failures due to removing "!= nullptr" in
while statements.

[dsinclair, 2016-06-23 19:00:40]

The CQ bit was checked by dsinclair@chromium.org

[dsinclair, 2016-06-23 19:00:41]

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/2095653002/#ps140001
(title: "more windows")

[commit-bot: I haz the power, 2016-06-23 19:00:52]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2095653002/140001

[dsinclair, 2016-06-23 19:01:29]

The CQ bit was unchecked by dsinclair@chromium.org

[dsinclair, 2016-06-23 19:34:37]

The CQ bit was checked by dsinclair@chromium.org

[dsinclair, 2016-06-23 19:34:38]

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/2095653002/#ps160001
(title: "Rebase to master")

[commit-bot: I haz the power, 2016-06-23 19:34:47]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2095653002/160001

[commit-bot: I haz the power, 2016-06-23 19:40:21]

Description was changed from

==========
Remove NULL in xfa/

This CL converts all NULL's to nullptr. All instances of comparison to nullptr
have been removed.
==========

to

==========
Remove NULL in xfa/

This CL converts all NULL's to nullptr. All instances of comparison to nullptr
have been removed.

Committed:
https://pdfium.googlesource.com/pdfium/+/85d1f2c2f9f1e746bedb1b6f03576613f54f...
==========

[commit-bot: I haz the power, 2016-06-23 19:40:22]

Committed patchset #8 (id:160001) as
https://pdfium.googlesource.com/pdfium/+/85d1f2c2f9f1e746bedb1b6f03576613f54f...