From db3c6cefceddf25c25f1205d7b633f09e873bf98 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 17 May 2018 02:01:42 +0000 Subject: 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 Commit-Queue: Lei Zhang --- fxjs/xfa/cjx_object.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fxjs') diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp index 69c6dadddf..ba914221bd 100644 --- a/fxjs/xfa/cjx_object.cpp +++ b/fxjs/xfa/cjx_object.cpp @@ -10,7 +10,6 @@ #include "core/fxcrt/cfx_decimal.h" #include "core/fxcrt/fx_extension.h" -#include "core/fxcrt/fx_fallthrough.h" #include "core/fxcrt/xml/cfx_xmltext.h" #include "fxjs/cfxjse_engine.h" #include "fxjs/cfxjse_value.h" @@ -19,6 +18,7 @@ #include "fxjs/xfa/cjx_draw.h" #include "fxjs/xfa/cjx_field.h" #include "fxjs/xfa/cjx_instancemanager.h" +#include "third_party/base/compiler_specific.h" #include "third_party/base/ptr_util.h" #include "xfa/fxfa/cxfa_ffnotify.h" #include "xfa/fxfa/cxfa_ffwidget.h" @@ -790,7 +790,7 @@ Optional CJX_Object::TryContent(bool bScriptModify, bool bProto) { case XFA_ObjectType::NodeV: case XFA_ObjectType::TextNode: pNode = ToNode(GetXFAObject()); - FX_FALLTHROUGH; + FALLTHROUGH; default: if (ToNode(GetXFAObject())->GetElementType() == XFA_Element::DataValue) pNode = ToNode(GetXFAObject()); -- cgit v1.2.3