Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(542)

Unified Diff: xfa/fde/fde_iterator.cpp

Issue 1866333003: Remove IFDE_Image, IFDE_PathSet, IFDE_ImageSet, and IFDE_WidgetSet. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Rebase to master Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/fde/fde_iterator.h ('k') | xfa/fde/fde_render.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fde/fde_iterator.cpp
diff --git a/xfa/fde/fde_iterator.cpp b/xfa/fde/fde_iterator.cpp
index 097be1d01f7e9b977198d80d55523620c292e262..4356e22ee2f9a8f00c2627b94dd46eaf303c3173 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;
« no previous file with comments | « xfa/fde/fde_iterator.h ('k') | xfa/fde/fde_render.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698