Make FWL_ classes more consistently named.

Rename IFWL_Target::m_pData to m_pImpl since it points
to CFWL_*Imp classes.

Rename CFWL_Widget:m_pImp to m_pIface since it points
to IFWL_* interface classes.  Here, the concrete classes
have pointers to the corresponding interfaces, rather
than inheriting from them, and this is likely due to
someone not understanding virtual inheritance (since this
code has the diamond problem in spades).

Rename CFWL_Target to CWFL_TargetImp since it is the root
of the CFWL_*Imp hierarchy, and is pointed to by the
m_pImpl slot.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1446393002 .

4 files changed, 21 insertions, 21 deletions

diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
index 47eecbc1ea..59c9323956 100644
--- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
@@ -251,7 +251,7 @@ FX_BOOL CXFA_FFCheckButton::OnLButtonUp(FX_DWORD dwFlags,
   ms.m_fx = fx;

   ms.m_fy = fy;

   FWLToClient(ms.m_fx, ms.m_fy);

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   TranslateFWLMessage(&ms);

   return TRUE;

 }

diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/src/app/xfa_fffield.cpp
index 9051cfdb02..9b70f65eae 100644
--- a/xfa/src/fxfa/src/app/xfa_fffield.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fffield.cpp
@@ -114,7 +114,7 @@ void CXFA_FFField::DrawFocus(CFX_Graphics* pGS, CFX_Matrix* pMatrix) {
 }

 void CXFA_FFField::SetFWLThemeProvider() {

   if (m_pNormalWidget) {

-    m_pNormalWidget->m_pImp->SetThemeProvider(GetApp()->GetFWLTheme());

+    m_pNormalWidget->m_pIface->SetThemeProvider(GetApp()->GetFWLTheme());

   }

 }

 FX_BOOL CXFA_FFField::IsLoaded() {

@@ -361,7 +361,7 @@ FX_BOOL CXFA_FFField::OnMouseEnter() {
   }

   CFWL_MsgMouse ms;

   ms.m_dwCmd = FWL_MSGMOUSECMD_MouseEnter;

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   ms.m_pSrcTarget = NULL;

   TranslateFWLMessage(&ms);

   return TRUE;

@@ -372,7 +372,7 @@ FX_BOOL CXFA_FFField::OnMouseExit() {
   }

   CFWL_MsgMouse ms;

   ms.m_dwCmd = FWL_MSGMOUSECMD_MouseLeave;

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   TranslateFWLMessage(&ms);

   return TRUE;

 }

@@ -405,7 +405,7 @@ FX_BOOL CXFA_FFField::OnLButtonDown(FX_DWORD dwFlags,
   ms.m_fx = fx;

   ms.m_fy = fy;

   FWLToClient(ms.m_fx, ms.m_fy);

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   TranslateFWLMessage(&ms);

   return TRUE;

 }

@@ -423,7 +423,7 @@ FX_BOOL CXFA_FFField::OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   ms.m_fx = fx;

   ms.m_fy = fy;

   FWLToClient(ms.m_fx, ms.m_fy);

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   TranslateFWLMessage(&ms);

   return TRUE;

 }

@@ -439,7 +439,7 @@ FX_BOOL CXFA_FFField::OnLButtonDblClk(FX_DWORD dwFlags,
   ms.m_fx = fx;

   ms.m_fy = fy;

   FWLToClient(ms.m_fx, ms.m_fy);

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   TranslateFWLMessage(&ms);

   return TRUE;

 }

@@ -453,7 +453,7 @@ FX_BOOL CXFA_FFField::OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   ms.m_fx = fx;

   ms.m_fy = fy;

   FWLToClient(ms.m_fx, ms.m_fy);

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   TranslateFWLMessage(&ms);

   return TRUE;

 }

@@ -472,7 +472,7 @@ FX_BOOL CXFA_FFField::OnMouseWheel(FX_DWORD dwFlags,
   FWLToClient(ms.m_fx, ms.m_fy);

   ms.m_fDeltaX = zDelta;

   ms.m_fDeltaY = 0;

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   TranslateFWLMessage(&ms);

   return TRUE;

 }

@@ -496,7 +496,7 @@ FX_BOOL CXFA_FFField::OnRButtonDown(FX_DWORD dwFlags,
   ms.m_fx = fx;

   ms.m_fy = fy;

   FWLToClient(ms.m_fx, ms.m_fy);

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   TranslateFWLMessage(&ms);

   return TRUE;

 }

@@ -514,7 +514,7 @@ FX_BOOL CXFA_FFField::OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   ms.m_fx = fx;

   ms.m_fy = fy;

   FWLToClient(ms.m_fx, ms.m_fy);

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   TranslateFWLMessage(&ms);

   return TRUE;

 }

@@ -530,7 +530,7 @@ FX_BOOL CXFA_FFField::OnRButtonDblClk(FX_DWORD dwFlags,
   ms.m_fx = fx;

   ms.m_fy = fy;

   FWLToClient(ms.m_fx, ms.m_fy);

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   TranslateFWLMessage(&ms);

   return TRUE;

 }

@@ -541,7 +541,7 @@ FX_BOOL CXFA_FFField::OnSetFocus(CXFA_FFWidget* pOldWidget) {
     return FALSE;

   }

   CFWL_MsgSetFocus ms;

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   ms.m_pSrcTarget = NULL;

   TranslateFWLMessage(&ms);

   m_dwStatus |= XFA_WIDGETSTATUS_Focused;

@@ -553,7 +553,7 @@ FX_BOOL CXFA_FFField::OnKillFocus(CXFA_FFWidget* pNewWidget) {
     return CXFA_FFWidget::OnKillFocus(pNewWidget);

   }

   CFWL_MsgKillFocus ms;

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   ms.m_pSrcTarget = NULL;

   TranslateFWLMessage(&ms);

   m_dwStatus &= ~XFA_WIDGETSTATUS_Focused;

@@ -569,7 +569,7 @@ FX_BOOL CXFA_FFField::OnKeyDown(FX_DWORD dwKeyCode, FX_DWORD dwFlags) {
   ms.m_dwCmd = FWL_MSGKEYCMD_KeyDown;

   ms.m_dwFlags = dwFlags;

   ms.m_dwKeyCode = dwKeyCode;

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   ms.m_pSrcTarget = NULL;

   TranslateFWLMessage(&ms);

   return TRUE;

@@ -582,7 +582,7 @@ FX_BOOL CXFA_FFField::OnKeyUp(FX_DWORD dwKeyCode, FX_DWORD dwFlags) {
   ms.m_dwCmd = FWL_MSGKEYCMD_KeyUp;

   ms.m_dwFlags = dwFlags;

   ms.m_dwKeyCode = dwKeyCode;

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   ms.m_pSrcTarget = NULL;

   TranslateFWLMessage(&ms);

   return TRUE;

@@ -604,7 +604,7 @@ FX_BOOL CXFA_FFField::OnChar(FX_DWORD dwChar, FX_DWORD dwFlags) {
   ms.m_dwCmd = FWL_MSGKEYCMD_Char;

   ms.m_dwFlags = dwFlags;

   ms.m_dwKeyCode = dwChar;

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   ms.m_pSrcTarget = NULL;

   TranslateFWLMessage(&ms);

   return TRUE;

diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
index b22a00dd83..890169621a 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
@@ -93,7 +93,7 @@ FX_BOOL CXFA_FFImageEdit::OnLButtonDown(FX_DWORD dwFlags,
   ms.m_dwFlags = dwFlags;

   ms.m_fx = fx;

   ms.m_fy = fy;

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   FWLToClient(ms.m_fx, ms.m_fy);

   TranslateFWLMessage(&ms);

   IXFA_AppProvider* pAppProvider = GetAppProvider();

diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
index ce43ce0481..3ba8072ee6 100644
--- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
@@ -102,7 +102,7 @@ FX_BOOL CXFA_FFTextEdit::OnLButtonDown(FX_DWORD dwFlags,
   ms.m_dwFlags = dwFlags;

   ms.m_fx = fx;

   ms.m_fy = fy;

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   FWLToClient(ms.m_fx, ms.m_fy);

   TranslateFWLMessage(&ms);

   return TRUE;

@@ -151,14 +151,14 @@ FX_BOOL CXFA_FFTextEdit::OnSetFocus(CXFA_FFWidget* pOldWidget) {
   }

   CXFA_FFWidget::OnSetFocus(pOldWidget);

   CFWL_MsgSetFocus ms;

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   ms.m_pSrcTarget = NULL;

   TranslateFWLMessage(&ms);

   return TRUE;

 }

 FX_BOOL CXFA_FFTextEdit::OnKillFocus(CXFA_FFWidget* pNewWidget) {

   CFWL_MsgKillFocus ms;

-  ms.m_pDstTarget = m_pNormalWidget->m_pImp;

+  ms.m_pDstTarget = m_pNormalWidget->m_pIface;

   ms.m_pSrcTarget = NULL;

   TranslateFWLMessage(&ms);

   m_dwStatus &= ~XFA_WIDGETSTATUS_Focused;