Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Side by Side Diff: fpdfsdk/src/fsdk_mgr.cpp

Issue 436483002: Fix a few more -Wreorder warnings. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « fpdfsdk/include/javascript/Document.h ('k') | fpdfsdk/src/fxedit/fxet_list.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "../include/fsdk_define.h" 7 #include "../include/fsdk_define.h"
8 #include "../include/fsdk_mgr.h" 8 #include "../include/fsdk_mgr.h"
9 #include "../include/fpdf_ext.h" 9 #include "../include/fpdf_ext.h"
10 #include "../include/formfiller/FFL_FormFiller.h" 10 #include "../include/formfiller/FFL_FormFiller.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 return m_pEnv->FFI_GetLocalTime(); 211 return m_pEnv->FFI_GetLocalTime();
212 } 212 }
213 213
214 214
215 CJS_RuntimeFactory* GetJSRuntimeFactory() 215 CJS_RuntimeFactory* GetJSRuntimeFactory()
216 { 216 {
217 static CJS_RuntimeFactory s_JSRuntimeFactory; 217 static CJS_RuntimeFactory s_JSRuntimeFactory;
218 return &s_JSRuntimeFactory; 218 return &s_JSRuntimeFactory;
219 } 219 }
220 220
221 CPDFDoc_Environment::CPDFDoc_Environment(CPDF_Document * pDoc):m_pInfo(NULL),m_p IFormFiller(NULL), 221 CPDFDoc_Environment::CPDFDoc_Environment(CPDF_Document* pDoc) :
222 » » » » » » » » m_pAnnotHandlerM gr(NULL),m_pActionHandler(NULL),m_pJSRuntime(NULL), 222 » m_pAnnotHandlerMgr(NULL),
223 » » » » » » » » m_pSDKDoc(NULL), m_pPDFDoc(pDoc) 223 » m_pActionHandler(NULL),
224 » m_pJSRuntime(NULL),
225 » m_pInfo(NULL),
226 » m_pSDKDoc(NULL),
227 » m_pPDFDoc(pDoc),
228 » m_pIFormFiller(NULL)
224 { 229 {
225 230
226 m_pSysHandler = NULL; 231 m_pSysHandler = NULL;
227 m_pSysHandler = new CFX_SystemHandler(this); 232 m_pSysHandler = new CFX_SystemHandler(this);
228 233
229 234
230 m_pJSRuntimeFactory = NULL; 235 m_pJSRuntimeFactory = NULL;
231 m_pJSRuntimeFactory = GetJSRuntimeFactory(); 236 m_pJSRuntimeFactory = GetJSRuntimeFactory();
232 m_pJSRuntimeFactory->AddRef(); 237 m_pJSRuntimeFactory->AddRef();
233 } 238 }
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 return m_pEnv->GetJSRuntime(); 593 return m_pEnv->GetJSRuntime();
589 } 594 }
590 595
591 CFX_WideString CPDFSDK_Document::GetPath() 596 CFX_WideString CPDFSDK_Document::GetPath()
592 { 597 {
593 ASSERT(m_pEnv != NULL); 598 ASSERT(m_pEnv != NULL);
594 return m_pEnv->JS_docGetFilePath(); 599 return m_pEnv->JS_docGetFilePath();
595 } 600 }
596 601
597 602
598 CPDFSDK_PageView::CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc,CPDF_Page* page):m_ pSDKDoc(pSDKDoc),m_page(page) 603 CPDFSDK_PageView::CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc,CPDF_Page* page):m_ page(page),m_pSDKDoc(pSDKDoc)
599 { 604 {
600 CPDFSDK_InterForm* pInterForm = pSDKDoc->GetInterForm(); 605 CPDFSDK_InterForm* pInterForm = pSDKDoc->GetInterForm();
601 if(pInterForm) 606 if(pInterForm)
602 { 607 {
603 CPDF_InterForm* pPDFInterForm = pInterForm->GetInterForm(); 608 CPDF_InterForm* pPDFInterForm = pInterForm->GetInterForm();
604 pPDFInterForm->FixPageFields(page); 609 pPDFInterForm->FixPageFields(page);
605 } 610 }
606 611
607 m_fxAnnotArray.RemoveAll(); 612 m_fxAnnotArray.RemoveAll();
608 613
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
1046 1051
1047 for(int i=0; i<m_fxAnnotArray.GetSize(); i++) 1052 for(int i=0; i<m_fxAnnotArray.GetSize(); i++)
1048 { 1053 {
1049 CPDFSDK_Annot* pAnnot = (CPDFSDK_Annot*)m_fxAnnotArray.GetAt(i); 1054 CPDFSDK_Annot* pAnnot = (CPDFSDK_Annot*)m_fxAnnotArray.GetAt(i);
1050 if(pAnnot == pFocusAnnot) 1055 if(pAnnot == pFocusAnnot)
1051 return pAnnot; 1056 return pAnnot;
1052 } 1057 }
1053 return NULL; 1058 return NULL;
1054 } 1059 }
1055 1060
OLDNEW
« no previous file with comments | « fpdfsdk/include/javascript/Document.h ('k') | fpdfsdk/src/fxedit/fxet_list.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698