summaryrefslogtreecommitdiff
path: root/xfa/fde/fde_iterator.cpp
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-04-13 10:58:52 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-13 10:58:52 -0700
commit08153b16fb1c7e9849cc33f1b9d4f1521240d18e (patch)
tree4906b17cc38830d9a341b571011c930907c06795 /xfa/fde/fde_iterator.cpp
parent6d8e981b51458f0381031fe240f5215db9906622 (diff)
downloadpdfium-08153b16fb1c7e9849cc33f1b9d4f1521240d18e.tar.xz
Remove IFDE_Image, IFDE_PathSet, IFDE_ImageSet, and IFDE_WidgetSet.
These interfaces were not implemented, removed. BUG=pdfium:468 Review URL: https://codereview.chromium.org/1866333003
Diffstat (limited to 'xfa/fde/fde_iterator.cpp')
-rw-r--r--xfa/fde/fde_iterator.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/xfa/fde/fde_iterator.cpp b/xfa/fde/fde_iterator.cpp
index 097be1d01f..4356e22ee2 100644
--- a/xfa/fde/fde_iterator.cpp
+++ b/xfa/fde/fde_iterator.cpp
@@ -28,16 +28,14 @@ FX_BOOL CFDE_VisualSetIterator::AttachCanvas(IFDE_CanvasSet* pCanvas) {
return m_CanvasStack.Push(canvas) == 0;
}
FX_BOOL CFDE_VisualSetIterator::FilterObjects(uint32_t dwObjects) {
- if (m_CanvasStack.GetSize() == 0) {
+ if (m_CanvasStack.GetSize() == 0)
return FALSE;
- }
- while (m_CanvasStack.GetSize() > 1) {
+
+ while (m_CanvasStack.GetSize() > 1)
m_CanvasStack.Pop();
- }
- m_dwFilter = dwObjects & ~(uint32_t)FDE_VISUALOBJ_Widget;
- if (dwObjects & FDE_VISUALOBJ_Widget) {
- m_dwFilter |= 0xFF00;
- }
+
+ m_dwFilter = dwObjects;
+
FDE_CANVASITEM* pCanvas = m_CanvasStack.GetTopElement();
FXSYS_assert(pCanvas != NULL && pCanvas->pCanvas != NULL);
pCanvas->hPos = pCanvas->pCanvas->GetFirstPosition(NULL);
@@ -72,10 +70,7 @@ FDE_HVISUALOBJ CFDE_VisualSetIterator::GetNext(IFDE_VisualSet*& pVisualSet,
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;