Fix incorrect CPDFSDK_PageView::CountAnnots(). (try 2)

Fix incorrect CPDFSDK_PageView::CountAnnots(). (try 2)

The original XFA version was correct, and the master version here is
wrong. The two versions are now in sync, but incorrect.
So we need to fix this here and then merge to XFA again.

Also fix what are now incorrect uses of CountAnnots() and do some
cleanups.

BUG=543049
R=tsepez@chromium.org

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

[Lei Zhang, 2015-10-30 17:02:53]

I even put in the right bug # this time.

https://codereview.chromium.org/1413973011/diff/1/fpdfsdk/src/fsdk_baseform.cpp
File fpdfsdk/src/fsdk_baseform.cpp (left):

https://codereview.chromium.org/1413973011/diff/1/fpdfsdk/src/fsdk_baseform.c...
fpdfsdk/src/fsdk_baseform.cpp:2430: ASSERT(m_pPageView != NULL);
I couldn't help myself.

https://codereview.chromium.org/1413973011/diff/1/fpdfsdk/src/fsdk_mgr.cpp
File fpdfsdk/src/fsdk_mgr.cpp (left):

https://codereview.chromium.org/1413973011/diff/1/fpdfsdk/src/fsdk_mgr.cpp#ol...
fpdfsdk/src/fsdk_mgr.cpp:913: if (pAnnotHandlerMgr) {
Always true.

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

https://codereview.chromium.org/1413973011/diff/1/fpdfsdk/src/fsdk_mgr.cpp#ne...
fpdfsdk/src/fsdk_mgr.cpp:667: const int nCount = m_pAnnotList->Count();
This is what went wrong in the previous try.

[Tom Sepez, 2015-10-30 17:57:32]

lgtm

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

https://codereview.chromium.org/1413973011/diff/1/fpdfsdk/src/fsdk_baseform.c...
fpdfsdk/src/fsdk_baseform.cpp:2482: 
nit: blank line not needed here.

https://codereview.chromium.org/1413973011/diff/1/fpdfsdk/src/fsdk_baseform.c...
fpdfsdk/src/fsdk_baseform.cpp:2484: 
nitto (nit ditto).

https://codereview.chromium.org/1413973011/diff/1/fpdfsdk/src/fsdk_baseform.c...
fpdfsdk/src/fsdk_baseform.cpp:2546: 
nitto

https://codereview.chromium.org/1413973011/diff/1/fpdfsdk/src/fsdk_baseform.c...
fpdfsdk/src/fsdk_baseform.cpp:2548: 
nitto

[Lei Zhang, 2015-10-30 18:18:18]

On 2015/10/30 17:57:32, Tom Sepez wrote:
> lgtm
> 
>
https://codereview.chromium.org/1413973011/diff/1/fpdfsdk/src/fsdk_baseform.cpp
> File fpdfsdk/src/fsdk_baseform.cpp (right):

all done

[Lei Zhang, 2015-10-30 18:18:36]

Committed patchset #2 (id:20001) manually as
c91d5c276b6b986f645d34a0e583fbe4f73e74bc (presubmit successful).