diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-05-22 17:05:40 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-23 00:18:13 +0000 |
| commit | b45324bfb414acc595e478dc7dc63ac43c792580 (patch) | |
| tree | 90af2bb4c6386b2b2825c80d7405dace0416c69b /xfa/fxfa/parser | |
| parent | 4cb82ee95256f110489f2b503e70729c44419e74 (diff) | |
| download | pdfium-b45324bfb414acc595e478dc7dc63ac43c792580.tar.xz | |
Use NOTREACHED() in more places.
Change-Id: I88466943171f19259f84add69679741d44c8e123
Reviewed-on: https://pdfium-review.googlesource.com/5551
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp | 3 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.cpp | 7 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_simple_parser.cpp | 3 | ||||
| -rw-r--r-- | xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | 5 |
4 files changed, 11 insertions, 7 deletions
diff --git a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp index 8911227f3d..b2e4e725a7 100644 --- a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp +++ b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp @@ -11,6 +11,7 @@ #include <utility> #include <vector> +#include "third_party/base/logging.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" #include "xfa/fxfa/app/xfa_ffnotify.h" @@ -73,7 +74,7 @@ void UpdateWidgetSize(CXFA_ContentLayoutItem* pLayoutItem, break; } default: - ASSERT(false); + NOTREACHED(); } } diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 8830f3412c..3c254ef6fc 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -20,6 +20,7 @@ #include "core/fxcrt/xml/cfx_xmlnode.h" #include "core/fxcrt/xml/cfx_xmltext.h" #include "fxjs/cfxjse_value.h" +#include "third_party/base/logging.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" #include "xfa/fxfa/app/xfa_ffnotify.h" @@ -3174,7 +3175,7 @@ int32_t CXFA_Node::InstanceManager_SetInstances(int32_t iDesired) { continue; } if (pRemoveInstance->GetElementType() == XFA_Element::InstanceManager) { - ASSERT(false); + NOTREACHED(); break; } if (pRemoveInstance->GetNameHash() == dInstanceNameHash) { @@ -4460,7 +4461,7 @@ int32_t CXFA_Node::InsertChild(int32_t index, CXFA_Node* pNode) { bool CXFA_Node::InsertChild(CXFA_Node* pNode, CXFA_Node* pBeforeNode) { if (!pNode || pNode->m_pParent || (pBeforeNode && pBeforeNode->m_pParent != this)) { - ASSERT(false); + NOTREACHED(); return false; } bool ret = m_pDocument->RemovePurgeNode(pNode); @@ -4519,7 +4520,7 @@ CXFA_Node* CXFA_Node::Deprecated_GetPrevSibling() { bool CXFA_Node::RemoveChild(CXFA_Node* pNode, bool bNotify) { if (!pNode || pNode->m_pParent != this) { - ASSERT(false); + NOTREACHED(); return false; } if (m_pChild == pNode) { diff --git a/xfa/fxfa/parser/cxfa_simple_parser.cpp b/xfa/fxfa/parser/cxfa_simple_parser.cpp index 3cbcd26100..1b5cccf101 100644 --- a/xfa/fxfa/parser/cxfa_simple_parser.cpp +++ b/xfa/fxfa/parser/cxfa_simple_parser.cpp @@ -20,6 +20,7 @@ #include "core/fxcrt/xml/cfx_xmlnode.h" #include "core/fxcrt/xml/cfx_xmlparser.h" #include "core/fxcrt/xml/cfx_xmltext.h" +#include "third_party/base/logging.h" #include "third_party/base/ptr_util.h" #include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_document.h" @@ -221,7 +222,7 @@ void ConvertXMLToPlainText(CFX_XMLElement* pRootXMLNode, break; } default: - ASSERT(false); + NOTREACHED(); break; } } diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp index ab6f155ae5..d4cd058b44 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp @@ -12,6 +12,7 @@ #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/xml/cfx_xmlelement.h" #include "core/fxcrt/xml/cfx_xmlnode.h" +#include "third_party/base/logging.h" #include "third_party/base/stl_util.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_layoutprocessor.h" @@ -110,7 +111,7 @@ bool FormValueNode_SetChildContent(CXFA_Node* pValueNode, break; } default: - ASSERT(false); + NOTREACHED(); break; } return true; @@ -1322,7 +1323,7 @@ CXFA_Node* CXFA_Document::DataMerge_CopyContainer(CXFA_Node* pTemplateNode, case XFA_Element::Variables: break; default: - ASSERT(false); + NOTREACHED(); break; } return nullptr; |