From aa8bf7e42b8c73a9bc07ed6781364ba05f5a9776 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 24 Dec 2015 19:13:32 -0800 Subject: Merge to XFA: Switch from nonstd::unique_ptr to std::unique_ptr. TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/1547833002 . (cherry picked from commit d20dfba2ae10e8aeb328328f09da79ff904110a8) Review URL: https://codereview.chromium.org/1545183002 . --- xfa/src/fwl/src/basewidget/fwl_editimp.cpp | 2 +- xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h | 7 ++++--- xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h | 8 ++++---- xfa/src/fwl/src/basewidget/include/fwl_editimp.h | 8 ++++---- xfa/src/fwl/src/basewidget/include/fwl_listboximp.h | 6 +++--- xfa/src/fwl/src/lightwidget/barcode.cpp | 5 ++++- xfa/src/fwl/src/lightwidget/caret.cpp | 5 ++++- xfa/src/fwl/src/lightwidget/checkbox.cpp | 5 ++++- xfa/src/fwl/src/lightwidget/combobox.cpp | 5 ++++- xfa/src/fwl/src/lightwidget/datetimepicker.cpp | 5 ++++- xfa/src/fwl/src/lightwidget/edit.cpp | 5 ++++- xfa/src/fwl/src/lightwidget/listbox.cpp | 5 ++++- xfa/src/fwl/src/lightwidget/picturebox.cpp | 5 ++++- xfa/src/fwl/src/lightwidget/pushbutton.cpp | 5 ++++- xfa/src/fwl/src/lightwidget/scrollbar.cpp | 5 ++++- xfa/src/fwl/src/lightwidget/tooltipctrl.cpp | 5 ++++- xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp | 5 +++-- xfa/src/fxgraphics/src/fx_graphics.cpp | 5 +++-- 18 files changed, 66 insertions(+), 30 deletions(-) (limited to 'xfa') diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp index a35d1e60bf..c9ce62ece7 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -1314,7 +1314,7 @@ FX_BOOL CFWL_EditImp::UpdateOffset() { } FX_BOOL CFWL_EditImp::UpdateOffset(IFWL_ScrollBar* pScrollBar, FX_FLOAT fPosChanged) { - if (pScrollBar == m_pHorzScrollBar) { + if (pScrollBar == m_pHorzScrollBar.get()) { m_fScrollOffsetX += fPosChanged; } else { m_fScrollOffsetY += fPosChanged; diff --git a/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h b/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h index 000036d7c1..f315af2fed 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h @@ -7,7 +7,8 @@ #ifndef _FWL_COMBOBOX_IMP_H #define _FWL_COMBOBOX_IMP_H -#include "third_party/base/nonstd_unique_ptr.h" +#include + #include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h" @@ -164,8 +165,8 @@ class CFWL_ComboBoxImp : public CFWL_WidgetImp { CFX_RectF m_rtList; CFX_RectF m_rtProxy; CFX_RectF m_rtHandler; - nonstd::unique_ptr m_pEdit; - nonstd::unique_ptr m_pListBox; + std::unique_ptr m_pEdit; + std::unique_ptr m_pListBox; IFWL_Form* m_pForm; FX_BOOL m_bLButtonDown; FX_BOOL m_bUpFormHandler; diff --git a/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h b/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h index 118d11ff17..1fc82fb281 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h @@ -7,7 +7,7 @@ #ifndef _FWL_DATETIMEPICKER_IMP_H #define _FWL_DATETIMEPICKER_IMP_H -#include "third_party/base/nonstd_unique_ptr.h" +#include class CFWL_WidgetImp; class CFWL_WidgetImpProperties; @@ -180,9 +180,9 @@ class CFWL_DateTimePickerImp : public CFWL_WidgetImp { int32_t m_iMonth; int32_t m_iDay; FX_BOOL m_bLBtnDown; - nonstd::unique_ptr m_pEdit; - nonstd::unique_ptr m_pMonthCal; - nonstd::unique_ptr m_pForm; + std::unique_ptr m_pEdit; + std::unique_ptr m_pMonthCal; + std::unique_ptr m_pForm; FX_FLOAT m_fBtn; class CFWL_MonthCalendarImpDP : public IFWL_MonthCalendarDP { public: diff --git a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h index 1a610c74b0..650523cf16 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h @@ -7,7 +7,7 @@ #ifndef _FWL_EDIT_IMP_H #define _FWL_EDIT_IMP_H -#include "third_party/base/nonstd_unique_ptr.h" +#include class CFWL_WidgetImp; class CFWL_WidgetImpProperties; @@ -164,9 +164,9 @@ class CFWL_EditImp : public CFWL_WidgetImp, public IFDE_TxtEdtEventSink { FX_BOOL m_bSetRange; int32_t m_iMin; int32_t m_iMax; - nonstd::unique_ptr m_pVertScrollBar; - nonstd::unique_ptr m_pHorzScrollBar; - nonstd::unique_ptr m_pCaret; + std::unique_ptr m_pVertScrollBar; + std::unique_ptr m_pHorzScrollBar; + std::unique_ptr m_pCaret; CFX_WideString m_wsCache; friend class CFWL_TxtEdtEventSink; friend class CFWL_EditImpDelegate; diff --git a/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h b/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h index d7a7d9062c..7700f49eb4 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_listboximp.h @@ -7,7 +7,7 @@ #ifndef _FWL_LISTBOX_IMP_H #define _FWL_LISTBOX_IMP_H -#include "third_party/base/nonstd_unique_ptr.h" +#include class CFWL_WidgetImp; class CFWL_WidgetImpProperties; @@ -86,8 +86,8 @@ class CFWL_ListBoxImp : public CFWL_WidgetImp { CFX_RectF m_rtClient; CFX_RectF m_rtStatic; CFX_RectF m_rtConent; - nonstd::unique_ptr m_pHorzScrollBar; - nonstd::unique_ptr m_pVertScrollBar; + std::unique_ptr m_pHorzScrollBar; + std::unique_ptr m_pVertScrollBar; FX_DWORD m_dwTTOStyles; int32_t m_iTTOAligns; FWL_HLISTITEM m_hAnchor; diff --git a/xfa/src/fwl/src/lightwidget/barcode.cpp b/xfa/src/fwl/src/lightwidget/barcode.cpp index a0704c4bd9..1868b12686 100644 --- a/xfa/src/fwl/src/lightwidget/barcode.cpp +++ b/xfa/src/fwl/src/lightwidget/barcode.cpp @@ -4,7 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include + #include "../../../foxitlib.h" + CFWL_Barcode* CFWL_Barcode::Create() { return new CFWL_Barcode; } @@ -14,7 +17,7 @@ FWL_ERR CFWL_Barcode::Initialize(const CFWL_WidgetProperties* pProperties) { if (pProperties) { *m_pProperties = *pProperties; } - nonstd::unique_ptr pBarcode(IFWL_Barcode::Create( + std::unique_ptr pBarcode(IFWL_Barcode::Create( m_pProperties->MakeWidgetImpProperties(&m_barcodeData))); FWL_ERR ret = pBarcode->Initialize(); if (ret != FWL_ERR_Succeeded) { diff --git a/xfa/src/fwl/src/lightwidget/caret.cpp b/xfa/src/fwl/src/lightwidget/caret.cpp index f0ee8a5166..dcf6852ec0 100644 --- a/xfa/src/fwl/src/lightwidget/caret.cpp +++ b/xfa/src/fwl/src/lightwidget/caret.cpp @@ -4,7 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include + #include "../../../foxitlib.h" + CFWL_Caret* CFWL_Caret::Create() { return new CFWL_Caret; } @@ -14,7 +17,7 @@ FWL_ERR CFWL_Caret::Initialize(const CFWL_WidgetProperties* pProperties) { if (pProperties) { *m_pProperties = *pProperties; } - nonstd::unique_ptr pCaret(IFWL_Caret::Create( + std::unique_ptr pCaret(IFWL_Caret::Create( m_pProperties->MakeWidgetImpProperties(nullptr), nullptr)); FWL_ERR ret = pCaret->Initialize(); if (ret != FWL_ERR_Succeeded) { diff --git a/xfa/src/fwl/src/lightwidget/checkbox.cpp b/xfa/src/fwl/src/lightwidget/checkbox.cpp index b1b938435b..ea72cb622d 100644 --- a/xfa/src/fwl/src/lightwidget/checkbox.cpp +++ b/xfa/src/fwl/src/lightwidget/checkbox.cpp @@ -4,7 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include + #include "../../../foxitlib.h" + CFWL_CheckBox* CFWL_CheckBox::Create() { return new CFWL_CheckBox; } @@ -14,7 +17,7 @@ FWL_ERR CFWL_CheckBox::Initialize(const CFWL_WidgetProperties* pProperties) { if (pProperties) { *m_pProperties = *pProperties; } - nonstd::unique_ptr pCheckBox(IFWL_CheckBox::Create( + std::unique_ptr pCheckBox(IFWL_CheckBox::Create( m_pProperties->MakeWidgetImpProperties(&m_checkboxData), nullptr)); FWL_ERR ret = pCheckBox->Initialize(); if (ret != FWL_ERR_Succeeded) { diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp index 556601f32f..5756a6d832 100644 --- a/xfa/src/fwl/src/lightwidget/combobox.cpp +++ b/xfa/src/fwl/src/lightwidget/combobox.cpp @@ -4,7 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include + #include "../../../foxitlib.h" + CFWL_ComboBox* CFWL_ComboBox::Create() { return new CFWL_ComboBox; } @@ -14,7 +17,7 @@ FWL_ERR CFWL_ComboBox::Initialize(const CFWL_WidgetProperties* pProperties) { if (pProperties) { *m_pProperties = *pProperties; } - nonstd::unique_ptr pComboBox(IFWL_ComboBox::Create( + std::unique_ptr pComboBox(IFWL_ComboBox::Create( m_pProperties->MakeWidgetImpProperties(&m_comboBoxData))); FWL_ERR ret = pComboBox->Initialize(); if (ret != FWL_ERR_Succeeded) { diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp index 2b897943f1..1ceb4698e5 100644 --- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp +++ b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp @@ -4,7 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include + #include "../../../foxitlib.h" + CFWL_DateTimePicker* CFWL_DateTimePicker::Create() { return new CFWL_DateTimePicker; } @@ -15,7 +18,7 @@ FWL_ERR CFWL_DateTimePicker::Initialize( if (pProperties) { *m_pProperties = *pProperties; } - nonstd::unique_ptr pDateTimePicker( + std::unique_ptr pDateTimePicker( IFWL_DateTimePicker::Create( m_pProperties->MakeWidgetImpProperties(&m_DateTimePickerDP), nullptr)); diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp index a8a16850bf..d16c57b964 100644 --- a/xfa/src/fwl/src/lightwidget/edit.cpp +++ b/xfa/src/fwl/src/lightwidget/edit.cpp @@ -4,7 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include + #include "../../../foxitlib.h" + CFWL_Edit* CFWL_Edit::Create() { return new CFWL_Edit; } @@ -14,7 +17,7 @@ FWL_ERR CFWL_Edit::Initialize(const CFWL_WidgetProperties* pProperties) { if (pProperties) { *m_pProperties = *pProperties; } - nonstd::unique_ptr pEdit(IFWL_Edit::Create( + std::unique_ptr pEdit(IFWL_Edit::Create( m_pProperties->MakeWidgetImpProperties(nullptr), nullptr)); FWL_ERR ret = pEdit->Initialize(); if (ret != FWL_ERR_Succeeded) { diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp index ae8b6b944e..541baf4fed 100644 --- a/xfa/src/fwl/src/lightwidget/listbox.cpp +++ b/xfa/src/fwl/src/lightwidget/listbox.cpp @@ -4,7 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include + #include "../../../foxitlib.h" + CFWL_ListBox* CFWL_ListBox::Create() { return new CFWL_ListBox; } @@ -14,7 +17,7 @@ FWL_ERR CFWL_ListBox::Initialize(const CFWL_WidgetProperties* pProperties) { if (pProperties) { *m_pProperties = *pProperties; } - nonstd::unique_ptr pListBox(IFWL_ListBox::Create( + std::unique_ptr pListBox(IFWL_ListBox::Create( m_pProperties->MakeWidgetImpProperties(&m_ListBoxDP), nullptr)); FWL_ERR ret = pListBox->Initialize(); if (ret != FWL_ERR_Succeeded) { diff --git a/xfa/src/fwl/src/lightwidget/picturebox.cpp b/xfa/src/fwl/src/lightwidget/picturebox.cpp index 6979966e38..33ca399c78 100644 --- a/xfa/src/fwl/src/lightwidget/picturebox.cpp +++ b/xfa/src/fwl/src/lightwidget/picturebox.cpp @@ -4,7 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include + #include "../../../foxitlib.h" + CFWL_PictureBox* CFWL_PictureBox::Create() { return new CFWL_PictureBox; } @@ -14,7 +17,7 @@ FWL_ERR CFWL_PictureBox::Initialize(const CFWL_WidgetProperties* pProperties) { if (pProperties) { *m_pProperties = *pProperties; } - nonstd::unique_ptr pPictureBox(IFWL_PictureBox::Create( + std::unique_ptr pPictureBox(IFWL_PictureBox::Create( m_pProperties->MakeWidgetImpProperties(&m_PictureBoxDP), nullptr)); FWL_ERR ret = pPictureBox->Initialize(); if (ret != FWL_ERR_Succeeded) { diff --git a/xfa/src/fwl/src/lightwidget/pushbutton.cpp b/xfa/src/fwl/src/lightwidget/pushbutton.cpp index a3df89106d..9efe11cba1 100644 --- a/xfa/src/fwl/src/lightwidget/pushbutton.cpp +++ b/xfa/src/fwl/src/lightwidget/pushbutton.cpp @@ -4,7 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include + #include "../../../foxitlib.h" + CFWL_PushButton* CFWL_PushButton::Create() { return new CFWL_PushButton; } @@ -14,7 +17,7 @@ FWL_ERR CFWL_PushButton::Initialize(const CFWL_WidgetProperties* pProperties) { if (pProperties) { *m_pProperties = *pProperties; } - nonstd::unique_ptr pPushButton(IFWL_PushButton::Create( + std::unique_ptr pPushButton(IFWL_PushButton::Create( m_pProperties->MakeWidgetImpProperties(&m_buttonData), nullptr)); FWL_ERR ret = pPushButton->Initialize(); if (ret != FWL_ERR_Succeeded) { diff --git a/xfa/src/fwl/src/lightwidget/scrollbar.cpp b/xfa/src/fwl/src/lightwidget/scrollbar.cpp index 2b9fc8be1c..6bca86c98c 100644 --- a/xfa/src/fwl/src/lightwidget/scrollbar.cpp +++ b/xfa/src/fwl/src/lightwidget/scrollbar.cpp @@ -4,7 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include + #include "../../../foxitlib.h" + CFWL_ScrollBar* CFWL_ScrollBar::Create() { return new CFWL_ScrollBar; } @@ -14,7 +17,7 @@ FWL_ERR CFWL_ScrollBar::Initialize(const CFWL_WidgetProperties* pProperties) { if (pProperties) { *m_pProperties = *pProperties; } - nonstd::unique_ptr pScrollBar(IFWL_ScrollBar::Create( + std::unique_ptr pScrollBar(IFWL_ScrollBar::Create( m_pProperties->MakeWidgetImpProperties(nullptr), nullptr)); FWL_ERR ret = pScrollBar->Initialize(); if (ret != FWL_ERR_Succeeded) { diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp index c2ee5636ce..908fe3d357 100644 --- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp +++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include + #include "../../../foxitlib.h" #include "../core/include/fwl_targetimp.h" #include "../core/include/fwl_noteimp.h" @@ -11,6 +13,7 @@ #include "../core/include/fwl_panelimp.h" #include "../core/include/fwl_formimp.h" #include "../core/include/fwl_threadimp.h" + CFWL_ToolTip* CFWL_ToolTip::Create() { return new CFWL_ToolTip; } @@ -20,7 +23,7 @@ FWL_ERR CFWL_ToolTip::Initialize(const CFWL_WidgetProperties* pProperties) { if (pProperties) { *m_pProperties = *pProperties; } - nonstd::unique_ptr pToolTip(IFWL_ToolTip::Create( + std::unique_ptr pToolTip(IFWL_ToolTip::Create( m_pProperties->MakeWidgetImpProperties(&m_tooltipData), nullptr)); FWL_ERR ret = pToolTip->Initialize(); if (ret != FWL_ERR_Succeeded) { diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp index 1a6afa7e1e..662e773af3 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp @@ -22,10 +22,11 @@ #include "BC_OneDimWriter.h" +#include + #include "../BC_Writer.h" #include "../barcode.h" #include "../common/BC_CommonBitMatrix.h" -#include "third_party/base/nonstd_unique_ptr.h" CBC_OneDimWriter::CBC_OneDimWriter() { m_locTextLoc = BC_TEXT_LOC_BELOWEMBED; @@ -132,7 +133,7 @@ void CBC_OneDimWriter::CalcTextInfo(const CFX_ByteString& text, FX_FLOAT geWidth, int32_t fontSize, FX_FLOAT& charsLen) { - nonstd::unique_ptr encoding( + std::unique_ptr encoding( FX_CreateFontEncodingEx(cFont)); int32_t length = text.GetLength(); diff --git a/xfa/src/fxgraphics/src/fx_graphics.cpp b/xfa/src/fxgraphics/src/fx_graphics.cpp index d983b5d6f8..69069817aa 100644 --- a/xfa/src/fxgraphics/src/fx_graphics.cpp +++ b/xfa/src/fxgraphics/src/fx_graphics.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include + #include "fx_path_generator.h" #include "pre.h" -#include "third_party/base/nonstd_unique_ptr.h" class CAGG_Graphics { public: @@ -1099,7 +1100,7 @@ FX_ERR CFX_Graphics::CalcTextInfo(const CFX_WideString& text, FX_DWORD* charCodes, FXTEXT_CHARPOS* charPos, CFX_RectF& rect) { - nonstd::unique_ptr encoding( + std::unique_ptr encoding( new CFX_UnicodeEncoding(_info._font)); int32_t length = text.GetLength(); FX_FLOAT penX = (FX_FLOAT)rect.left; -- cgit v1.2.3