diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/logging.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/logging.cc')
| -rw-r--r-- | chromium/base/logging.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chromium/base/logging.cc b/chromium/base/logging.cc index fdd86299aa4..2da71c73819 100644 --- a/chromium/base/logging.cc +++ b/chromium/base/logging.cc @@ -8,16 +8,20 @@ // build time. Try not to raise this limit unless absolutely necessary. See // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md #ifndef NACL_TC_REV -#pragma clang max_tokens_here 370000 +#pragma clang max_tokens_here 350000 #endif // NACL_TC_REV +#ifdef BASE_CHECK_H_ +#error "logging.h should not include check.h" +#endif + #include <limits.h> #include <stdint.h> #include "base/pending_task.h" #include "base/stl_util.h" #include "base/task/common/task_annotator.h" -#include "base/trace_event/trace_event.h" +#include "base/trace_event/base_tracing.h" #include "build/build_config.h" #if defined(OS_WIN) |