[Merge to XFA] Revert "Revert "Add type cast definitions for CPDF_Dictionary.""

[Merge to XFA] Revert "Revert "Add type cast definitions for CPDF_Dictionary.""

This reverts commit 937840e1722d1f2b77d80575d6e710d760662c9c.

Add type cast definitions for CPDF_Dictionary.

This CL adds ToCPDFDictionary type definitions and updates one file to use
instead of straight casts. I had to fix two places where we'd casted off the
constness of the original pointer.

BUG=pdfium:201
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1420583003 .

(cherry picked from commit 39869b641511c882d78e17548293cdb458c36f38)

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

[dsinclair, 2015-10-20 19:18:32]

PTAL.

Merge was not clean. Marked the conflicts with comments in the review.

https://codereview.chromium.org/1410343003/diff/1/core/src/fpdftext/fpdf_text...
File core/src/fpdftext/fpdf_text_int.cpp (right):

https://codereview.chromium.org/1410343003/diff/1/core/src/fpdftext/fpdf_text...
core/src/fpdftext/fpdf_text_int.cpp:1416: (CPDF_String*)(pDict ?
pDict->GetElement(FX_BSTRC("ActualText"))
On XFA the ternary is missing and it was just:

(CPDF_String*)pDict->GetElement(FX_BSTRC("ActualText"));

I merged the null check in from master.

https://codereview.chromium.org/1410343003/diff/1/fpdfsdk/src/fpdfppo.cpp
File fpdfsdk/src/fpdfppo.cpp (right):

https://codereview.chromium.org/1410343003/diff/1/fpdfsdk/src/fpdfppo.cpp#new...
fpdfsdk/src/fpdfppo.cpp:63: pNewRoot->GetElement("Pages") ?
pNewRoot->GetElement("Pages")->GetDirect()
This code differs slightly from master and was merged.

https://codereview.chromium.org/1410343003/diff/1/fpdfsdk/src/fpdfppo.cpp#new...
fpdfsdk/src/fpdfppo.cpp:194: if (!pDict->KeyExist("Parent"))
This key check doesn't exist on master and caused merge issues with the below.

https://codereview.chromium.org/1410343003/diff/1/fpdfsdk/src/fpdfppo.cpp#new...
fpdfsdk/src/fpdfppo.cpp:213: }
This is a bit weird, on master the while ends with:

  pp = ToDictionary(pp->GetElement("Parent")->GetDirect());
}

but that doesn't exist on XFA. I wasn't sure if I should put it in or not ....

[Tom Sepez, 2015-10-20 19:49:28]

https://codereview.chromium.org/1410343003/diff/1/core/src/fpdftext/fpdf_text...
File core/src/fpdftext/fpdf_text_int.cpp (right):

https://codereview.chromium.org/1410343003/diff/1/core/src/fpdftext/fpdf_text...
core/src/fpdftext/fpdf_text_int.cpp:1416: (CPDF_String*)(pDict ?
pDict->GetElement(FX_BSTRC("ActualText"))
On 2015/10/20 19:18:31, dsinclair wrote:
> On XFA the ternary is missing and it was just:
> 
> (CPDF_String*)pDict->GetElement(FX_BSTRC("ActualText"));
> 
> I merged the null check in from master.

Acknowledged.

https://codereview.chromium.org/1410343003/diff/1/fpdfsdk/src/fpdfppo.cpp
File fpdfsdk/src/fpdfppo.cpp (right):

https://codereview.chromium.org/1410343003/diff/1/fpdfsdk/src/fpdfppo.cpp#new...
fpdfsdk/src/fpdfppo.cpp:213: }
On 2015/10/20 19:18:31, dsinclair wrote:
> This is a bit weird, on master the while ends with:
> 
>   pp = ToDictionary(pp->GetElement("Parent")->GetDirect());
> }
> 
> but that doesn't exist on XFA. I wasn't sure if I should put it in or not ....



Looks like on master we inverted the if at 207 to get rid of "else break"

Then the last thing would be the update of pp, followed by the null check, which
we removed in your CL in master.  I think you can take the master code verbatim
for this loop

[dsinclair, 2015-10-20 19:57:16]

https://codereview.chromium.org/1410343003/diff/1/fpdfsdk/src/fpdfppo.cpp
File fpdfsdk/src/fpdfppo.cpp (right):

https://codereview.chromium.org/1410343003/diff/1/fpdfsdk/src/fpdfppo.cpp#new...
fpdfsdk/src/fpdfppo.cpp:213: }
On 2015/10/20 19:49:28, Tom Sepez wrote:
> On 2015/10/20 19:18:31, dsinclair wrote:
> > This is a bit weird, on master the while ends with:
> > 
> >   pp = ToDictionary(pp->GetElement("Parent")->GetDirect());
> > }
> > 
> > but that doesn't exist on XFA. I wasn't sure if I should put it in or not
....
> 
> 
> 
> Looks like on master we inverted the if at 207 to get rid of "else break"
> 
> Then the last thing would be the update of pp, followed by the null check,
which
> we removed in your CL in master.  I think you can take the master code
verbatim
> for this loop

Done.

[Tom Sepez, 2015-10-20 20:12:16]

lgtm

[dsinclair, 2015-10-20 20:24:49]

Committed patchset #3 (id:40001) manually as
f1251c1ff2b3452854681d0648b4c1ca4180ff0d (presubmit successful).