Remove CJBig2_Object, CJBig2_Module, and friends.

Remove CJBig2_Object, CJBig2_Module, and friends.

R=tsepez@chromium.org

Committed: https://pdfium.googlesource.com/pdfium/+/70f4404e9a9e69afdfdd07715aa946f6561ce0cb

[Lei Zhang, 2015-09-04 01:02:27]

Patchset #1 (id:1) has been deleted

[Lei Zhang, 2015-09-04 01:08:29]

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

[Tom Sepez, 2015-09-04 01:26:47]

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_Context.cpp (right):

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Context.cpp:358:
pSegment->m_pReferred_to_segment_numbers = (FX_DWORD*)FX_Alloc2D(
Hmm.  I think we can use a lower "D" allocator and avoid the cast entirely since
the FX_Alloc() families multiplies by size of type. Wouldn't this just be 
  ... = FX_Alloc(FX_DWORD, pSegment->m_nReferred_to_segment_count);

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp (right):

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp:1567:
(CJBig2_Image**)FX_Alloc2D(uint8_t, SDNUMNEWSYMS, sizeof(CJBig2_Image*));
ditto

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp:1646: SBSYMS =
(CJBig2_Image**)FX_Alloc2D(uint8_t, SBNUMSYMS,
ditto ditto

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp:1741: SBSYMS =
(CJBig2_Image**)FX_Alloc2D(uint8_t, SBNUMSYMS,
ditto ditto ditto
(Many other places in the CL).

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp:1820: delete IADH;
nit: someone needs an unique_ptr.

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_Image.cpp (right):

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Image.cpp:23: m_pData =
(uint8_t*)FX_Alloc2D(uint8_t, m_nStride, m_nHeight);
Nit: redundant cast, right "D" alloc fn.

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Image.cpp:45: JBIG2_memcpy(m_pData, im.m_pData,
m_nStride * m_nHeight);
ditto

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_Segment.h (right):

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Segment.h:10: #include "JBig2_Define.h"
nit: alphabetize (at your own risk).

[Lei Zhang, 2015-09-04 21:35:00]

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_Context.cpp (right):

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Context.cpp:358:
pSegment->m_pReferred_to_segment_numbers = (FX_DWORD*)FX_Alloc2D(
On 2015/09/04 01:26:47, Tom Sepez wrote:
> Hmm.  I think we can use a lower "D" allocator and avoid the cast entirely
since
> the FX_Alloc() families multiplies by size of type. Wouldn't this just be 
>   ... = FX_Alloc(FX_DWORD, pSegment->m_nReferred_to_segment_count);

Sure. This was all straight up JBig2_Malloc2 -> FX_Alloc2D via search and
replace.

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp (right):

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp:1820: delete IADH;
On 2015/09/04 01:26:47, Tom Sepez wrote:
> nit: someone needs an unique_ptr.

Planned in a follow-up, and getting rid of all the gotos.

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_Image.cpp (right):

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Image.cpp:23: m_pData =
(uint8_t*)FX_Alloc2D(uint8_t, m_nStride, m_nHeight);
On 2015/09/04 01:26:47, Tom Sepez wrote:
> Nit: redundant cast, right "D" alloc fn.

done ^ N

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_Segment.h (right):

https://codereview.chromium.org/1326953006/diff/20001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Segment.h:10: #include "JBig2_Define.h"
On 2015/09/04 01:26:47, Tom Sepez wrote:
> nit: alphabetize (at your own risk).

Done.

[Lei Zhang, 2015-09-09 02:53:23]

Any other issues with this CL?

[Tom Sepez, 2015-09-09 18:10:57]

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/codec/...
File core/src/fxcodec/codec/fx_codec_jbig.cpp (right):

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/codec/...
core/src/fxcodec/codec/fx_codec_jbig.cpp:52: JBIG2_EMBED_STREAM,
&m_SymbolDictCache, pPause);
For next time: global_data and src_buf are already uint8_t*, const-qualified
versions.  Casts are thus either unneeded, or const_casts, in which case the
right thing is to make some const untangling ...

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_Context.cpp (right):

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Context.cpp:1590: LENCOUNT = FX_Alloc(int, (LENMAX
+ 1));
nit: redundant ()

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Context.cpp:1592: FIRSTCODE = FX_Alloc(int, (LENMAX
+ 1));
nit: ditto nit.

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_Image.cpp (right):

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Image.cpp:23: m_pData =
(uint8_t*)FX_Alloc2D(uint8_t, m_nStride, m_nHeight);
nit: redundant cast.

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Image.cpp:44: m_pData =
(uint8_t*)FX_Alloc2D(uint8_t, m_nStride, m_nHeight);
nit: redundant cast.

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Image.cpp:225: m_pData =
(uint8_t*)FX_Realloc(uint8_t, m_pData, safeMemSize.ValueOrDie());
nit: redundant cast.

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp (right):

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp:25: dst->SDEXSYMS =
(CJBig2_Image**)FX_Alloc2D(uint8_t, sizeof(CJBig2_Image*),
Missed one:   FX_ALLOC(CJBig2_image*, src->SDNUMEXESYMS)

[Lei Zhang, 2015-09-09 22:49:05]

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/codec/...
File core/src/fxcodec/codec/fx_codec_jbig.cpp (right):

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/codec/...
core/src/fxcodec/codec/fx_codec_jbig.cpp:52: JBIG2_EMBED_STREAM,
&m_SymbolDictCache, pPause);
On 2015/09/09 18:10:56, Tom Sepez wrote:
> For next time: global_data and src_buf are already uint8_t*, const-qualified
> versions.  Casts are thus either unneeded, or const_casts, in which case the
> right thing is to make some const untangling ...

I removed the cast and fixed all the consts in patch set 4.

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_Context.cpp (right):

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Context.cpp:1590: LENCOUNT = FX_Alloc(int, (LENMAX
+ 1));
On 2015/09/09 18:10:57, Tom Sepez wrote:
> nit: redundant ()

Done.

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Context.cpp:1592: FIRSTCODE = FX_Alloc(int, (LENMAX
+ 1));
On 2015/09/09 18:10:56, Tom Sepez wrote:
> nit: ditto nit.

Done.

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_Image.cpp (right):

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Image.cpp:23: m_pData =
(uint8_t*)FX_Alloc2D(uint8_t, m_nStride, m_nHeight);
On 2015/09/09 18:10:57, Tom Sepez wrote:
> nit: redundant cast.

Done.

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Image.cpp:44: m_pData =
(uint8_t*)FX_Alloc2D(uint8_t, m_nStride, m_nHeight);
On 2015/09/09 18:10:57, Tom Sepez wrote:
> nit: redundant cast.

Done.

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_Image.cpp:225: m_pData =
(uint8_t*)FX_Realloc(uint8_t, m_pData, safeMemSize.ValueOrDie());
On 2015/09/09 18:10:57, Tom Sepez wrote:
> nit: redundant cast.

Done.

I'll do another pass over the entire code base after.

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
File core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp (right):

https://codereview.chromium.org/1326953006/diff/40001/core/src/fxcodec/jbig2/...
core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp:25: dst->SDEXSYMS =
(CJBig2_Image**)FX_Alloc2D(uint8_t, sizeof(CJBig2_Image*),
On 2015/09/09 18:10:57, Tom Sepez wrote:
> Missed one:   FX_ALLOC(CJBig2_image*, src->SDNUMEXESYMS)

Done.

[Tom Sepez, 2015-09-10 22:34:34]

lgtm

[Lei Zhang, 2015-09-10 23:12:52]

Committed patchset #6 (id:120001) manually as
70f4404e9a9e69afdfdd07715aa946f6561ce0cb (presubmit successful).