Remove IFDE_Image, IFDE_PathSet, IFDE_ImageSet, and IFDE_WidgetSet.

xfa/fde/fde_iterator.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 "xfa/fde/fde_iterator.h"
 
 #include "xfa/fgas/crt/fgas_utils.h"
 
@@ skipping 16 matching lines @@
   }
   return m_CanvasStack.Push(canvas) == 0;
 }
 FX_BOOL CFDE_VisualSetIterator::FilterObjects(uint32_t dwObjects) {
   if (m_CanvasStack.GetSize() == 0) {
     return FALSE;
   }
   while (m_CanvasStack.GetSize() > 1) {
     m_CanvasStack.Pop();
   }
-  m_dwFilter = dwObjects & ~(uint32_t)FDE_VISUALOBJ_Widget;

[dsinclair, 2016/04/11 14:04:26]

Accidentally removed the instance variable m_dwFilter which broke bug_434.pdf

-  if (dwObjects & FDE_VISUALOBJ_Widget) {
-    m_dwFilter |= 0xFF00;
-  }
+
   FDE_CANVASITEM* pCanvas = m_CanvasStack.GetTopElement();
   FXSYS_assert(pCanvas != NULL && pCanvas->pCanvas != NULL);
   pCanvas->hPos = pCanvas->pCanvas->GetFirstPosition(NULL);
   return pCanvas->hPos != NULL;
 }
 void CFDE_VisualSetIterator::Reset() {
   FilterObjects(m_dwFilter);
 }
 FDE_HVISUALOBJ CFDE_VisualSetIterator::GetNext(IFDE_VisualSet*& pVisualSet,
                                                FDE_HVISUALOBJ* phCanvasObj,
@@ skipping 14 matching lines @@
       FXSYS_assert(hObj != NULL);
       FDE_VISUALOBJTYPE eType = pVisualSet->GetType();
       if (eType == FDE_VISUALOBJ_Canvas) {
         FDE_CANVASITEM canvas;
         canvas.hCanvas = hObj;
         canvas.pCanvas = (IFDE_CanvasSet*)pVisualSet;
         canvas.hPos = canvas.pCanvas->GetFirstPosition(hObj);
         m_CanvasStack.Push(canvas);
         break;
       }
-      uint32_t dwObj =
-          (eType == FDE_VISUALOBJ_Widget)
-              ? (uint32_t)((IFDE_WidgetSet*)pVisualSet)->GetWidgetType(hObj)
-              : (uint32_t)eType;
+      uint32_t dwObj = (uint32_t)eType;
       if ((m_dwFilter & dwObj) != 0) {
         if (ppCanvasSet) {
           *ppCanvasSet = pCanvas->pCanvas;
         }
         if (phCanvasObj) {
           *phCanvasObj = pCanvas->hCanvas;
         }
         return hObj;
       }
     } while (pCanvas->hPos != NULL);
   }
   if (ppCanvasSet) {
     *ppCanvasSet = NULL;
   }
   if (phCanvasObj) {
     *phCanvasObj = NULL;
   }
   pVisualSet = NULL;
   return NULL;
 }