From c068c8e1ac5d41ace2a89827601669e8b573ef48 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 14 Aug 2017 11:09:35 -0400 Subject: Remove FDE_VISUALOBJ_Canvas No code sets the visual object type of Canvas. Remove. Change-Id: I213bf7bb93adbb08e949807f53a9e94579d59c1d Reviewed-on: https://pdfium-review.googlesource.com/10614 Commit-Queue: dsinclair Reviewed-by: Tom Sepez Reviewed-by: Henrique Nakashima --- xfa/fde/cfde_rendercontext.cpp | 3 --- xfa/fde/cfde_visualsetiterator.cpp | 8 -------- xfa/fde/ifde_visualset.h | 1 - 3 files changed, 12 deletions(-) (limited to 'xfa/fde') diff --git a/xfa/fde/cfde_rendercontext.cpp b/xfa/fde/cfde_rendercontext.cpp index dd6dfa0aee..284de5daa2 100644 --- a/xfa/fde/cfde_rendercontext.cpp +++ b/xfa/fde/cfde_rendercontext.cpp @@ -58,9 +58,6 @@ void CFDE_RenderContext::DoRender() { RenderText(static_cast(pVisualSet), pPiece); iCount += 5; break; - case FDE_VISUALOBJ_Canvas: - NOTREACHED(); - break; default: break; } diff --git a/xfa/fde/cfde_visualsetiterator.cpp b/xfa/fde/cfde_visualsetiterator.cpp index 5fd84ede8a..d5b6b1bfe7 100644 --- a/xfa/fde/cfde_visualsetiterator.cpp +++ b/xfa/fde/cfde_visualsetiterator.cpp @@ -66,14 +66,6 @@ FDE_TEXTEDITPIECE* CFDE_VisualSetIterator::GetNext( ASSERT(pObj); FDE_VISUALOBJTYPE eType = pVisualSet->GetType(); - if (eType == FDE_VISUALOBJ_Canvas) { - FDE_CANVASITEM canvas; - canvas.hCanvas = pObj; - canvas.pCanvas = static_cast(pVisualSet); - canvas.pos = canvas.pCanvas->GetFirstPosition(); - m_CanvasStack.push(canvas); - break; - } uint32_t dwObj = (uint32_t)eType; if ((m_dwFilter & dwObj) != 0) { if (ppCanvasSet) diff --git a/xfa/fde/ifde_visualset.h b/xfa/fde/ifde_visualset.h index b5babd2c46..4f9e932657 100644 --- a/xfa/fde/ifde_visualset.h +++ b/xfa/fde/ifde_visualset.h @@ -18,7 +18,6 @@ class FXTEXT_CHARPOS; enum FDE_VISUALOBJTYPE { - FDE_VISUALOBJ_Canvas = 0x00, FDE_VISUALOBJ_Text = 0x01 }; -- cgit v1.2.3