commit 762247be1246942790637504f6a726f522a3b399
author Lei Zhang <thestig@chromium.org> Thu Feb 07 18:00:40 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Feb 07 18:00:40 2019 +0000
tree 4043da383ca63c8859484ae0bc518f690a8c3375
parent 82105494f27a592f628749bdf252d13e73e84cf2

Move most CPWL_Wnd::CreateParams member initialization to the header.

Also remove places that initialize rects to (0, 0, 0, 0).

Change-Id: Ie31a4bef6b7ed64c6790e5edf4a6b3f9942fcb58
Reviewed-on: https://pdfium-review.googlesource.com/c/50132
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxcodec/codec/ccodec_progressivedecoder.cpp

diff --git a/core/fxcodec/codec/ccodec_progressivedecoder.cpp b/core/fxcodec/codec/ccodec_progressivedecoder.cpp
index 68c28dd..e27553f 100644
--- a/core/fxcodec/codec/ccodec_progressivedecoder.cpp
+++ b/core/fxcodec/codec/ccodec_progressivedecoder.cpp
@@ -1653,7 +1653,7 @@
   m_offSet = 0;
   m_SrcWidth = m_SrcHeight = 0;
   m_SrcComponents = m_SrcBPC = 0;
-  m_clipBox = FX_RECT(0, 0, 0, 0);
+  m_clipBox = FX_RECT();
   m_startX = m_startY = 0;
   m_sizeX = m_sizeY = 0;
   m_SrcPassNumber = 0;
@@ -1686,7 +1686,7 @@
     return;
 
   if (clip->IsEmpty()) {
-    m_clipBox = FX_RECT(0, 0, 0, 0);
+    m_clipBox = FX_RECT();
     return;
   }
   clip->left = std::max(clip->left, 0);
@@ -1694,7 +1694,7 @@
   clip->top = std::max(clip->top, 0);
   clip->bottom = std::min(clip->bottom, m_SrcHeight);
   if (clip->IsEmpty()) {
-    m_clipBox = FX_RECT(0, 0, 0, 0);
+    m_clipBox = FX_RECT();
     return;
   }
   m_clipBox = *clip;

fpdfsdk/pwl/cpwl_wnd.cpp

diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp
index 66b069d..f2995c4 100644
--- a/fpdfsdk/pwl/cpwl_wnd.cpp
+++ b/fpdfsdk/pwl/cpwl_wnd.cpp
@@ -22,18 +22,7 @@
 }  // namespace
 
 CPWL_Wnd::CreateParams::CreateParams()
-    : rcRectWnd(0, 0, 0, 0),
-      dwFlags(0),
-      sBackgroundColor(),
-      nBorderStyle(BorderStyle::SOLID),
-      dwBorderWidth(1),
-      sBorderColor(),
-      sTextColor(),
-      nTransparency(255),
-      fFontSize(kDefaultFontSize),
-      sDash(3, 0, 0),
-      pMsgControl(nullptr),
-      eCursorType(FXCT_ARROW) {}
+    : fFontSize(kDefaultFontSize), sDash(3, 0, 0) {}
 
 CPWL_Wnd::CreateParams::CreateParams(const CreateParams& other) = default;
 

fpdfsdk/pwl/cpwl_wnd.h

diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h
index 3801cad..5b1c7cc 100644
--- a/fpdfsdk/pwl/cpwl_wnd.h
+++ b/fpdfsdk/pwl/cpwl_wnd.h
@@ -125,18 +125,18 @@
     UnownedPtr<IPVT_FontMap> pFontMap;                // required
     ProviderIface::ObservedPtr pProvider;             // required
     UnownedPtr<FocusHandlerIface> pFocusHandler;      // optional
-    uint32_t dwFlags;                                 // optional
+    uint32_t dwFlags = 0;                             // optional
     CFX_Color sBackgroundColor;                       // optional
     CPDFSDK_Widget::ObservedPtr pAttachedWidget;      // required
-    BorderStyle nBorderStyle;                         // optional
-    int32_t dwBorderWidth;                            // optional
+    BorderStyle nBorderStyle = BorderStyle::SOLID;    // optional
+    int32_t dwBorderWidth = 1;                        // optional
     CFX_Color sBorderColor;                           // optional
     CFX_Color sTextColor;                             // optional
-    int32_t nTransparency;                            // optional
+    int32_t nTransparency = 255;                      // optional
     float fFontSize;                                  // optional
     CPWL_Dash sDash;                                  // optional
-    CPWL_MsgControl* pMsgControl;                     // ignore
-    int32_t eCursorType;                              // ignore
+    CPWL_MsgControl* pMsgControl = nullptr;           // ignore
+    int32_t eCursorType = FXCT_ARROW;                 // ignore
     CFX_Matrix mtChild;                               // ignore
   };