From eb1475dcaf40321aa891e387e98bcd0f84ba4491 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Fri, 19 Jun 2020 11:11:02 +0000 Subject: [PATCH] Include-what-you-use related to logging.h (gpu) Add direct includes for things provided transitively by logging.h (or by other headers including logging.h). This is in preparation for cleaning up unnecessary includes of logging.h in header files (so if something depends on logging.h, it needs include it explicitly), and for when logging.h no longer includes check.h, check_op.h, and notreached.h. TBR=kinuko Bug: 1031540 Change-Id: I302009b875c8cdad1465cb72331fdd22dd33adeb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2249674 Commit-Queue: Hans Wennborg Auto-Submit: Hans Wennborg Reviewed-by: Peng Huang Cr-Commit-Position: refs/heads/master@{#780251} --- gpu/command_buffer/client/client_font_manager.cc | 2 ++ gpu/command_buffer/client/implementation_base.cc | 1 + gpu/command_buffer/common/discardable_handle.cc | 1 + gpu/command_buffer/common/gles2_cmd_utils.cc | 3 ++- gpu/command_buffer/service/scheduler.cc | 1 + gpu/command_buffer/service/service_font_manager.cc | 1 + gpu/command_buffer/service/shared_memory_region_wrapper.cc | 1 + gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc | 1 + gpu/command_buffer/tests/gl_native_gmb_backbuffer_unittest.cc | 1 + gpu/command_buffer/tests/gl_query_unittest.cc | 1 + gpu/command_buffer/tests/gl_test_utils.cc | 1 + gpu/command_buffer/tests/lpm/gl_lpm_fuzzer.cc | 1 + gpu/config/gpu_control_list.cc | 1 + gpu/config/gpu_info.cc | 1 + gpu/config/gpu_util.cc | 1 + gpu/ipc/common/gpu_memory_buffer_impl_dxgi.cc | 1 + gpu/ipc/service/gpu_init.cc | 1 + gpu/ipc/service/gpu_watchdog_thread.cc | 1 + gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc | 1 + gpu/vulkan/vulkan_device_queue.cc | 1 + gpu/vulkan/vulkan_fence_helper.cc | 1 + gpu/vulkan/vulkan_image.cc | 1 + gpu/vulkan/vulkan_image_android.cc | 3 ++- gpu/vulkan/vulkan_image_fuchsia.cc | 1 + gpu/vulkan/vulkan_image_linux.cc | 1 + gpu/vulkan/vulkan_image_unittest.cc | 1 + gpu/vulkan/vulkan_image_win.cc | 1 + gpu/vulkan/vulkan_surface.cc | 1 + gpu/vulkan/vulkan_swap_chain.cc | 1 + 29 files changed, 32 insertions(+), 2 deletions(-) diff --git a/gpu/command_buffer/client/client_font_manager.cc b/gpu/command_buffer/client/client_font_manager.cc index 6dc6f269cdb303..8a11104ee88db7 100644 --- a/gpu/command_buffer/client/client_font_manager.cc +++ b/gpu/command_buffer/client/client_font_manager.cc @@ -4,6 +4,8 @@ #include "gpu/command_buffer/client/client_font_manager.h" +#include "base/logging.h" + namespace gpu { namespace raster { diff --git a/gpu/command_buffer/client/implementation_base.cc b/gpu/command_buffer/client/implementation_base.cc index 15ae10c9ad18fb..a2404fd65a7e71 100644 --- a/gpu/command_buffer/client/implementation_base.cc +++ b/gpu/command_buffer/client/implementation_base.cc @@ -7,6 +7,7 @@ #include #include "base/bind.h" +#include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/trace_event.h" diff --git a/gpu/command_buffer/common/discardable_handle.cc b/gpu/command_buffer/common/discardable_handle.cc index c32bd8c20bac12..8540d91ac2894f 100644 --- a/gpu/command_buffer/common/discardable_handle.cc +++ b/gpu/command_buffer/common/discardable_handle.cc @@ -5,6 +5,7 @@ #include "gpu/command_buffer/common/discardable_handle.h" #include "base/atomicops.h" +#include "base/logging.h" #include "gpu/command_buffer/common/buffer.h" namespace gpu { diff --git a/gpu/command_buffer/common/gles2_cmd_utils.cc b/gpu/command_buffer/common/gles2_cmd_utils.cc index 5a0623295218d3..90a60f27ac28c3 100644 --- a/gpu/command_buffer/common/gles2_cmd_utils.cc +++ b/gpu/command_buffer/common/gles2_cmd_utils.cc @@ -15,7 +15,8 @@ #include -#include "base/logging.h" +#include "base/check_op.h" +#include "base/notreached.h" #include "base/numerics/safe_math.h" #include "base/stl_util.h" diff --git a/gpu/command_buffer/service/scheduler.cc b/gpu/command_buffer/service/scheduler.cc index 95bc584365f40a..b9d88280b52c63 100644 --- a/gpu/command_buffer/service/scheduler.cc +++ b/gpu/command_buffer/service/scheduler.cc @@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/callback.h" +#include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" diff --git a/gpu/command_buffer/service/service_font_manager.cc b/gpu/command_buffer/service/service_font_manager.cc index 50a1b4a74e2f03..dc41e910e7f5b1 100644 --- a/gpu/command_buffer/service/service_font_manager.cc +++ b/gpu/command_buffer/service/service_font_manager.cc @@ -7,6 +7,7 @@ #include #include "base/debug/dump_without_crashing.h" +#include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" diff --git a/gpu/command_buffer/service/shared_memory_region_wrapper.cc b/gpu/command_buffer/service/shared_memory_region_wrapper.cc index 61665bbb2f37e8..213099665fde52 100644 --- a/gpu/command_buffer/service/shared_memory_region_wrapper.cc +++ b/gpu/command_buffer/service/shared_memory_region_wrapper.cc @@ -4,6 +4,7 @@ #include "gpu/command_buffer/service/shared_memory_region_wrapper.h" +#include "base/logging.h" #include "base/numerics/checked_math.h" #include "base/system/sys_info.h" #include "components/viz/common/resources/resource_format_utils.h" diff --git a/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc b/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc index 234ab78d34748e..c0df5e0b109e76 100644 --- a/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc +++ b/gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc @@ -13,6 +13,7 @@ #include #include +#include "base/logging.h" #include "base/stl_util.h" #include "build/build_config.h" #include "gpu/command_buffer/tests/gl_manager.h" diff --git a/gpu/command_buffer/tests/gl_native_gmb_backbuffer_unittest.cc b/gpu/command_buffer/tests/gl_native_gmb_backbuffer_unittest.cc index 834115190b613d..8d0d632ed01cdb 100644 --- a/gpu/command_buffer/tests/gl_native_gmb_backbuffer_unittest.cc +++ b/gpu/command_buffer/tests/gl_native_gmb_backbuffer_unittest.cc @@ -6,6 +6,7 @@ #include #include +#include "base/logging.h" #include "gpu/command_buffer/client/gles2_lib.h" #include "gpu/command_buffer/service/image_factory.h" #include "gpu/command_buffer/tests/gl_manager.h" diff --git a/gpu/command_buffer/tests/gl_query_unittest.cc b/gpu/command_buffer/tests/gl_query_unittest.cc index 09d08e999b0cb1..d3c57937e3a123 100644 --- a/gpu/command_buffer/tests/gl_query_unittest.cc +++ b/gpu/command_buffer/tests/gl_query_unittest.cc @@ -7,6 +7,7 @@ #include #include +#include "base/logging.h" #include "base/threading/platform_thread.h" #include "gpu/command_buffer/tests/gl_manager.h" #include "gpu/command_buffer/tests/gl_test_utils.h" diff --git a/gpu/command_buffer/tests/gl_test_utils.cc b/gpu/command_buffer/tests/gl_test_utils.cc index 80a94bd97a99eb..67e3041a64dac2 100644 --- a/gpu/command_buffer/tests/gl_test_utils.cc +++ b/gpu/command_buffer/tests/gl_test_utils.cc @@ -12,6 +12,7 @@ #include #include "base/command_line.h" +#include "base/logging.h" #include "base/stl_util.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" #include "gpu/config/gpu_driver_bug_workarounds.h" diff --git a/gpu/command_buffer/tests/lpm/gl_lpm_fuzzer.cc b/gpu/command_buffer/tests/lpm/gl_lpm_fuzzer.cc index beb39421cf07a8..938ee848e6adac 100644 --- a/gpu/command_buffer/tests/lpm/gl_lpm_fuzzer.cc +++ b/gpu/command_buffer/tests/lpm/gl_lpm_fuzzer.cc @@ -17,6 +17,7 @@ #include "base/at_exit.h" #include "base/command_line.h" #include "base/i18n/icu_util.h" +#include "base/logging.h" #include "base/message_loop/message_pump_type.h" #include "base/strings/string_split.h" #include "base/task/single_thread_task_executor.h" diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc index cbf76f285f6b0f..deb96baf95b1c9 100644 --- a/gpu/config/gpu_control_list.cc +++ b/gpu/config/gpu_control_list.cc @@ -7,6 +7,7 @@ #include #include "base/logging.h" +#include "base/notreached.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" diff --git a/gpu/config/gpu_info.cc b/gpu/config/gpu_info.cc index 4a60da24429785..a70bbf5eb3e8e2 100644 --- a/gpu/config/gpu_info.cc +++ b/gpu/config/gpu_info.cc @@ -5,6 +5,7 @@ #include #include "base/logging.h" +#include "base/notreached.h" #include "gpu/command_buffer/common/gpu_memory_buffer_support.h" #include "gpu/config/gpu_info.h" #include "gpu/config/gpu_util.h" diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc index f3f59bf1a93c23..5abb0279479b26 100644 --- a/gpu/config/gpu_util.cc +++ b/gpu/config/gpu_util.cc @@ -20,6 +20,7 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" +#include "base/notreached.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" diff --git a/gpu/ipc/common/gpu_memory_buffer_impl_dxgi.cc b/gpu/ipc/common/gpu_memory_buffer_impl_dxgi.cc index 500ff3cb9e46e7..051e8a95b75b05 100644 --- a/gpu/ipc/common/gpu_memory_buffer_impl_dxgi.cc +++ b/gpu/ipc/common/gpu_memory_buffer_impl_dxgi.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" +#include "base/logging.h" #include "base/memory/ptr_util.h" #include "gpu/ipc/common/gpu_memory_buffer_impl_dxgi.h" #include "gpu/ipc/common/gpu_memory_buffer_support.h" diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc index e7102335e18ed6..59c0be46cd0235 100644 --- a/gpu/ipc/service/gpu_init.cc +++ b/gpu/ipc/service/gpu_init.cc @@ -7,6 +7,7 @@ #include #include "base/command_line.h" +#include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/threading/scoped_blocking_call.h" diff --git a/gpu/ipc/service/gpu_watchdog_thread.cc b/gpu/ipc/service/gpu_watchdog_thread.cc index f84571e5142014..1e4bae0022a896 100644 --- a/gpu/ipc/service/gpu_watchdog_thread.cc +++ b/gpu/ipc/service/gpu_watchdog_thread.cc @@ -9,6 +9,7 @@ #include "base/debug/alias.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/message_loop/message_loop_current.h" #include "base/metrics/histogram_functions.h" diff --git a/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc b/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc index 12bef6d06e40c7..adf521bd01e1e2 100644 --- a/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc +++ b/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc @@ -4,6 +4,7 @@ #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h" +#include "base/logging.h" #include "gpu/command_buffer/client/context_support.h" #include "gpu/command_buffer/client/gles2_interface.h" #include "third_party/skia/include/gpu/gl/GrGLInterface.h" diff --git a/gpu/vulkan/vulkan_device_queue.cc b/gpu/vulkan/vulkan_device_queue.cc index 241fdbe2fd5b3c..6ca7cefc2036f6 100644 --- a/gpu/vulkan/vulkan_device_queue.cc +++ b/gpu/vulkan/vulkan_device_queue.cc @@ -9,6 +9,7 @@ #include #include +#include "base/logging.h" #include "base/strings/stringprintf.h" #include "gpu/config/gpu_info.h" // nogncheck #include "gpu/config/vulkan_info.h" diff --git a/gpu/vulkan/vulkan_fence_helper.cc b/gpu/vulkan/vulkan_fence_helper.cc index 42671b03fdc915..c8338a4afc2fa2 100644 --- a/gpu/vulkan/vulkan_fence_helper.cc +++ b/gpu/vulkan/vulkan_fence_helper.cc @@ -5,6 +5,7 @@ #include "gpu/vulkan/vulkan_fence_helper.h" #include "base/bind.h" +#include "base/logging.h" #include "gpu/vulkan/vulkan_device_queue.h" #include "gpu/vulkan/vulkan_function_pointers.h" diff --git a/gpu/vulkan/vulkan_image.cc b/gpu/vulkan/vulkan_image.cc index 58cb9a914a02da..6f6d67157605aa 100644 --- a/gpu/vulkan/vulkan_image.cc +++ b/gpu/vulkan/vulkan_image.cc @@ -8,6 +8,7 @@ #include +#include "base/logging.h" #include "base/macros.h" #include "base/optional.h" #include "base/stl_util.h" diff --git a/gpu/vulkan/vulkan_image_android.cc b/gpu/vulkan/vulkan_image_android.cc index 5da67ae4f6823b..7d64386a332905 100644 --- a/gpu/vulkan/vulkan_image_android.cc +++ b/gpu/vulkan/vulkan_image_android.cc @@ -5,6 +5,7 @@ #include "gpu/vulkan/vulkan_image.h" #include "base/android/android_hardware_buffer_compat.h" +#include "base/logging.h" #include "gpu/vulkan/vulkan_device_queue.h" #include "gpu/vulkan/vulkan_function_pointers.h" @@ -138,4 +139,4 @@ bool VulkanImage::InitializeFromGpuMemoryBufferHandle( return true; } -} // namespace gpu \ No newline at end of file +} // namespace gpu diff --git a/gpu/vulkan/vulkan_image_fuchsia.cc b/gpu/vulkan/vulkan_image_fuchsia.cc index 6748ed5a2285f6..b462ba9e99b7bf 100644 --- a/gpu/vulkan/vulkan_image_fuchsia.cc +++ b/gpu/vulkan/vulkan_image_fuchsia.cc @@ -4,6 +4,7 @@ #include "gpu/vulkan/vulkan_image.h" +#include "base/logging.h" #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h" #include "gpu/vulkan/vulkan_device_queue.h" #include "gpu/vulkan/vulkan_function_pointers.h" diff --git a/gpu/vulkan/vulkan_image_linux.cc b/gpu/vulkan/vulkan_image_linux.cc index 789b8e3b0e42d1..41ee3996cf5378 100644 --- a/gpu/vulkan/vulkan_image_linux.cc +++ b/gpu/vulkan/vulkan_image_linux.cc @@ -4,6 +4,7 @@ #include "gpu/vulkan/vulkan_image.h" +#include "base/logging.h" #include "gpu/vulkan/vulkan_device_queue.h" namespace gpu { diff --git a/gpu/vulkan/vulkan_image_unittest.cc b/gpu/vulkan/vulkan_image_unittest.cc index 2993dec2384060..54c717fc7473c3 100644 --- a/gpu/vulkan/vulkan_image_unittest.cc +++ b/gpu/vulkan/vulkan_image_unittest.cc @@ -4,6 +4,7 @@ #include "gpu/vulkan/vulkan_image.h" +#include "base/logging.h" #include "build/build_config.h" #include "gpu/config/gpu_info_collector.h" #include "gpu/config/gpu_test_config.h" diff --git a/gpu/vulkan/vulkan_image_win.cc b/gpu/vulkan/vulkan_image_win.cc index 6bd6ef2a56b64a..6501ceb1644d14 100644 --- a/gpu/vulkan/vulkan_image_win.cc +++ b/gpu/vulkan/vulkan_image_win.cc @@ -4,6 +4,7 @@ #include "gpu/vulkan/vulkan_image.h" +#include "base/logging.h" #include "gpu/vulkan/vulkan_device_queue.h" #include "gpu/vulkan/vulkan_function_pointers.h" diff --git a/gpu/vulkan/vulkan_surface.cc b/gpu/vulkan/vulkan_surface.cc index 8e20ccb7ded4d4..d7d9100318088a 100644 --- a/gpu/vulkan/vulkan_surface.cc +++ b/gpu/vulkan/vulkan_surface.cc @@ -8,6 +8,7 @@ #include +#include "base/logging.h" #include "base/macros.h" #include "base/stl_util.h" #include "gpu/vulkan/vulkan_device_queue.h" diff --git a/gpu/vulkan/vulkan_swap_chain.cc b/gpu/vulkan/vulkan_swap_chain.cc index c88b19f8dedde0..f28a322a6fd63f 100644 --- a/gpu/vulkan/vulkan_swap_chain.cc +++ b/gpu/vulkan/vulkan_swap_chain.cc @@ -5,6 +5,7 @@ #include "gpu/vulkan/vulkan_swap_chain.h" #include "base/bind.h" +#include "base/logging.h" #include "base/time/time.h" #include "gpu/vulkan/vulkan_command_buffer.h" #include "gpu/vulkan/vulkan_command_pool.h"