Remove IXFA_* interfaces.

xfa/include/fxfa/xfa_ffpageview.h

Index: xfa/include/fxfa/xfa_ffpageview.h
diff --git a/xfa/fxfa/app/xfa_ffpageview.h b/xfa/include/fxfa/xfa_ffpageview.h
similarity index 69%
rename from xfa/fxfa/app/xfa_ffpageview.h
rename to xfa/include/fxfa/xfa_ffpageview.h
index 20818e71075bb8d9d9dd75e380ef7766be602120..0e9d36652784e40898964b195bef10283819deb1 100644
--- a/xfa/fxfa/app/xfa_ffpageview.h
+++ b/xfa/include/fxfa/xfa_ffpageview.h
@@ -4,33 +4,32 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_APP_XFA_FFPAGEVIEW_H_
-#define XFA_FXFA_APP_XFA_FFPAGEVIEW_H_
+#ifndef XFA_INCLUDE_FXFA_XFA_FFPAGEVIEW_H_
+#define XFA_INCLUDE_FXFA_XFA_FFPAGEVIEW_H_
 
 #include "xfa/fxfa/parser/xfa_doclayout.h"
 
 class CXFA_FFWidget;
 class CXFA_FFDocView;
-class CXFA_FFPageView : public CXFA_ContainerLayoutItem, public IXFA_PageView {
+class CXFA_FFPageView : public CXFA_ContainerLayoutItem {
  public:
   CXFA_FFPageView(CXFA_FFDocView* pDocView, CXFA_Node* pPageArea);
   ~CXFA_FFPageView() override;
 
-  // IFXA_PageView:
-  IXFA_DocView* GetDocView() override;
-  int32_t GetPageViewIndex() override;
-  void GetPageViewRect(CFX_RectF& rtPage) override;
+  CXFA_FFDocView* GetDocView();
+  int32_t GetPageViewIndex();
+  void GetPageViewRect(CFX_RectF& rtPage);
   void GetDisplayMatrix(CFX_Matrix& mt,
                         const CFX_Rect& rtDisp,
-                        int32_t iRotate) override;
-  int32_t LoadPageView(IFX_Pause* pPause = NULL) override;
-  void UnloadPageView() override;
-  IXFA_Widget* GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) override;
+                        int32_t iRotate);
+  int32_t LoadPageView(IFX_Pause* pPause = NULL);
+  void UnloadPageView();
+  CXFA_FFWidget* GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy);
   IXFA_WidgetIterator* CreateWidgetIterator(
       uint32_t dwTraverseWay = XFA_TRAVERSEWAY_Form,
       uint32_t dwWidgetFilter = XFA_WIDGETFILTER_Visible |
                                 XFA_WIDGETFILTER_Viewable |
-                                XFA_WIDGETFILTER_AllType) override;
+                                XFA_WIDGETFILTER_AllType);
 
   FX_BOOL IsPageViewLoaded();
 
@@ -48,17 +47,17 @@ class CXFA_FFPageWidgetIterator : public IXFA_WidgetIterator {
   virtual void Release() { delete this; }
 
   virtual void Reset();
-  virtual IXFA_Widget* MoveToFirst();
-  virtual IXFA_Widget* MoveToLast();
-  virtual IXFA_Widget* MoveToNext();
-  virtual IXFA_Widget* MoveToPrevious();
-  virtual IXFA_Widget* GetCurrentWidget();
-  virtual FX_BOOL SetCurrentWidget(IXFA_Widget* hWidget);
+  virtual CXFA_FFWidget* MoveToFirst();

[Tom Sepez, 2016/03/31 17:01:58]

override

[dsinclair, 2016/03/31 19:52:28]

Done.

+  virtual CXFA_FFWidget* MoveToLast();
+  virtual CXFA_FFWidget* MoveToNext();
+  virtual CXFA_FFWidget* MoveToPrevious();
+  virtual CXFA_FFWidget* GetCurrentWidget();
+  virtual FX_BOOL SetCurrentWidget(CXFA_FFWidget* hWidget);
 
  protected:
-  IXFA_Widget* GetWidget(CXFA_LayoutItem* pLayoutItem);
+  CXFA_FFWidget* GetWidget(CXFA_LayoutItem* pLayoutItem);
   CXFA_FFPageView* m_pPageView;

[Tom Sepez, 2016/03/31 17:01:58]

nit: blank line here.

[dsinclair, 2016/03/31 19:52:28]

Done.

-  IXFA_Widget* m_hCurWidget;
+  CXFA_FFWidget* m_hCurWidget;
   uint32_t m_dwFilter;
   FX_BOOL m_bIgnorerelevant;
   CXFA_LayoutItemIterator m_sIterator;
@@ -81,12 +80,12 @@ class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator {
   virtual void Release();
 
   virtual void Reset();

[Tom Sepez, 2016/03/31 17:01:58]

overrides

[dsinclair, 2016/03/31 19:52:28]

Done.

-  virtual IXFA_Widget* MoveToFirst();
-  virtual IXFA_Widget* MoveToLast();
-  virtual IXFA_Widget* MoveToNext();
-  virtual IXFA_Widget* MoveToPrevious();
-  virtual IXFA_Widget* GetCurrentWidget();
-  virtual FX_BOOL SetCurrentWidget(IXFA_Widget* hWidget);
+  virtual CXFA_FFWidget* MoveToFirst();
+  virtual CXFA_FFWidget* MoveToLast();
+  virtual CXFA_FFWidget* MoveToNext();
+  virtual CXFA_FFWidget* MoveToPrevious();
+  virtual CXFA_FFWidget* GetCurrentWidget();
+  virtual FX_BOOL SetCurrentWidget(CXFA_FFWidget* hWidget);
 
  protected:
   CXFA_WidgetArray m_TabOrderWidgetArray;
@@ -108,4 +107,4 @@ class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator {
                       FX_BOOL bMarsterPage = FALSE);
 };
 
-#endif  // XFA_FXFA_APP_XFA_FFPAGEVIEW_H_
+#endif  // XFA_INCLUDE_FXFA_XFA_FFPAGEVIEW_H_