commit 45b9ae18668e996f90780880dd691d69fa13cbe1
author Tom Sepez <tsepez@chromium.org> Thu May 18 08:34:03 2017 -0700
committer Chromium commit bot <commit-bot@chromium.org> Thu May 18 15:56:06 2017 +0000
tree de3f9ab81d0be99efb2698130a0eeb705f421656
parent 2034b941dfa07d30c286bfcceffd6904740ac446

Revert "Smells like a leak in PWL_ComboBox.cpp"

This reverts commit b084c1f615e9b5d82a36aeedcff2339b7ac91265.

Reason for revert: new crashes.
BUG=723415
TBR=dsinclair@chromium.org

Change-Id: I5194170f74a5781dad213d08a28e574eb6d56156
Reviewed-on: https://pdfium-review.googlesource.com/5655
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

fpdfsdk/pdfwindow/PWL_ComboBox.cpp

diff --git a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
index 9f5ab97..b6c8d2f 100644
--- a/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ComboBox.cpp
@@ -181,7 +181,10 @@
 }
 
 CPWL_ComboBox::CPWL_ComboBox()
-    : m_bPopup(false),
+    : m_pEdit(nullptr),
+      m_pButton(nullptr),
+      m_pList(nullptr),
+      m_bPopup(false),
       m_nPopupWhere(0),
       m_nSelectItem(-1),
       m_pFillerNotify(nullptr) {}
@@ -264,7 +267,7 @@
   if (m_pEdit)
     return;
 
-  m_pEdit = pdfium::MakeUnique<CPWL_CBEdit>();
+  m_pEdit = new CPWL_CBEdit();
   m_pEdit->AttachFFLData(m_pFormFiller.Get());
 
   PWL_CREATEPARAM ecp = cp;
@@ -288,7 +291,7 @@
   if (m_pButton)
     return;
 
-  m_pButton = pdfium::MakeUnique<CPWL_CBButton>();
+  m_pButton = new CPWL_CBButton;
 
   PWL_CREATEPARAM bcp = cp;
   bcp.pParentWnd = this;
@@ -305,7 +308,7 @@
   if (m_pList)
     return;
 
-  m_pList = pdfium::MakeUnique<CPWL_CBListBox>();
+  m_pList = new CPWL_CBListBox();
   m_pList->AttachFFLData(m_pFormFiller.Get());
 
   PWL_CREATEPARAM lcp = cp;
@@ -585,14 +588,14 @@
                              intptr_t lParam) {
   switch (msg) {
     case PNM_LBUTTONDOWN:
-      if (pWnd == m_pButton.get()) {
+      if (pWnd == m_pButton) {
         SetPopup(!m_bPopup);
         return;
       }
       break;
     case PNM_LBUTTONUP:
       if (m_pEdit && m_pList) {
-        if (pWnd == m_pList.get()) {
+        if (pWnd == m_pList) {
           SetSelectText();
           SelectAll();
           m_pEdit->SetFocus();