[Merge to 54] Fix CPDFSDK_PageView cleanup.

[Merge to 54] Fix CPDFSDK_PageView cleanup.

In https://pdfium.googlesource.com/pdfium/+/461eeafe191068ac8c32f2717907fc6a22a667d2
we moved the map cleanup for the page view to happen before the page view was
destroyed and before we killed the annotation focus.

The map removal must happen before the pageview is destroyed, but must happen
after we've killed the annotation focus in order to not create duplicate page
views which point to the same page.

BUG=chromium:645122
R=tsepez@chromium.org

Review-Url: https://codereview.chromium.org/2320253002
Committed: https://pdfium.googlesource.com/pdfium/+/ccf7734cad06cb9383d55190d6cd6aa6ccc91ab2

[dsinclair, 2016-09-13 18:25:25]

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

[dsinclair, 2016-09-13 18:25:26]

PTAL (merge clean)

[Tom Sepez, 2016-09-13 18:40:24]

RS LGTM

[dsinclair, 2016-09-13 18:51:52]

Description was changed from

==========
[Merge to 54] Fix CPDFSDK_PageView cleanup.

In
https://pdfium.googlesource.com/pdfium/+/461eeafe191068ac8c32f2717907fc6a22a6...
we moved the map cleanup for the page view to happen before the page view was
destroyed and before we killed the annotation focus.

The map removal must happen before the pageview is destroyed, but must happen
after we've killed the annotation focus in order to not create duplicate page
views which point to the same page.

BUG=chromium:645122

Review-Url: https://codereview.chromium.org/2320253002
==========

to

==========
[Merge to 54] Fix CPDFSDK_PageView cleanup.

In
https://pdfium.googlesource.com/pdfium/+/461eeafe191068ac8c32f2717907fc6a22a6...
we moved the map cleanup for the page view to happen before the page view was
destroyed and before we killed the annotation focus.

The map removal must happen before the pageview is destroyed, but must happen
after we've killed the annotation focus in order to not create duplicate page
views which point to the same page.

BUG=chromium:645122
R=tsepez@chromium.org

Review-Url: https://codereview.chromium.org/2320253002
Committed:
https://pdfium.googlesource.com/pdfium/+/ccf7734cad06cb9383d55190d6cd6aa6ccc9...
==========

[dsinclair, 2016-09-13 18:51:53]

Committed patchset #1 (id:1) manually as
ccf7734cad06cb9383d55190d6cd6aa6ccc91ab2 (presubmit successful).