Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

fpdfsdk/src/pdfwindow/PWL_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 "fpdfsdk/include/pdfwindow/PDFWindow.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Utils.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
@@ skipping 15 matching lines @@
 
 CFX_ByteString CPWL_Caret::GetClassName() const {
   return "CPWL_Caret";
 }
 
 void CPWL_Caret::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
   GetCaretApp(sAppStream, CPDF_Point(0.0f, 0.0f));
 }
 
 void CPWL_Caret::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                    CPDF_Matrix* pUser2Device) {
+                                    CFX_Matrix* pUser2Device) {
   if (IsVisible() && m_bFlash) {
     CPDF_Rect rcRect = GetCaretRect();
     CPDF_Rect rcClip = GetClipRect();
 
     CFX_PathData path;
 
     path.SetPointCount(2);
 
     FX_FLOAT fCaretX = rcRect.left + m_fWidth * 0.5f;
     FX_FLOAT fCaretTop = rcRect.top;
@@ skipping 109 matching lines @@
 void CPWL_Caret::InvalidateRect(CPDF_Rect* pRect) {
   if (pRect) {
     CPDF_Rect rcRefresh = CPWL_Utils::InflateRect(*pRect, 0.5f);
     rcRefresh.top += 1;
     rcRefresh.bottom -= 1;
 
     CPWL_Wnd::InvalidateRect(&rcRefresh);
   } else
     CPWL_Wnd::InvalidateRect(pRect);
 }