Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

fpdfsdk/src/formfiller/FFL_IFormFiller.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/formfiller/FFL_CheckBox.h"
 #include "fpdfsdk/include/formfiller/FFL_ComboBox.h"
 #include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 #include "fpdfsdk/include/formfiller/FFL_IFormFiller.h"
@@ skipping 39 matching lines @@
   CPDF_Rect rcAnnot;
   pPDFAnnot->GetRect(rcAnnot);
 
   CPDF_Rect rcWin = CPWL_Utils::InflateRect(rcAnnot, 1);
   return rcWin.GetOutterRect();
 }
 
 void CFFL_IFormFiller::OnDraw(CPDFSDK_PageView* pPageView,
                               /*HDC hDC,*/ CPDFSDK_Annot* pAnnot,
                               CFX_RenderDevice* pDevice,
-                              CPDF_Matrix* pUser2Device,
+                              CFX_Matrix* pUser2Device,
                               /*const CRect& rcWindow,*/ FX_DWORD dwFlags) {
   ASSERT(pPageView != NULL);
   CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
 
   if (IsVisible(pWidget)) {
     if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE)) {
       if (pFormFiller->IsValid()) {
         pFormFiller->OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
         pAnnot->GetPDFPage();
 
@@ skipping 1003 matching lines @@
           bExit = TRUE;
           m_bNotifying = FALSE;
           return;
         }
       }
 
       m_bNotifying = FALSE;
     }
   }
 }