From 705f829624bfc53e316f750bf91a32c8ae3ad1b5 Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Tue, 7 Jun 2016 10:10:45 -0700
Subject: Remove FDE_HVISUALOBJ.

This CL removes the FDE_HVISUALOBJ in favour of the concrete FDE_TEXTEDITPIECE
class. The parameter was removed from any method which didn't use it and the
non-implemented methods were removed.

Review-Url: https://codereview.chromium.org/2047693002
---
 xfa/fde/fde_iterator.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'xfa/fde/fde_iterator.cpp')

diff --git a/xfa/fde/fde_iterator.cpp b/xfa/fde/fde_iterator.cpp
index 53d86e8520..d04467f06f 100644
--- a/xfa/fde/fde_iterator.cpp
+++ b/xfa/fde/fde_iterator.cpp
@@ -21,7 +21,7 @@ FX_BOOL CFDE_VisualSetIterator::AttachCanvas(IFDE_CanvasSet* pCanvas) {
   FDE_CANVASITEM canvas;
   canvas.hCanvas = nullptr;
   canvas.pCanvas = pCanvas;
-  canvas.hPos = pCanvas->GetFirstPosition(nullptr);
+  canvas.hPos = pCanvas->GetFirstPosition();
   if (!canvas.hPos)
     return FALSE;
 
@@ -40,7 +40,7 @@ FX_BOOL CFDE_VisualSetIterator::FilterObjects(uint32_t dwObjects) {
   FDE_CANVASITEM* pCanvas = m_CanvasStack.GetTopElement();
   ASSERT(pCanvas && pCanvas->pCanvas);
 
-  pCanvas->hPos = pCanvas->pCanvas->GetFirstPosition(nullptr);
+  pCanvas->hPos = pCanvas->pCanvas->GetFirstPosition();
   return !!pCanvas->hPos;
 }
 
@@ -48,9 +48,10 @@ void CFDE_VisualSetIterator::Reset() {
   FilterObjects(m_dwFilter);
 }
 
-FDE_HVISUALOBJ CFDE_VisualSetIterator::GetNext(IFDE_VisualSet*& pVisualSet,
-                                               FDE_HVISUALOBJ* phCanvasObj,
-                                               IFDE_CanvasSet** ppCanvasSet) {
+FDE_TEXTEDITPIECE* CFDE_VisualSetIterator::GetNext(
+    IFDE_VisualSet*& pVisualSet,
+    FDE_TEXTEDITPIECE** phCanvasObj,
+    IFDE_CanvasSet** ppCanvasSet) {
   while (m_CanvasStack.GetSize() > 0) {
     FDE_CANVASITEM* pCanvas = m_CanvasStack.GetTopElement();
     ASSERT(pCanvas && pCanvas->pCanvas);
@@ -63,16 +64,16 @@ FDE_HVISUALOBJ CFDE_VisualSetIterator::GetNext(IFDE_VisualSet*& pVisualSet,
       continue;
     }
     do {
-      FDE_HVISUALOBJ hObj = pCanvas->pCanvas->GetNext(
-          pCanvas->hCanvas, pCanvas->hPos, pVisualSet);
-      ASSERT(hObj);
+      FDE_TEXTEDITPIECE* pObj =
+          pCanvas->pCanvas->GetNext(pCanvas->hPos, pVisualSet);
+      ASSERT(pObj);
 
       FDE_VISUALOBJTYPE eType = pVisualSet->GetType();
       if (eType == FDE_VISUALOBJ_Canvas) {
         FDE_CANVASITEM canvas;
-        canvas.hCanvas = hObj;
+        canvas.hCanvas = pObj;
         canvas.pCanvas = (IFDE_CanvasSet*)pVisualSet;
-        canvas.hPos = canvas.pCanvas->GetFirstPosition(hObj);
+        canvas.hPos = canvas.pCanvas->GetFirstPosition();
         m_CanvasStack.Push(canvas);
         break;
       }
@@ -82,7 +83,7 @@ FDE_HVISUALOBJ CFDE_VisualSetIterator::GetNext(IFDE_VisualSet*& pVisualSet,
           *ppCanvasSet = pCanvas->pCanvas;
         if (phCanvasObj)
           *phCanvasObj = pCanvas->hCanvas;
-        return hObj;
+        return pObj;
       }
     } while (pCanvas->hPos);
   }
-- 
cgit v1.2.3