Manual fixups to PDF_ENABLE_XFA in core/

Manual fixups to PDF_ENABLE_XFA in core/

R=thestig@chromium.org

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

[Tom Sepez, 2015-11-25 21:42:39]

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

[Tom Sepez, 2015-11-25 21:42:40]

Lei, ready for review.

[Lei Zhang, 2015-11-25 21:49:01]

https://codereview.chromium.org/1477663003/diff/20001/core/include/fxcodec/fx...
File core/include/fxcodec/fx_codec.h (right):

https://codereview.chromium.org/1477663003/diff/20001/core/include/fxcodec/fx...
core/include/fxcodec/fx_codec.h:13: #include
"core/include/fxcrt/fx_coordinates.h"  // For FX_RECT.
after fx_basic

https://codereview.chromium.org/1477663003/diff/20001/core/include/fxge/fx_fo...
File core/include/fxge/fx_font.h (right):

https://codereview.chromium.org/1477663003/diff/20001/core/include/fxge/fx_fo...
core/include/fxge/fx_font.h:82: CFX_SubstFont* GetSubstFont() const { return
m_pSubstFont; }
For another CL: I wonder if we can make this match non-XFA below.

https://codereview.chromium.org/1477663003/diff/20001/core/src/fpdftext/fpdf_...
File core/src/fpdftext/fpdf_text_int.cpp (right):

https://codereview.chromium.org/1477663003/diff/20001/core/src/fpdftext/fpdf_...
core/src/fpdftext/fpdf_text_int.cpp:1528: #ifndef PDF_ENABLE_XFA
Can we flip these to #ifdef PDF_ENABLE_XFA instead? (And move the code block
around, of course) Maybe in another CL?

[Tom Sepez, 2015-11-25 22:05:07]

https://codereview.chromium.org/1477663003/diff/20001/core/include/fxcodec/fx...
File core/include/fxcodec/fx_codec.h (right):

https://codereview.chromium.org/1477663003/diff/20001/core/include/fxcodec/fx...
core/include/fxcodec/fx_codec.h:13: #include
"core/include/fxcrt/fx_coordinates.h"  // For FX_RECT.
On 2015/11/25 21:49:01, Lei Zhang wrote:
> after fx_basic

Done. Also added full path for fx_codec_def and re-sorted.

https://codereview.chromium.org/1477663003/diff/20001/core/include/fxge/fx_fo...
File core/include/fxge/fx_font.h (right):

https://codereview.chromium.org/1477663003/diff/20001/core/include/fxge/fx_fo...
core/include/fxge/fx_font.h:82: CFX_SubstFont* GetSubstFont() const { return
m_pSubstFont; }
On 2015/11/25 21:49:01, Lei Zhang wrote:
> For another CL: I wonder if we can make this match non-XFA below.

Yup, it touched a few places.

https://codereview.chromium.org/1477663003/diff/20001/core/src/fpdftext/fpdf_...
File core/src/fpdftext/fpdf_text_int.cpp (right):

https://codereview.chromium.org/1477663003/diff/20001/core/src/fpdftext/fpdf_...
core/src/fpdftext/fpdf_text_int.cpp:1528: #ifndef PDF_ENABLE_XFA
On 2015/11/25 21:49:01, Lei Zhang wrote:
> Can we flip these to #ifdef PDF_ENABLE_XFA instead? (And move the code block
> around, of course) Maybe in another CL?

I made a new version of this file by importing the entire diffing range from one
into the other.  The ifdefs straddle too many function boundaries, etc.

[Tom Sepez, 2015-11-25 22:20:25]

Lei, look at the diff between #6 and #5.  That's the version we want to go with.

[Tom Sepez, 2015-11-25 22:23:56]

Better question: are these equivalent?  Can we just go with the master code?

[Tom Sepez, 2015-11-25 22:41:30]

And they are.  So PS8 is same.

Lei, PS8 ready for review.

[Lei Zhang, 2015-11-25 23:32:33]

lgtm

Looks like there was another CL of mine that didn't get merged. The code looks
strangely familiar.

[Tom Sepez, 2015-11-25 23:52:31]

Description was changed from

==========
Manual fixups to PDF_ENABLE_XFA in core/
==========

to

==========
Manual fixups to PDF_ENABLE_XFA in core/

R=thestig@chromium.org

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

[Tom Sepez, 2015-11-25 23:52:32]

Committed patchset #8 (id:140001) manually as
a2c42ce6150c4072613a6fc9fa0dc064dbf0a15d (presubmit successful).