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 --- testing/image_diff/image_diff_png.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testing') diff --git a/testing/image_diff/image_diff_png.cpp b/testing/image_diff/image_diff_png.cpp index 47c1fe4c24..89c08f1a0f 100644 --- a/testing/image_diff/image_diff_png.cpp +++ b/testing/image_diff/image_diff_png.cpp @@ -16,7 +16,7 @@ #include -#include "core/fxcrt/fx_fallthrough.h" +#include "third_party/base/compiler_specific.h" #include "third_party/base/logging.h" #include "third_party/zlib/zlib.h" @@ -582,7 +582,7 @@ bool EncodeWithCompressionLevel(const unsigned char* input, switch (format) { case FORMAT_BGR: converter = ConvertBGRtoRGB; - FX_FALLTHROUGH; + FALLTHROUGH; case FORMAT_RGB: input_color_components = 3; -- cgit v1.2.3