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>

9 files changed, 21 insertions, 41 deletions

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;
diff --git a/core/fpdfapi/parser/cpdf_data_avail.cpp b/core/fpdfapi/parser/cpdf_data_avail.cpp
index 3ffe6f6f0b..1296b2320b 100644
--- a/core/fpdfapi/parser/cpdf_data_avail.cpp
+++ b/core/fpdfapi/parser/cpdf_data_avail.cpp
@@ -26,8 +26,8 @@
 #include "core/fpdfapi/parser/fpdf_parser_utility.h"
 #include "core/fxcrt/cfx_memorystream.h"
 #include "core/fxcrt/fx_extension.h"
-#include "core/fxcrt/fx_fallthrough.h"
 #include "core/fxcrt/fx_safe_types.h"
+#include "third_party/base/compiler_specific.h"
 #include "third_party/base/numerics/safe_conversions.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
@@ -134,7 +134,7 @@ bool CPDF_DataAvail::CheckDocStatus() {
       return LoadAllFile();
     case PDF_DATAAVAIL_PAGE_LATERLOAD:
       m_docStatus = PDF_DATAAVAIL_PAGE;
-      FX_FALLTHROUGH;
+      FALLTHROUGH;
     default:
       m_bDocAvail = true;
       return true;
diff --git a/core/fpdfapi/render/cpdf_dibtransferfunc.cpp b/core/fpdfapi/render/cpdf_dibtransferfunc.cpp
index 959fec383d..b73fc77ce9 100644
--- a/core/fpdfapi/render/cpdf_dibtransferfunc.cpp
+++ b/core/fpdfapi/render/cpdf_dibtransferfunc.cpp
@@ -10,7 +10,7 @@
 
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
 #include "core/fpdfapi/render/cpdf_transferfunc.h"
-#include "core/fxcrt/fx_fallthrough.h"
+#include "third_party/base/compiler_specific.h"
 
 CPDF_DIBTransferFunc::CPDF_DIBTransferFunc(
     const RetainPtr<CPDF_TransferFunc>& pTransferFunc)
@@ -120,7 +120,7 @@ void CPDF_DIBTransferFunc::TranslateScanline(
     }
     case FXDIB_Rgb32:
       bSkip = true;
-      FX_FALLTHROUGH;
+      FALLTHROUGH;
     case FXDIB_Argb: {
       int index = 0;
       for (int i = 0; i < m_Width; i++) {
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index f33b304b63..89cddbaa25 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -49,7 +49,6 @@
 #include "core/fpdfapi/render/cpdf_type3cache.h"
 #include "core/fpdfdoc/cpdf_occontext.h"
 #include "core/fxcrt/autorestorer.h"
-#include "core/fxcrt/fx_fallthrough.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxcrt/maybe_owned.h"
 #include "core/fxge/cfx_defaultrenderdevice.h"
@@ -57,6 +56,7 @@
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/renderdevicedriver_iface.h"
+#include "third_party/base/compiler_specific.h"
 #include "third_party/base/logging.h"
 #include "third_party/base/numerics/safe_math.h"
 #include "third_party/base/ptr_util.h"
diff --git a/core/fpdfdoc/cpdf_variabletext.cpp b/core/fpdfdoc/cpdf_variabletext.cpp
index 7da1b2f946..31f09c9dcd 100644
--- a/core/fpdfdoc/cpdf_variabletext.cpp
+++ b/core/fpdfdoc/cpdf_variabletext.cpp
@@ -16,7 +16,7 @@
 #include "core/fpdfdoc/csection.h"
 #include "core/fpdfdoc/ipvt_fontmap.h"
 #include "core/fxcrt/fx_codepage.h"
-#include "core/fxcrt/fx_fallthrough.h"
+#include "third_party/base/compiler_specific.h"
 #include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
 
@@ -318,7 +318,7 @@ void CPDF_VariableText::SetText(const WideString& swText) {
         break;
       case 0x09:
         word = 0x20;
-        FX_FALLTHROUGH;
+        FALLTHROUGH;
       default:
         wp = InsertWord(wp, word, FX_CHARSET_Default);
         break;
diff --git a/core/fxcodec/codec/ccodec_pngmodule.cpp b/core/fxcodec/codec/ccodec_pngmodule.cpp
index 7aedf2ee7f..98db4e272e 100644
--- a/core/fxcodec/codec/ccodec_pngmodule.cpp
+++ b/core/fxcodec/codec/ccodec_pngmodule.cpp
@@ -10,9 +10,9 @@
 
 #include "core/fxcodec/codec/codec_int.h"
 #include "core/fxcodec/fx_codec.h"
-#include "core/fxcrt/fx_fallthrough.h"
 #include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/fx_dib.h"
+#include "third_party/base/compiler_specific.h"
 #include "third_party/base/ptr_util.h"
 
 #ifdef USE_SYSTEM_LIBPNG
@@ -139,7 +139,7 @@ static void _png_get_header_func(png_structp png_ptr, png_infop info_ptr) {
       if (color_type1 != PNG_COLOR_TYPE_PALETTE) {
         png_error(pContext->m_pPng, "Not Support Output Palette Now");
       }
-      FX_FALLTHROUGH;
+      FALLTHROUGH;
     case PNG_COLOR_TYPE_RGB:
     case PNG_COLOR_TYPE_RGB_ALPHA:
       if (!(color_type1 & PNG_COLOR_MASK_COLOR)) {
diff --git a/core/fxcrt/css/cfx_csssyntaxparser.cpp b/core/fxcrt/css/cfx_csssyntaxparser.cpp
index 97586dc59f..844337c1ca 100644
--- a/core/fxcrt/css/cfx_csssyntaxparser.cpp
+++ b/core/fxcrt/css/cfx_csssyntaxparser.cpp
@@ -12,7 +12,7 @@
 #include "core/fxcrt/css/cfx_cssdeclaration.h"
 #include "core/fxcrt/fx_codepage.h"
 #include "core/fxcrt/fx_extension.h"
-#include "core/fxcrt/fx_fallthrough.h"
+#include "third_party/base/compiler_specific.h"
 #include "third_party/base/logging.h"
 
 namespace {
@@ -75,7 +75,7 @@ CFX_CSSSyntaxStatus CFX_CSSSyntaxParser::DoSyntaxParse() {
                 SwitchMode(CFX_CSSSyntaxMode::Comment);
                 break;
               }
-              FX_FALLTHROUGH;
+              FALLTHROUGH;
             default:
               if (wch <= ' ') {
                 m_TextPlane.MoveNext();
@@ -112,7 +112,7 @@ CFX_CSSSyntaxStatus CFX_CSSSyntaxParser::DoSyntaxParse() {
                   return CFX_CSSSyntaxStatus::Selector;
                 break;
               }
-              FX_FALLTHROUGH;
+              FALLTHROUGH;
             default:
               AppendChar(wch);
               break;
@@ -137,7 +137,7 @@ CFX_CSSSyntaxStatus CFX_CSSSyntaxParser::DoSyntaxParse() {
                   return CFX_CSSSyntaxStatus::PropertyName;
                 break;
               }
-              FX_FALLTHROUGH;
+              FALLTHROUGH;
             default:
               AppendChar(wch);
               break;
@@ -147,7 +147,7 @@ CFX_CSSSyntaxStatus CFX_CSSSyntaxParser::DoSyntaxParse() {
           switch (wch) {
             case ';':
               m_TextPlane.MoveNext();
-              FX_FALLTHROUGH;
+              FALLTHROUGH;
             case '}':
               SwitchMode(CFX_CSSSyntaxMode::PropertyName);
               return CFX_CSSSyntaxStatus::PropertyValue;
@@ -157,7 +157,7 @@ CFX_CSSSyntaxStatus CFX_CSSSyntaxParser::DoSyntaxParse() {
                   return CFX_CSSSyntaxStatus::PropertyValue;
                 break;
               }
-              FX_FALLTHROUGH;
+              FALLTHROUGH;
             default:
               AppendChar(wch);
               break;
diff --git a/core/fxcrt/fx_extension.cpp b/core/fxcrt/fx_extension.cpp
index a27e0279c6..e27c78d7bf 100644
--- a/core/fxcrt/fx_extension.cpp
+++ b/core/fxcrt/fx_extension.cpp
@@ -10,7 +10,7 @@
 #include <cwctype>
 #include <limits>
 
-#include "core/fxcrt/fx_fallthrough.h"
+#include "third_party/base/compiler_specific.h"
 
 float FXSYS_wcstof(const wchar_t* pwsStr, int32_t iLength, int32_t* pUsedLen) {
   ASSERT(pwsStr);
@@ -25,7 +25,7 @@ float FXSYS_wcstof(const wchar_t* pwsStr, int32_t iLength, int32_t* pUsedLen) {
   switch (pwsStr[iUsedLen]) {
     case '-':
       bNegtive = true;
-      FX_FALLTHROUGH;
+      FALLTHROUGH;
     case '+':
       iUsedLen++;
       break;
diff --git a/core/fxcrt/fx_fallthrough.h b/core/fxcrt/fx_fallthrough.h
deleted file mode 100644
index 5587ee2295..0000000000
--- a/core/fxcrt/fx_fallthrough.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2018 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CORE_FXCRT_FX_FALLTHROUGH_H_
-#define CORE_FXCRT_FX_FALLTHROUGH_H_
-
-// When clang suggests inserting [[clang::fallthrough]], it first checks if
-// it knows of a macro expanding to it, and if so suggests inserting the
-// macro.  This means that this macro must be used only in code internal
-// to PDFium, so that PDFium's user code doesn't end up getting suggestions
-// for FX_FALLTHROUGH instead of the user-specific fallthrough macro.
-// So do not include this header in any of PDFium's public headers.
-#if defined(__clang__)
-#define FX_FALLTHROUGH [[clang::fallthrough]]
-#else
-#define FX_FALLTHROUGH
-#endif
-
-#endif  // CORE_FXCRT_FX_FALLTHROUGH_H_