diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-02-16 03:46:28 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-02-16 03:46:28 +0000 |
| commit | 067a44fcad9196c6ad8cc3b2f86261b78ae54f48 (patch) | |
| tree | 8e04bf7d5c20701fee0f688411edeea4b74caa47 /xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp | |
| parent | 844d79e853074c99b7e5e64e051f1e1236c1723e (diff) | |
| download | pdfium-067a44fcad9196c6ad8cc3b2f86261b78ae54f48.tar.xz | |
Fix fallthroughs in XFA code.chromium/3350
Change-Id: I1fd4bf85cd709de1c14ed2895d045018f79bc61f
Reviewed-on: https://pdfium-review.googlesource.com/26950
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp index d4506c7bb1..45866642c5 100644 --- a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp +++ b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp @@ -11,6 +11,7 @@ #include <utility> #include <vector> +#include "core/fxcrt/fx_fallthrough.h" #include "fxjs/xfa/cjx_object.h" #include "third_party/base/logging.h" #include "third_party/base/ptr_util.h" @@ -867,6 +868,7 @@ void CXFA_ItemLayoutProcessor::GotoNextContainerNode( } case XFA_ItemLayoutProcessorStages::None: { pCurActionNode = XFA_LAYOUT_INVALIDNODE; + FX_FALLTHROUGH; case XFA_ItemLayoutProcessorStages::BookendLeader: for (CXFA_Node* pBookendNode = pCurActionNode == XFA_LAYOUT_INVALIDNODE ? pEntireContainer->GetFirstChild() @@ -885,6 +887,7 @@ void CXFA_ItemLayoutProcessor::GotoNextContainerNode( } { pCurActionNode = XFA_LAYOUT_INVALIDNODE; + FX_FALLTHROUGH; case XFA_ItemLayoutProcessorStages::BreakBefore: if (pCurActionNode != XFA_LAYOUT_INVALIDNODE) { CXFA_Node* pBreakBeforeNode = pCurActionNode->GetNextSibling(); @@ -908,6 +911,7 @@ void CXFA_ItemLayoutProcessor::GotoNextContainerNode( } case XFA_ItemLayoutProcessorStages::Container: { pCurActionNode = XFA_LAYOUT_INVALIDNODE; + FX_FALLTHROUGH; case XFA_ItemLayoutProcessorStages::BreakAfter: { if (pCurActionNode == XFA_LAYOUT_INVALIDNODE) { CXFA_Node* pBreakAfterNode = pChildContainer->GetFirstChild(); @@ -962,6 +966,7 @@ void CXFA_ItemLayoutProcessor::GotoNextContainerNode( NoMoreChildContainer : { pCurActionNode = XFA_LAYOUT_INVALIDNODE; + FX_FALLTHROUGH; case XFA_ItemLayoutProcessorStages::BookendTrailer: for (CXFA_Node* pBookendNode = pCurActionNode == XFA_LAYOUT_INVALIDNODE ? pEntireContainer->GetFirstChild() @@ -978,6 +983,7 @@ void CXFA_ItemLayoutProcessor::GotoNextContainerNode( } } } + FX_FALLTHROUGH; default: pCurActionNode = nullptr; *nCurStage = XFA_ItemLayoutProcessorStages::Done; @@ -1959,8 +1965,10 @@ XFA_ItemLayoutProcessorResult CXFA_ItemLayoutProcessor::DoLayoutFlowedContainer( switch (rs) { case XFA_ItemLayoutProcessorResult::ManualBreak: bIsManualBreak = true; + FX_FALLTHROUGH; case XFA_ItemLayoutProcessorResult::PageFullBreak: bForceEndPage = true; + FX_FALLTHROUGH; case XFA_ItemLayoutProcessorResult::RowFullBreak: goto SuspendAndCreateNewRow; case XFA_ItemLayoutProcessorResult::Done: @@ -1968,6 +1976,7 @@ XFA_ItemLayoutProcessorResult CXFA_ItemLayoutProcessor::DoLayoutFlowedContainer( fContentCurRowY += pProcessor->InsertPendingItems(m_pCurChildNode); pProcessor.reset(); + break; } break; } |