Commit c214bc44 authored by Kent Tamura's avatar Kent Tamura Committed by Commit Bot

Revert "Remove unnecessary #includes from Assertions.h"

This reverts commit 0627c931.

Reason for revert:
Link failure on some Windows bots.
e.g. https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Fchromium.win%2FWin_Builder%2F42057%2F%2B%2Frecipes%2Fsteps%2Fcompile%2F0%2Fstdout

Original change's description:
> Remove unnecessary #includes from Assertions.h
> 
> Change-Id: I9d9a0ff0c56a10923e393d4eef7ccde7b33c4a2b
> Reviewed-on: https://chromium-review.googlesource.com/578532
> Commit-Queue: Yuta Kitamura <yutak@chromium.org>
> Reviewed-by: Yuta Kitamura <yutak@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#488149}

TBR=yutak@chromium.org,tkent@chromium.org

Change-Id: If9b9b1ada6a3b45bd3a670b9aaab908401530e9d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/578829Reviewed-by: default avatarKent Tamura <tkent@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488154}
parent d5f03e28
include_rules = [ include_rules = [
# To whitelist base/ stuff Blink is allowed to include, we list up all # To whitelist base/ stuff Blink is allowed to include, we list up all
# directories and files instead of writing 'base/'. # directories and files instead of writing 'base/'.
"+base/allocator/partition_allocator/oom.h",
"+base/bind.h", "+base/bind.h",
"+base/bind_helpers.h", "+base/bind_helpers.h",
"+base/callback.h", "+base/callback.h",
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include "platform/heap/PageMemory.h" #include "platform/heap/PageMemory.h"
#include "base/allocator/partition_allocator/oom.h"
#include "platform/heap/Heap.h" #include "platform/heap/Heap.h"
#include "platform/wtf/AddressSanitizer.h" #include "platform/wtf/AddressSanitizer.h"
#include "platform/wtf/Assertions.h" #include "platform/wtf/Assertions.h"
......
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
#include "platform/text/ICUError.h" #include "platform/text/ICUError.h"
#include "base/allocator/partition_allocator/oom.h"
namespace blink { namespace blink {
// Distinguish memory allocation failures from other errors. // Distinguish memory allocation failures from other errors.
......
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
*/ */
#include "platform/transforms/TransformationMatrix.h" #include "platform/transforms/TransformationMatrix.h"
#if HAVE(MIPS_MSA_INTRINSICS)
#include <cmath> #include "platform/cpu/mips/CommonMacrosMSA.h"
#include <cstdlib> #endif
#include "platform/geometry/FloatBox.h" #include "platform/geometry/FloatBox.h"
#include "platform/geometry/FloatQuad.h" #include "platform/geometry/FloatQuad.h"
...@@ -37,20 +37,18 @@ ...@@ -37,20 +37,18 @@
#include "platform/geometry/LayoutRect.h" #include "platform/geometry/LayoutRect.h"
#include "platform/transforms/AffineTransform.h" #include "platform/transforms/AffineTransform.h"
#include "platform/transforms/Rotation.h" #include "platform/transforms/Rotation.h"
#include "platform/wtf/Assertions.h" #include "platform/wtf/Assertions.h"
#include "platform/wtf/CPU.h"
#include "platform/wtf/MathExtras.h" #include "platform/wtf/MathExtras.h"
#include "platform/wtf/build_config.h"
#include "platform/wtf/text/WTFString.h" #include "platform/wtf/text/WTFString.h"
#include <cmath>
#include <cstdlib>
#if defined(ARCH_CPU_X86_64) #if defined(ARCH_CPU_X86_64)
#include <emmintrin.h> #include <emmintrin.h>
#endif #endif
#if HAVE(MIPS_MSA_INTRINSICS)
#include "platform/cpu/mips/CommonMacrosMSA.h"
#endif
namespace blink { namespace blink {
// //
......
...@@ -27,13 +27,23 @@ ...@@ -27,13 +27,23 @@
#ifndef WTF_Assertions_h #ifndef WTF_Assertions_h
#define WTF_Assertions_h #define WTF_Assertions_h
// This file uses some GCC extensions, but it should be compatible with C++ and
// Objective C++.
#include <stdarg.h> #include <stdarg.h>
#include "base/compiler_specific.h" #include "base/allocator/partition_allocator/oom.h"
#include "base/gtest_prod_util.h" #include "base/gtest_prod_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "build/build_config.h"
#include "platform/wtf/Compiler.h"
#include "platform/wtf/Noncopyable.h" #include "platform/wtf/Noncopyable.h"
#include "platform/wtf/WTFExport.h" #include "platform/wtf/WTFExport.h"
#include "platform/wtf/build_config.h"
#if defined(OS_WIN)
#include <windows.h>
#endif
// WTFLogAlways() is deprecated. crbug.com/638849 // WTFLogAlways() is deprecated. crbug.com/638849
WTF_EXPORT PRINTF_FORMAT(1, 2) // NOLINT WTF_EXPORT PRINTF_FORMAT(1, 2) // NOLINT
......
include_rules = [ include_rules = [
# To whitelist base/ stuff Blink is allowed to include, we list up all # To whitelist base/ stuff Blink is allowed to include, we list up all
# directories and files instead of writing 'base/'. # directories and files instead of writing 'base/'.
"+base/allocator/oom.h",
"+base/allocator/partition_allocator", "+base/allocator/partition_allocator",
"+base/process/process_metrics.h", "+base/process/process_metrics.h",
"+base/atomic_ref_count.h", "+base/atomic_ref_count.h",
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include "platform/wtf/allocator/Partitions.h" #include "platform/wtf/allocator/Partitions.h"
#include "base/allocator/partition_allocator/oom.h"
#include "base/allocator/partition_allocator/page_allocator.h" #include "base/allocator/partition_allocator/page_allocator.h"
#include "base/debug/alias.h" #include "base/debug/alias.h"
#include "platform/wtf/allocator/PartitionAllocator.h" #include "platform/wtf/allocator/PartitionAllocator.h"
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#ifndef ArrayBuffer_h #ifndef ArrayBuffer_h
#define ArrayBuffer_h #define ArrayBuffer_h
#include "base/allocator/partition_allocator/oom.h"
#include "platform/wtf/Assertions.h" #include "platform/wtf/Assertions.h"
#include "platform/wtf/HashSet.h" #include "platform/wtf/HashSet.h"
#include "platform/wtf/RefCounted.h" #include "platform/wtf/RefCounted.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment