Merge the CFWL_*Imp classes into the IFWL_* classes.

xfa/fwl/theme/cfwl_carettp.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/theme/cfwl_carettp.h"
 
-#include "xfa/fwl/basewidget/ifwl_caret.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
+#include "xfa/fwl/core/ifwl_caret.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 #include "xfa/fxgraphics/cfx_color.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
 CFWL_CaretTP::CFWL_CaretTP() {}
 CFWL_CaretTP::~CFWL_CaretTP() {}
 
 bool CFWL_CaretTP::IsValidWidget(IFWL_Widget* pWidget) {
   return pWidget && pWidget->GetClassID() == FWL_Type::Caret;
 }
@@ skipping 26 matching lines @@
   CFX_RectF rect = *pRect;
   path.AddRectangle(rect.left, rect.top, rect.width, rect.height);
   if (crFill) {
     pGraphics->SetFillColor(crFill);
   } else {
     CFX_Color crFilltemp(ArgbEncode(255, 0, 0, 0));
     pGraphics->SetFillColor(&crFilltemp);
   }
   pGraphics->FillPath(&path, FXFILL_WINDING, pMatrix);
 }