Chromium Code Reviews| Index: xfa/fwl/core/fwl_noteimp.cpp |
| diff --git a/xfa/fwl/core/fwl_noteimp.cpp b/xfa/fwl/core/fwl_noteimp.cpp |
| index f115e2fd1b94dd0ca550e9343c1ad75c8959089f..82fb03cb12fae9ec69fa43142f4b8548809279d8 100644 |
| --- a/xfa/fwl/core/fwl_noteimp.cpp |
| +++ b/xfa/fwl/core/fwl_noteimp.cpp |
| @@ -70,10 +70,9 @@ CFWL_NoteDriver::CFWL_NoteDriver() |
| m_pFocus(nullptr), |
| m_pGrab(nullptr), |
| m_pNoteLoop(new CFWL_NoteLoop) { |
| - PushNoteLoop(m_pNoteLoop); |
| + PushNoteLoop(m_pNoteLoop.get()); |
| } |
| CFWL_NoteDriver::~CFWL_NoteDriver() { |
| - delete m_pNoteLoop; |
| ClearInvalidEventTargets(TRUE); |
| } |
| @@ -773,11 +772,12 @@ FX_BOOL CFWL_EventTarget::IsFilterEvent(CFWL_Event* pEvent, uint32_t dwFilter) { |
| CFWL_ToolTipContainer* CFWL_ToolTipContainer::s_pInstance = nullptr; |
| -CFWL_ToolTipContainer::CFWL_ToolTipContainer() : m_pToolTipImp(nullptr) { |
| - m_ToolTipDp = new CFWL_CoreToolTipDP; |
| - m_ToolTipDp->m_nInitDelayTime = 0; |
| - m_ToolTipDp->m_nAutoPopDelayTime = 2000; |
| +CFWL_ToolTipContainer::CFWL_ToolTipContainer() |
| + : m_pToolTipImp(nullptr), m_pToolTipDp(new CFWL_CoreToolTipDP) { |
| + m_pToolTipDp->m_nInitDelayTime = 0; |
|
Lei Zhang
2016/08/04 18:49:31
Pass these into the CFWL_CoreToolTipDP ctor? The v
Wei Li
2016/08/04 22:16:04
Done.
|
| + m_pToolTipDp->m_nAutoPopDelayTime = 2000; |
| } |
| + |
| CFWL_ToolTipContainer::~CFWL_ToolTipContainer() { |
| if (m_pToolTipImp) { |
| IFWL_ToolTip* pToolTip = |
| @@ -785,7 +785,6 @@ CFWL_ToolTipContainer::~CFWL_ToolTipContainer() { |
| pToolTip->Finalize(); |
| delete pToolTip; |
| } |
| - delete m_ToolTipDp; |
| } |
| // static |