diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-05-17 02:01:42 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-17 02:01:42 +0000 |
| commit | db3c6cefceddf25c25f1205d7b633f09e873bf98 (patch) | |
| tree | f79bf24591d3668da7c44190bbfae46c2c690f95 /xfa/fxfa/parser/cxfa_node.cpp | |
| parent | 1c0da4bf0f4235b50dade1c1d37fbd1f4421722d (diff) | |
| download | pdfium-db3c6cefceddf25c25f1205d7b633f09e873bf98.tar.xz | |
Update third_party/base/compiler_specific.h.
Import Chromium's base/compiler_specific.h from r537069.
Now that FALLTHROUGH is available via compiler_specific.h, remove
FX_FALLTHROUGH.
Change-Id: I8b9631a4f007673e10e0c26951dfd61e9dcada30
Reviewed-on: https://pdfium-review.googlesource.com/32639
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_node.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index a51b74ca63..66c4fb99f4 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -18,7 +18,6 @@ #include "core/fxcrt/cfx_memorystream.h" #include "core/fxcrt/fx_codepage.h" #include "core/fxcrt/fx_extension.h" -#include "core/fxcrt/fx_fallthrough.h" #include "core/fxcrt/locale_iface.h" #include "core/fxcrt/xml/cfx_xmlelement.h" #include "core/fxcrt/xml/cfx_xmlnode.h" @@ -27,6 +26,7 @@ #include "fxjs/cfxjse_engine.h" #include "fxjs/cfxjse_value.h" #include "fxjs/xfa/cjx_node.h" +#include "third_party/base/compiler_specific.h" #include "third_party/base/logging.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" @@ -2639,7 +2639,7 @@ void CXFA_Node::ResetData() { } case XFA_FFWidgetType::kChoiceList: ClearAllSelections(); - FX_FALLTHROUGH; + FALLTHROUGH; default: { CXFA_Value* defValue = GetDefaultValueIfExists(); if (defValue) |