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 --- core/fpdfapi/page/cpdf_allstates.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/fpdfapi/page') diff --git a/core/fpdfapi/page/cpdf_allstates.cpp b/core/fpdfapi/page/cpdf_allstates.cpp index d2491bbee7..9af904cb5d 100644 --- a/core/fpdfapi/page/cpdf_allstates.cpp +++ b/core/fpdfapi/page/cpdf_allstates.cpp @@ -12,8 +12,8 @@ #include "core/fpdfapi/page/cpdf_streamcontentparser.h" #include "core/fpdfapi/parser/cpdf_array.h" #include "core/fpdfapi/parser/cpdf_dictionary.h" -#include "core/fxcrt/fx_fallthrough.h" #include "core/fxge/cfx_graphstatedata.h" +#include "third_party/base/compiler_specific.h" #include "third_party/base/stl_util.h" CPDF_AllStates::CPDF_AllStates() @@ -90,7 +90,7 @@ void CPDF_AllStates::ProcessExtGS(CPDF_Dictionary* pGS, if (pGS->KeyExist("TR2")) { continue; } - FX_FALLTHROUGH; + FALLTHROUGH; case FXBSTR_ID('T', 'R', '2', 0): m_GeneralState.SetTR(pObject && !pObject->IsName() ? pObject : nullptr); break; @@ -133,7 +133,7 @@ void CPDF_AllStates::ProcessExtGS(CPDF_Dictionary* pGS, if (pGS->KeyExist("BG2")) { continue; } - FX_FALLTHROUGH; + FALLTHROUGH; case FXBSTR_ID('B', 'G', '2', 0): m_GeneralState.SetBG(pObject); break; @@ -141,7 +141,7 @@ void CPDF_AllStates::ProcessExtGS(CPDF_Dictionary* pGS, if (pGS->KeyExist("UCR2")) { continue; } - FX_FALLTHROUGH; + FALLTHROUGH; case FXBSTR_ID('U', 'C', 'R', '2'): m_GeneralState.SetUCR(pObject); break; -- cgit v1.2.3