Use FXFONT defines in place of integers.

Use FXFONT defines in place of integers.

Fix nits along the way.

Committed: https://pdfium.googlesource.com/pdfium/+/907a5223ea5abd09878de20cc74c59ebd0d6c3c8

[Lei Zhang, 2016-06-21 20:31:07]

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

[Lei Zhang, 2016-06-21 20:31:08]

Whoever gets to it first.

[Lei Zhang, 2016-06-21 20:32:32]

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

https://codereview.chromium.org/2083943003/diff/40001/core/fxge/include/fx_fo...
core/fxge/include/fx_font.h:46: #define FXFONT_ANSI_CHARSET 0
A follow up CL will replace these with an enum, and consolidate redundant
#defines.

[dsinclair, 2016-06-21 20:43:38]

lgtm w/ nits.

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

https://codereview.chromium.org/2083943003/diff/40001/core/fxge/include/fx_fo...
core/fxge/include/fx_font.h:46: #define FXFONT_ANSI_CHARSET 0
On 2016/06/21 20:32:32, Lei Zhang wrote:
> A follow up CL will replace these with an enum, and consolidate redundant
> #defines.

Can they be an enum class instead of a plain enum?

https://codereview.chromium.org/2083943003/diff/40001/fpdfsdk/fpdf_sysfontinf...
File fpdfsdk/fpdf_sysfontinfo.cpp (right):

https://codereview.chromium.org/2083943003/diff/40001/fpdfsdk/fpdf_sysfontinf...
fpdfsdk/fpdf_sysfontinfo.cpp:87: DLLEXPORT void STDCALL
FPDF_AddInstalledFont(void* mapper,
Would be be possible in a followup to change this to be CFX_FontMapper instead
of void*?

https://codereview.chromium.org/2083943003/diff/40001/xfa/fgas/font/fgas_gefo...
File xfa/fgas/font/fgas_gefont.cpp (right):

https://codereview.chromium.org/2083943003/diff/40001/xfa/fgas/font/fgas_gefo...
xfa/fgas/font/fgas_gefont.cpp:209: FX_BOOL bRet = m_pFont->LoadEmbedded(pBuffer,
length);
if (!m_pFont->LoadEmbedded(pBuffer, length))
  return FALSE;
return InitFont();

[Lei Zhang, 2016-06-21 20:46:36]

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

https://codereview.chromium.org/2083943003/diff/40001/core/fxge/include/fx_fo...
core/fxge/include/fx_font.h:46: #define FXFONT_ANSI_CHARSET 0
On 2016/06/21 20:43:38, dsinclair wrote:
> On 2016/06/21 20:32:32, Lei Zhang wrote:
> > A follow up CL will replace these with an enum, and consolidate redundant
> > #defines.
> 
> Can they be an enum class instead of a plain enum?

That is the plan.

https://codereview.chromium.org/2083943003/diff/40001/fpdfsdk/fpdf_sysfontinf...
File fpdfsdk/fpdf_sysfontinfo.cpp (right):

https://codereview.chromium.org/2083943003/diff/40001/fpdfsdk/fpdf_sysfontinf...
fpdfsdk/fpdf_sysfontinfo.cpp:87: DLLEXPORT void STDCALL
FPDF_AddInstalledFont(void* mapper,
On 2016/06/21 20:43:38, dsinclair wrote:
> Would be be possible in a followup to change this to be CFX_FontMapper instead
> of void*?

No. FPDF_AddInstalledFont() is a public API, so it cannot expose CFX classes.

https://codereview.chromium.org/2083943003/diff/40001/xfa/fgas/font/fgas_gefo...
File xfa/fgas/font/fgas_gefont.cpp (right):

https://codereview.chromium.org/2083943003/diff/40001/xfa/fgas/font/fgas_gefo...
xfa/fgas/font/fgas_gefont.cpp:209: FX_BOOL bRet = m_pFont->LoadEmbedded(pBuffer,
length);
On 2016/06/21 20:43:38, dsinclair wrote:
> if (!m_pFont->LoadEmbedded(pBuffer, length))
>   return FALSE;
> return InitFont();

Done.

[Lei Zhang, 2016-06-21 21:24:36]

The CQ bit was checked by thestig@chromium.org

[Lei Zhang, 2016-06-21 21:24:37]

The patchset sent to the CQ was uploaded after l-g-t-m from
dsinclair@chromium.org
Link to the patchset: https://codereview.chromium.org/2083943003/#ps60001
(title: "nits")

[commit-bot: I haz the power, 2016-06-21 21:24:48]

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

[commit-bot: I haz the power, 2016-06-21 21:38:30]

Description was changed from

==========
Use FXFONT defines in place of integers.

Fix nits along the way.
==========

to

==========
Use FXFONT defines in place of integers.

Fix nits along the way.

Committed:
https://pdfium.googlesource.com/pdfium/+/907a5223ea5abd09878de20cc74c59ebd0d6...
==========

[commit-bot: I haz the power, 2016-06-21 21:38:32]

Committed patchset #4 (id:60001) as
https://pdfium.googlesource.com/pdfium/+/907a5223ea5abd09878de20cc74c59ebd0d6...