Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(501)

Unified Diff: xfa/src/fwl/src/basewidget/fwl_caretimp.cpp

Issue 1453473002: FWL refcounts never incremented (part 2). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Rebased Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp ('k') | xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/src/fwl/src/basewidget/fwl_caretimp.cpp
diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp
index 24104e19b5b3d9dcdb2a39ab0d0f378707dd8201..a7381e1ea6f2152230c5ee9b81dd0faa204482a2 100644
--- a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp
@@ -9,21 +9,17 @@
#include "../core/include/fwl_noteimp.h"
#include "../core/include/fwl_widgetimp.h"
#include "include/fwl_caretimp.h"
-IFWL_Caret::IFWL_Caret() {
-}
-FWL_ERR IFWL_Caret::Initialize(IFWL_Widget* pOuter) {
- CFWL_CaretImp* pCaretImpl = new CFWL_CaretImp(pOuter);
- SetImpl(pCaretImpl);
- pCaretImpl->SetInterface(this);
- return pCaretImpl->Initialize();
-}
-FWL_ERR IFWL_Caret::Initialize(const CFWL_WidgetImpProperties& properties,
+
+// static
+IFWL_Caret* IFWL_Caret::Create(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
+ IFWL_Caret* pCaret = new IFWL_Caret;
CFWL_CaretImp* pCaretImpl = new CFWL_CaretImp(properties, pOuter);
- SetImpl(pCaretImpl);
- pCaretImpl->SetInterface(this);
- return pCaretImpl->Initialize();
+ pCaret->SetImpl(pCaretImpl);
+ pCaretImpl->SetInterface(pCaret);
+ return pCaret;
}
+IFWL_Caret::IFWL_Caret() {}
FWL_ERR IFWL_Caret::ShowCaret(FX_BOOL bFlag) {
return static_cast<CFWL_CaretImp*>(GetImpl())->ShowCaret(bFlag);
}
@@ -36,18 +32,14 @@ FWL_ERR IFWL_Caret::SetFrequency(FX_DWORD elapse) {
FWL_ERR IFWL_Caret::SetColor(CFX_Color crFill) {
return static_cast<CFWL_CaretImp*>(GetImpl())->SetColor(crFill);
}
-CFWL_CaretImp::CFWL_CaretImp(IFWL_Widget* pOuter) : m_hTimer(NULL) {
- m_dwElapse = 400;
- m_pTimer = new CFWL_CaretTimer(this);
- m_bSetColor = FALSE;
- SetStates(FWL_STATE_CAT_HightLight);
-}
+
CFWL_CaretImp::CFWL_CaretImp(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter)
- : m_hTimer(NULL) {
- m_dwElapse = 400;
+ : CFWL_WidgetImp(properties, pOuter),
+ m_hTimer(nullptr),
+ m_dwElapse(400),
+ m_bSetColor(FALSE) {
m_pTimer = new CFWL_CaretTimer(this);
- m_bSetColor = FALSE;
SetStates(FWL_STATE_CAT_HightLight);
}
CFWL_CaretImp::~CFWL_CaretImp() {
« no previous file with comments | « xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp ('k') | xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698