Remove CFX_MapPtrToPtr in CFX_PageRenderCache

Remove CFX_MapPtrToPtr in CFX_PageRenderCache

Rename CPDF_ImageCache to CPDF_ImageCacheEntry because it
represents a single entry, not the entire cache itself.

Delete unused ClearRenderCache method, and merge cache entry
clear() into its dtor.

Fix a broken size calculation.

R=thestig@chromium.org

Committed: https://pdfium.googlesource.com/pdfium/+/0fa6fee0e48af8681f0cd50f6a9471ecc0a46c11

[Tom Sepez, 2015-12-18 19:26:08]

Description was changed from

==========
Remove CFX_MapPtrToPtr in CFX_PageRenderCache

Rename CPDF_ImageCache to CPDF_ImageCacheEntry because it represents
a single entry, not the entire cache itself.
==========

to

==========
Remove CFX_MapPtrToPtr in CFX_PageRenderCache

Rename CPDF_ImageCache to CPDF_ImageCacheEntry because it represents
a single entry, not the entire cache itself.

Delete unused ClearRenderCache method, and merge cache entry clear() into its
dtor.
==========

[Tom Sepez, 2015-12-18 19:26:28]

Description was changed from

==========
Remove CFX_MapPtrToPtr in CFX_PageRenderCache

Rename CPDF_ImageCache to CPDF_ImageCacheEntry because it represents
a single entry, not the entire cache itself.

Delete unused ClearRenderCache method, and merge cache entry clear() into its
dtor.
==========

to

==========
Remove CFX_MapPtrToPtr in CFX_PageRenderCache

Rename CPDF_ImageCache to CPDF_ImageCacheEntry because it
represents a single entry, not the entire cache itself.

Delete unused ClearRenderCache method, and merge cache entry
clear() into its dtor.
==========

[Tom Sepez, 2015-12-18 20:23:50]

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

[Tom Sepez, 2015-12-18 20:24:00]

Lei, for review.

[Tom Sepez, 2015-12-18 20:24:44]

Description was changed from

==========
Remove CFX_MapPtrToPtr in CFX_PageRenderCache

Rename CPDF_ImageCache to CPDF_ImageCacheEntry because it
represents a single entry, not the entire cache itself.

Delete unused ClearRenderCache method, and merge cache entry
clear() into its dtor.
==========

to

==========
Remove CFX_MapPtrToPtr in CFX_PageRenderCache

Rename CPDF_ImageCache to CPDF_ImageCacheEntry because it
represents a single entry, not the entire cache itself.

Delete unused ClearRenderCache method, and merge cache entry
clear() into its dtor. 

Fix a broken size calculation.
==========

[Lei Zhang, 2015-12-18 22:33:24]

lgtm

https://codereview.chromium.org/1539983002/diff/60001/core/include/fpdfapi/fp...
File core/include/fpdfapi/fpdf_render.h (right):

https://codereview.chromium.org/1539983002/diff/60001/core/include/fpdfapi/fp...
core/include/fpdfapi/fpdf_render.h:220: CPDF_PageRenderCache(CPDF_Page* pPage)
explicit?

https://codereview.chromium.org/1539983002/diff/60001/core/src/fpdfapi/fpdf_r...
File core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp (right):

https://codereview.chromium.org/1539983002/diff/60001/core/src/fpdfapi/fpdf_r...
core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp:33: unsigned int nCount =
m_ImageCache.size();
size_t? also for |i| below?

https://codereview.chromium.org/1539983002/diff/60001/core/src/fpdfapi/fpdf_r...
core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp:34: CACHEINFO* pCACHEINFO =
FX_Alloc(CACHEINFO, nCount);
Use a std::vector?

https://codereview.chromium.org/1539983002/diff/60001/core/src/fpdfapi/fpdf_r...
core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp:162: m_nCacheSize +=
pEntry->EstimateSize();
Was the old code just wrong?

[Tom Sepez, 2015-12-18 22:52:37]

https://codereview.chromium.org/1539983002/diff/60001/core/include/fpdfapi/fp...
File core/include/fpdfapi/fpdf_render.h (right):

https://codereview.chromium.org/1539983002/diff/60001/core/include/fpdfapi/fp...
core/include/fpdfapi/fpdf_render.h:220: CPDF_PageRenderCache(CPDF_Page* pPage)
On 2015/12/18 22:33:24, Lei Zhang wrote:
> explicit?

Done.

https://codereview.chromium.org/1539983002/diff/60001/core/src/fpdfapi/fpdf_r...
File core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp (right):

https://codereview.chromium.org/1539983002/diff/60001/core/src/fpdfapi/fpdf_r...
core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp:33: unsigned int nCount =
m_ImageCache.size();
On 2015/12/18 22:33:24, Lei Zhang wrote:
> size_t? also for |i| below?

Done.

https://codereview.chromium.org/1539983002/diff/60001/core/src/fpdfapi/fpdf_r...
core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp:34: CACHEINFO* pCACHEINFO =
FX_Alloc(CACHEINFO, nCount);
On 2015/12/18 22:33:24, Lei Zhang wrote:
> Use a std::vector?

Doing a qsort on a vector's data feels wrong, so there'd be more work to make a
new compartor, etc.

https://codereview.chromium.org/1539983002/diff/60001/core/src/fpdfapi/fpdf_r...
core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp:125: if (ret == 2)
FYI, speaking of enum's, this status code really bugs me.  I think its used
inconsistently, since the three states seem to be {error, incomplete, complete}
but I can't be sure.

https://codereview.chromium.org/1539983002/diff/60001/core/src/fpdfapi/fpdf_r...
core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp:162: m_nCacheSize +=
pEntry->EstimateSize();
On 2015/12/18 22:33:24, Lei Zhang wrote:
> Was the old code just wrong?

That was my conclusion; assigning a delta to an absolute can't be right ...

[Tom Sepez, 2015-12-18 22:53:34]

Description was changed from

==========
Remove CFX_MapPtrToPtr in CFX_PageRenderCache

Rename CPDF_ImageCache to CPDF_ImageCacheEntry because it
represents a single entry, not the entire cache itself.

Delete unused ClearRenderCache method, and merge cache entry
clear() into its dtor. 

Fix a broken size calculation.
==========

to

==========
Remove CFX_MapPtrToPtr in CFX_PageRenderCache

Rename CPDF_ImageCache to CPDF_ImageCacheEntry because it
represents a single entry, not the entire cache itself.

Delete unused ClearRenderCache method, and merge cache entry
clear() into its dtor.

Fix a broken size calculation.

R=thestig@chromium.org

Committed:
https://pdfium.googlesource.com/pdfium/+/0fa6fee0e48af8681f0cd50f6a9471ecc0a4...
==========

[Tom Sepez, 2015-12-18 22:53:36]

Committed patchset #5 (id:80001) manually as
0fa6fee0e48af8681f0cd50f6a9471ecc0a46c11 (presubmit successful).