From 3343d146f2d9cd2f9eaa3a40fed3a5b94f3f107e Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Mon, 2 Nov 2015 09:54:54 -0800
Subject: Fix XFA compilation noise, part 1.

Mainly:
  volatile/override/method shadowing.
  unused variables.
  intialization list init order.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1422113003 .
---
 xfa/src/fdp/src/tto/fde_textout.cpp | 2 +-
 xfa/src/fdp/src/tto/fde_textout.h   | 1 -
 xfa/src/fdp/src/xml/fde_xml.cpp     | 9 +++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'xfa/src/fdp')

diff --git a/xfa/src/fdp/src/tto/fde_textout.cpp b/xfa/src/fdp/src/tto/fde_textout.cpp
index d7e17628ee..7612cb52f5 100644
--- a/xfa/src/fdp/src/tto/fde_textout.cpp
+++ b/xfa/src/fdp/src/tto/fde_textout.cpp
@@ -29,8 +29,8 @@ CFDE_TextOut::CFDE_TextOut()
       m_iEllipsisWidth(0),
       m_ttoLines(5),
       m_iCurLine(0),
-      m_iTotalLines(0),
       m_iCurPiece(0),
+      m_iTotalLines(0),
       m_pCharPos(NULL),
       m_iCharPosSize(0),
       m_pRenderDevice(NULL) {
diff --git a/xfa/src/fdp/src/tto/fde_textout.h b/xfa/src/fdp/src/tto/fde_textout.h
index ecb2c73666..7edd05b0e1 100644
--- a/xfa/src/fdp/src/tto/fde_textout.h
+++ b/xfa/src/fdp/src/tto/fde_textout.h
@@ -137,7 +137,6 @@ class CFDE_TextOut : public IFDE_TextOut, public CFX_Target {
   FX_FLOAT m_fLineSpace;
   FX_FLOAT m_fLinePos;
   FX_FLOAT m_fTolerance;
-
   int32_t m_iAlignment;
   int32_t m_iTxtBkAlignment;
   int32_t* m_pCharWidths;
diff --git a/xfa/src/fdp/src/xml/fde_xml.cpp b/xfa/src/fdp/src/xml/fde_xml.cpp
index 056254a149..1931a57d11 100644
--- a/xfa/src/fdp/src/xml/fde_xml.cpp
+++ b/xfa/src/fdp/src/xml/fde_xml.cpp
@@ -506,7 +506,7 @@ IFDE_XMLInstruction* IFDE_XMLInstruction::Create(
   return (IFDE_XMLInstruction*)new CFDE_XMLInstruction(wsTarget);
 }
 CFDE_XMLInstruction::CFDE_XMLInstruction(const CFX_WideString& wsTarget)
-    : CFDE_XMLNode(), m_wsTarget(wsTarget), m_TargetData(), m_Attributes() {
+    : m_wsTarget(wsTarget) {
   FXSYS_assert(m_wsTarget.GetLength() > 0);
 }
 CFDE_XMLNode* CFDE_XMLInstruction::Clone(FX_BOOL bRecursive) {
@@ -1316,10 +1316,11 @@ inline void CFDE_XMLSAXParser::Pop() {
 }
 #ifdef _FDE_BLOCK_BUFFER
 CFDE_BlockBuffer::CFDE_BlockBuffer(int32_t iAllocStep)
-    : m_iAllocStep(iAllocStep),
-      m_iStartPosition(0),
+    : m_iDataLength(0),
       m_iBufferSize(0),
-      m_iDataLength(0) {}
+      m_iAllocStep(iAllocStep),
+      m_iStartPosition(0) {
+}
 CFDE_BlockBuffer::~CFDE_BlockBuffer() {
   ClearBuffer();
 }
-- 
cgit v1.2.3