Unify CFWL_WidgetProperties and CFWL_WidgetImpProperties.

xfa/fwl/core/ifwl_caret.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/core/ifwl_caret.h"
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_widgetimpproperties.h"
+#include "xfa/fwl/core/cfwl_widgetproperties.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/ifwl_caret.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 
 IFWL_Caret::IFWL_Caret(const IFWL_App* app,
-                       const CFWL_WidgetImpProperties& properties,
+                       std::unique_ptr<CFWL_WidgetProperties> properties,
                        IFWL_Widget* pOuter)
-    : IFWL_Widget(app, properties, pOuter),
+    : IFWL_Widget(app, std::move(properties), pOuter),
       m_pTimer(new IFWL_Caret::Timer(this)),
       m_pTimerInfo(nullptr),
       m_dwElapse(400),
       m_bSetColor(false) {
   SetStates(FWL_STATE_CAT_HightLight);
 }
 
 IFWL_Caret::~IFWL_Caret() {
   if (m_pTimerInfo) {
     m_pTimerInfo->StopTimer();
@@ skipping 80 matching lines @@
 void IFWL_Caret::Timer::Run(IFWL_TimerInfo* pTimerInfo) {
   IFWL_Caret* pCaret = static_cast<IFWL_Caret*>(m_pWidget);
   bool toggle = !(pCaret->GetStates() & FWL_STATE_CAT_HightLight);
   pCaret->SetStates(FWL_STATE_CAT_HightLight, toggle);
 
   CFX_RectF rt;
   pCaret->GetWidgetRect(rt);
   rt.Set(0, 0, rt.width + 1, rt.height);
   pCaret->Repaint(&rt);
 }