commit 0e3f6910d5c2dde7acf3c7413055a20ac8d51dc1
author Tom Sepez <tsepez@chromium.org> Tue Apr 05 23:40:29 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 05 23:40:29 2022 +0000
tree 151cff3b5614d7a5d01c9530a81515f7b2e41f71
parent bd3b20ad0f27cbc7b33fa8ee3aa1196e4662bc34

Remove always-true arg from IsLayoutElement()

Change-Id: I38ec61b74cdf6593c11ce26361f18a69cf1249f4
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/92252
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

xfa/fxfa/cxfa_ffpageview.cpp

diff --git a/xfa/fxfa/cxfa_ffpageview.cpp b/xfa/fxfa/cxfa_ffpageview.cpp
index a9f58f2..20bb7cb 100644
--- a/xfa/fxfa/cxfa_ffpageview.cpp
+++ b/xfa/fxfa/cxfa_ffpageview.cpp
@@ -89,12 +89,8 @@
   return pItem->TestStatusBits(dwFilter);
 }
 
-bool IsLayoutElement(XFA_Element eElement, bool bLayoutContainer) {
+bool IsLayoutElement(XFA_Element eElement) {
   switch (eElement) {
-    case XFA_Element::Draw:
-    case XFA_Element::Field:
-    case XFA_Element::InstanceManager:
-      return !bLayoutContainer;
     case XFA_Element::Area:
     case XFA_Element::Subform:
     case XFA_Element::ExclGroup:
@@ -207,7 +203,7 @@
         break;
       }
       tabParams.emplace_back(hWidget);
-      if (IsLayoutElement(pSearchItem->GetFormNode()->GetElementType(), true)) {
+      if (IsLayoutElement(pSearchItem->GetFormNode()->GetElementType())) {
         OrderContainer(sIterator, pSearchItem, &tabParams.back(), bCurrentItem,
                        bContentArea, bMasterPage);
       }