summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-05-17 02:01:42 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-05-17 02:01:42 +0000
commitdb3c6cefceddf25c25f1205d7b633f09e873bf98 (patch)
treef79bf24591d3668da7c44190bbfae46c2c690f95 /testing
parent1c0da4bf0f4235b50dade1c1d37fbd1f4421722d (diff)
downloadpdfium-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 'testing')
-rw-r--r--testing/image_diff/image_diff_png.cpp4
1 files changed, 2 insertions, 2 deletions
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 <string>
-#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;