Annotations and fields do not have DR

Remove GetDictBy("DR") from annot/field dictionaries

We should not use DR field from annotation/field dictionaries, since
these are not supposed to have one. In PDF spec 1.7, DR is defined only
for the form dictionary, in 8.6.1. In addition, note 118 in Appendix H
says "In PDF 1.2, an additional entry in the field dictionary, DR, was
defined but was never implemented. Beginning with PDF 1.5, this entry
is obsolete and should be ignored."

The changes in CBA_FontMap fix the bug below. The changes in
cpvt_generateap do not affect the bug but follow the reasoning from
the above paragraph.

BUG=pdfium:538
Committed: https://pdfium.googlesource.com/pdfium/+/860a2d0299996d253272d831c9c7e533e9d3e890

[npm, 2016-09-12 20:35:59]

The CQ bit was checked by npm@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-09-12 20:36:07]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[npm, 2016-09-12 20:36:38]

Description was changed from

==========
Annotations and fields do not have DR

We should not use DR field from annotation/field dictionaries, since
these are not supposed to have one. In PDF spec 1.7, DR is defined only
for the form dictionary, in 8.6.1. In addition, note 118 in Appendix H
says "In PDF 1.2, an additional entry in the field dictionary, DR, was
defined but was never implemented. Beginning with PDF 1.5, this entry
is obsolete and should be ignored."

The changes in CBA_FontMap fix the bug below. The changes in
cpvt_generateap do not affect the bug but follow the reasoning from
the above paragraph.

BUG=pdfium:538
==========

to

==========
Remove GetDictBy("DR") from annot/field dictionaries

We should not use DR field from annotation/field dictionaries, since
these are not supposed to have one. In PDF spec 1.7, DR is defined only
for the form dictionary, in 8.6.1. In addition, note 118 in Appendix H
says "In PDF 1.2, an additional entry in the field dictionary, DR, was
defined but was never implemented. Beginning with PDF 1.5, this entry
is obsolete and should be ignored."

The changes in CBA_FontMap fix the bug below. The changes in
cpvt_generateap do not affect the bug but follow the reasoning from
the above paragraph.

BUG=pdfium:538
==========

[npm, 2016-09-12 20:36:38]

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

[npm, 2016-09-12 20:40:58]

PTAL

[commit-bot: I haz the power, 2016-09-12 20:49:17]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-12 20:49:18]

Dry run: This issue passed the CQ dry run.

[dsinclair, 2016-09-12 20:51:49]

Is there any way we can add a test for this?

https://codereview.chromium.org/2337673002/diff/1/fpdfsdk/formfiller/cba_font...
File fpdfsdk/formfiller/cba_fontmap.cpp (right):

https://codereview.chromium.org/2337673002/diff/1/fpdfsdk/formfiller/cba_font...
fpdfsdk/formfiller/cba_fontmap.cpp:231: if (CPDF_Dictionary* pAPDict =
m_pAnnotDict->GetDictBy("AP"))
These need {}'s added.

[npm, 2016-09-12 21:13:24]

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

[Tom Sepez, 2016-09-12 21:16:33]

Looks like this would be tough to test.

[Tom Sepez, 2016-09-12 21:19:22]

https://codereview.chromium.org/2337673002/diff/1/core/fpdfdoc/cpvt_generatea...
File core/fpdfdoc/cpvt_generateap.cpp (right):

https://codereview.chromium.org/2337673002/diff/1/core/fpdfdoc/cpvt_generatea...
core/fpdfdoc/cpvt_generateap.cpp:49: CPDF_Dictionary* pDRDict =
pFormDict->GetDictBy("DR");
nit: maybe just early return here if null to avoid ? and retest later.

https://codereview.chromium.org/2337673002/diff/1/core/fpdfdoc/cpvt_generatea...
core/fpdfdoc/cpvt_generateap.cpp:53: CPDF_Dictionary* pFontDict =
pDRFontDict->GetDictBy(sFontName.Mid(1));
nit: I'd put the blank line above this statement rather than after it.

https://codereview.chromium.org/2337673002/diff/1/fpdfsdk/formfiller/cba_font...
File fpdfsdk/formfiller/cba_fontmap.cpp (right):

https://codereview.chromium.org/2337673002/diff/1/fpdfsdk/formfiller/cba_font...
fpdfsdk/formfiller/cba_fontmap.cpp:225: if (!sDA.IsEmpty()) {
nit: can we avoid some indentation with early returns?

[npm, 2016-09-12 21:40:12]

For now, just tested that this fixes the bug in Chrome. PTAL

https://codereview.chromium.org/2337673002/diff/1/core/fpdfdoc/cpvt_generatea...
File core/fpdfdoc/cpvt_generateap.cpp (right):

https://codereview.chromium.org/2337673002/diff/1/core/fpdfdoc/cpvt_generatea...
core/fpdfdoc/cpvt_generateap.cpp:49: CPDF_Dictionary* pDRDict =
pFormDict->GetDictBy("DR");
On 2016/09/12 21:19:22, Tom Sepez wrote:
> nit: maybe just early return here if null to avoid ? and retest later.

Done.

https://codereview.chromium.org/2337673002/diff/1/core/fpdfdoc/cpvt_generatea...
core/fpdfdoc/cpvt_generateap.cpp:53: CPDF_Dictionary* pFontDict =
pDRFontDict->GetDictBy(sFontName.Mid(1));
On 2016/09/12 21:19:22, Tom Sepez wrote:
> nit: I'd put the blank line above this statement rather than after it.

Done.

https://codereview.chromium.org/2337673002/diff/1/fpdfsdk/formfiller/cba_font...
File fpdfsdk/formfiller/cba_fontmap.cpp (right):

https://codereview.chromium.org/2337673002/diff/1/fpdfsdk/formfiller/cba_font...
fpdfsdk/formfiller/cba_fontmap.cpp:225: if (!sDA.IsEmpty()) {
On 2016/09/12 21:19:22, Tom Sepez wrote:
> nit: can we avoid some indentation with early returns?

Cleanly, just one :( I can replace the if stack with "?", but I don't know which
is more ugly.

https://codereview.chromium.org/2337673002/diff/1/fpdfsdk/formfiller/cba_font...
fpdfsdk/formfiller/cba_fontmap.cpp:231: if (CPDF_Dictionary* pAPDict =
m_pAnnotDict->GetDictBy("AP"))
On 2016/09/12 20:51:49, dsinclair wrote:
> These need {}'s added.

Done.

[Tom Sepez, 2016-09-12 21:47:03]

lgtm

[npm, 2016-09-12 21:47:49]

The CQ bit was checked by npm@chromium.org

[commit-bot: I haz the power, 2016-09-12 21:47:58]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-12 22:02:30]

Description was changed from

==========
Remove GetDictBy("DR") from annot/field dictionaries

We should not use DR field from annotation/field dictionaries, since
these are not supposed to have one. In PDF spec 1.7, DR is defined only
for the form dictionary, in 8.6.1. In addition, note 118 in Appendix H
says "In PDF 1.2, an additional entry in the field dictionary, DR, was
defined but was never implemented. Beginning with PDF 1.5, this entry
is obsolete and should be ignored."

The changes in CBA_FontMap fix the bug below. The changes in
cpvt_generateap do not affect the bug but follow the reasoning from
the above paragraph.

BUG=pdfium:538
==========

to

==========
Remove GetDictBy("DR") from annot/field dictionaries

We should not use DR field from annotation/field dictionaries, since
these are not supposed to have one. In PDF spec 1.7, DR is defined only
for the form dictionary, in 8.6.1. In addition, note 118 in Appendix H
says "In PDF 1.2, an additional entry in the field dictionary, DR, was
defined but was never implemented. Beginning with PDF 1.5, this entry
is obsolete and should be ignored."

The changes in CBA_FontMap fix the bug below. The changes in
cpvt_generateap do not affect the bug but follow the reasoning from
the above paragraph.

BUG=pdfium:538

Committed:
https://pdfium.googlesource.com/pdfium/+/860a2d0299996d253272d831c9c7e533e9d3...
==========

[commit-bot: I haz the power, 2016-09-12 22:02:34]

Committed patchset #2 (id:20001) as
https://pdfium.googlesource.com/pdfium/+/860a2d0299996d253272d831c9c7e533e9d3...