diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-14 13:54:22 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-14 13:54:22 -0700 |
| commit | eca866c64ec0319d4723798290a3155957fa733e (patch) | |
| tree | 59c7bb72df8d4df62934ab4002108a57bf2df37e /fpdfsdk/src/fsdk_mgr.cpp | |
| parent | ae2d47b22d213cb36a66326c3167cfbbae90b9d4 (diff) | |
| download | pdfium-eca866c64ec0319d4723798290a3155957fa733e.tar.xz | |
Next round of master changes to match XFA
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1401423004 .
Diffstat (limited to 'fpdfsdk/src/fsdk_mgr.cpp')
| -rw-r--r-- | fpdfsdk/src/fsdk_mgr.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index b7962d57f7..883ad60a93 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -6,9 +6,9 @@ #include "../../public/fpdf_ext.h" #include "../../third_party/base/nonstd_unique_ptr.h" +#include "../include/formfiller/FFL_FormFiller.h" #include "../include/fsdk_define.h" #include "../include/fsdk_mgr.h" -#include "../include/formfiller/FFL_FormFiller.h" #include "../include/javascript/IJavaScript.h" #if _FX_OS_ == _FX_ANDROID_ @@ -660,11 +660,9 @@ void CPDFSDK_PageView::PageView_OnDraw(CFX_RenderDevice* pDevice, CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); CPDFSDK_AnnotIterator annotIterator(this, TRUE); - CPDFSDK_Annot* pSDKAnnot = nullptr; int index = -1; - while ((pSDKAnnot = annotIterator.Next(index))) { + while (CPDFSDK_Annot* pSDKAnnot = annotIterator.Next(index)) { CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr(); - ASSERT(pAnnotHandlerMgr); pAnnotHandlerMgr->Annot_OnDraw(this, pSDKAnnot, pDevice, pUser2Device, 0); } } |