Google Git
Sign in
pdfium/pdfium/09363c8^!/.
commit
09363c82b5f309631eed3801b3c1cb4195763dd4
[log]
author
Nico Weber <thakis@chromium.org>
Thu Jul 31 10:07:04 2014 -0700
committer
Nico Weber <thakis@chromium.org>
Thu Jul 31 10:07:04 2014 -0700
tree
d27fd2a18f284665837c0ba576ac3e9acc4d9e1a
parent
c2df91c93d7d2ec4ffb2e0162d6ed865a71a15df [diff]
Fix a few more -Wreorder warnings.

No intended behavior change.

BUG=pdfium:29
R=bo_xu@foxitsoftware.com

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

diff --git a/core/src/fpdfdoc/doc_vt.cpp b/core/src/fpdfdoc/doc_vt.cpp
index f3b9bbb..fd3f5ba 100644
--- a/core/src/fpdfdoc/doc_vt.cpp
+++ b/core/src/fpdfdoc/doc_vt.cpp

@@ -317,7 +317,7 @@
     delete m_WordArray.GetAt(place.nWordIndex);
     m_WordArray.RemoveAt(place.nWordIndex);
 }
-CTypeset::CTypeset(CSection * pSection) : m_pSection(pSection), m_pVT(pSection->m_pVT), m_rcRet(0.0f, 0.0f, 0.0f, 0.0f)
+CTypeset::CTypeset(CSection * pSection) : m_rcRet(0.0f, 0.0f, 0.0f, 0.0f), m_pVT(pSection->m_pVT), m_pSection(pSection)
 {
 }
 CTypeset::~CTypeset()
@@ -804,21 +804,21 @@
     m_rcRet = CPVT_FloatRect(fMinX, fMinY, fMaxX, fMaxY);
 }
 CPDF_VariableText::CPDF_VariableText() :
-    m_pVTProvider(NULL),
-    m_pVTIterator(NULL),
-    m_bInitial(FALSE),
-    m_bRichText(FALSE),
+    m_nLimitChar(0),
+    m_nCharArray(0),
     m_bMultiLine(FALSE),
     m_bLimitWidth(FALSE),
     m_bAutoFontSize(FALSE),
-    m_nLimitChar(0),
-    m_nCharArray(0),
     m_nAlignment(0),
+    m_fLineLeading(0.0f),
     m_fCharSpace(0.0f),
-    m_fFontSize(0.0f),
     m_nHorzScale(100),
     m_wSubWord(0),
-    m_fLineLeading(0.0f)
+    m_fFontSize(0.0f),
+    m_bInitial(FALSE),
+    m_bRichText(FALSE),
+    m_pVTProvider(NULL),
+    m_pVTIterator(NULL)
 {
 }
 CPDF_VariableText::~CPDF_VariableText()
@@ -1687,8 +1687,8 @@
     return pOld;
 }
 CPDF_VariableText_Iterator::CPDF_VariableText_Iterator(CPDF_VariableText * pVT):
-    m_pVT(pVT),
-    m_CurPos(-1, -1, -1)
+    m_CurPos(-1, -1, -1),
+    m_pVT(pVT)
 {
 }
 CPDF_VariableText_Iterator::~CPDF_VariableText_Iterator()

diff --git a/fpdfsdk/include/javascript/Document.h b/fpdfsdk/include/javascript/Document.h
index ca8b51b..764bbbc 100644
--- a/fpdfsdk/include/javascript/Document.h
+++ b/fpdfsdk/include/javascript/Document.h

@@ -41,7 +41,7 @@
 
 struct IconElement
 {
-	IconElement() : IconName(L""), IconStream(NULL), NextIcon(NULL){}
+	IconElement() : IconName(L""), NextIcon(NULL), IconStream(NULL) {}
 	virtual ~IconElement()
 	{
 	}

diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp
index 9052c37..52173b4 100644
--- a/fpdfsdk/src/fsdk_mgr.cpp
+++ b/fpdfsdk/src/fsdk_mgr.cpp

@@ -218,9 +218,14 @@
 	return &s_JSRuntimeFactory;
 }
 
-CPDFDoc_Environment::CPDFDoc_Environment(CPDF_Document * pDoc):m_pInfo(NULL),m_pIFormFiller(NULL),
-								m_pAnnotHandlerMgr(NULL),m_pActionHandler(NULL),m_pJSRuntime(NULL),
-								m_pSDKDoc(NULL), m_pPDFDoc(pDoc)
+CPDFDoc_Environment::CPDFDoc_Environment(CPDF_Document* pDoc) :
+	m_pAnnotHandlerMgr(NULL),
+	m_pActionHandler(NULL),
+	m_pJSRuntime(NULL),
+	m_pInfo(NULL),
+	m_pSDKDoc(NULL),
+	m_pPDFDoc(pDoc),
+	m_pIFormFiller(NULL)
 {
 
 	m_pSysHandler = NULL;
@@ -595,7 +600,7 @@
 }
 
 
-CPDFSDK_PageView::CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc,CPDF_Page* page):m_pSDKDoc(pSDKDoc),m_page(page)
+CPDFSDK_PageView::CPDFSDK_PageView(CPDFSDK_Document* pSDKDoc,CPDF_Page* page):m_page(page),m_pSDKDoc(pSDKDoc)
 {
 	CPDFSDK_InterForm* pInterForm = pSDKDoc->GetInterForm();
 	if(pInterForm)

diff --git a/fpdfsdk/src/fxedit/fxet_list.cpp b/fpdfsdk/src/fxedit/fxet_list.cpp
index 63aee1b..64ed694 100644
--- a/fpdfsdk/src/fxedit/fxet_list.cpp
+++ b/fpdfsdk/src/fxedit/fxet_list.cpp

@@ -119,7 +119,7 @@
 
 /* ------------------------------------ CFX_List --------------------------------- */
 
-CFX_List::CFX_List() : m_pFontMap(NULL), m_fFontSize(0.0f), m_bMultiple(FALSE) 
+CFX_List::CFX_List() : m_fFontSize(0.0f), m_pFontMap(NULL), m_bMultiple(FALSE)
 {
 }
 
@@ -507,12 +507,12 @@
 /* ------------------------------------ CFX_ListCtrl --------------------------------- */
 
 CFX_ListCtrl::CFX_ListCtrl() : m_pNotify(NULL),
+	m_bNotifyFlag(FALSE),
 	m_ptScrollPos(0.0f,0.0f),
 	m_nSelItem(-1),
 	m_nFootIndex(-1),
-	m_bCtrlSel(FALSE),	
-	m_nCaretIndex(-1),
-	m_bNotifyFlag(FALSE)
+	m_bCtrlSel(FALSE),
+	m_nCaretIndex(-1)
 {
 }
 

diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp
index 0c4d4f4..229d977 100644
--- a/fpdfsdk/src/javascript/Document.cpp
+++ b/fpdfsdk/src/javascript/Document.cpp

@@ -158,11 +158,11 @@
 /* --------------------------------- Document --------------------------------- */
 
 Document::Document(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject),
-	m_cwBaseURL(L""),
+	m_isolate(NULL),
 	m_pIconTree(NULL),
 	m_pDocument(NULL),
-	m_bDelay(FALSE),
-	m_isolate(NULL)
+	m_cwBaseURL(L""),
+	m_bDelay(FALSE)
 {
 }
 

diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp
index 543540b..be11b04 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime.cpp

@@ -104,8 +104,8 @@
 CJS_Runtime::CJS_Runtime(CPDFDoc_Environment * pApp) : 
 	m_pApp(pApp),
 	m_pDocument(NULL),
-	m_pFieldEventPath(NULL),
 	m_bBlocking(FALSE),
+	m_pFieldEventPath(NULL),
 	m_bRegistered(FALSE)
 {
 	m_isolate = v8::Isolate::New();

diff --git a/fpdfsdk/src/javascript/JS_Value.cpp b/fpdfsdk/src/javascript/JS_Value.cpp
index 0217ea1..90b324a 100644
--- a/fpdfsdk/src/javascript/JS_Value.cpp
+++ b/fpdfsdk/src/javascript/JS_Value.cpp

@@ -11,10 +11,11 @@
 
 /* ---------------------------- CJS_Value ---------------------------- */
 
-CJS_Value::CJS_Value(v8::Isolate* isolate) : m_isolate(isolate),m_eType(VT_unknown)
+CJS_Value::CJS_Value(v8::Isolate* isolate) : m_eType(VT_unknown),m_isolate(isolate)
 {
 }
-CJS_Value::CJS_Value(v8::Isolate* isolate, v8::Handle<v8::Value> pValue,FXJSVALUETYPE t) :m_isolate(isolate), m_pValue(pValue) , m_eType(t)
+CJS_Value::CJS_Value(v8::Isolate* isolate, v8::Handle<v8::Value> pValue,FXJSVALUETYPE t) :
+	m_pValue(pValue), m_eType(t), m_isolate(isolate)
 {
 }
 

diff --git a/fpdfsdk/src/pdfwindow/PWL_Note.cpp b/fpdfsdk/src/pdfwindow/PWL_Note.cpp
index b04b0f5..b0028b6 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Note.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Note.cpp

@@ -681,10 +681,10 @@
 /* ---------------------------------- CPWL_NoteItem ---------------------------------- */
 
 CPWL_NoteItem::CPWL_NoteItem() :
-	m_pPrivateData(NULL),
 	m_pSubject(NULL),
 	m_pDateTime(NULL),
 	m_pContents(NULL),
+	m_pPrivateData(NULL),
 	m_sAuthor(L""),
 	m_fOldItemHeight(0.0f),
 	m_bSizeChanged(FALSE),
@@ -1205,13 +1205,13 @@
 	m_pAuthor(NULL),
 	m_pIcon(NULL),
 	m_pCloseBox(NULL),
-	m_pContentsBar(NULL),
 	m_pLBBox(NULL),
 	m_pRBBox(NULL),
+	m_pContentsBar(NULL),
 	m_pOptions(NULL),
+	m_pNoteNotify(pNoteNotify),
 	m_bResizing(FALSE),
 	m_rcCaption(0,0,0,0),
-	m_pNoteNotify(pNoteNotify),
 	m_bEnalbleNotify(TRUE),
 	m_pPopupNote(pPopupNote)
 {