Google Git
Sign in
pdfium/pdfium.git/refs/heads/chromium/4281^!/.
commit
ce72574b54b131c70c0a5cbd40a7435aacbe63d0
[log]
author
Lei Zhang <thestig@chromium.org>
Fri Oct 02 02:02:44 2020 +0000
committer
Chromium commit bot <commit-bot@chromium.org>
Fri Oct 02 02:02:44 2020 +0000
tree
493318bb5a8290148487e779f624b70da0bb3d4c
parent
0c82eb4f9b8a182fab03f37903222ded1dde28ee [diff]
Rename third_party/base/logging.h to check_op.h.

Align headers with Chromium's. Note that logging.h does not actually
contain any LOG macros.

Bug: pdfium:1594
Change-Id: Ica40976478151d5ddbc75c579e86efada5fbb97c
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/74310
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

diff --git a/core/fpdfapi/page/cpdf_dib.cpp b/core/fpdfapi/page/cpdf_dib.cpp
index e3e4055..d47c6fa 100644
--- a/core/fpdfapi/page/cpdf_dib.cpp
+++ b/core/fpdfapi/page/cpdf_dib.cpp

@@ -33,7 +33,7 @@
 #include "core/fxcrt/cfx_fixedbufgrow.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "third_party/base/logging.h"
+#include "third_party/base/check_op.h"
 #include "third_party/base/stl_util.h"
 
 namespace {

diff --git a/core/fpdfapi/parser/cpdf_security_handler.cpp b/core/fpdfapi/parser/cpdf_security_handler.cpp
index f40c2af..7b13a88 100644
--- a/core/fpdfapi/parser/cpdf_security_handler.cpp
+++ b/core/fpdfapi/parser/cpdf_security_handler.cpp

@@ -19,7 +19,7 @@
 #include "core/fpdfapi/parser/cpdf_object.h"
 #include "core/fpdfapi/parser/cpdf_string.h"
 #include "core/fxcrt/fx_random.h"
-#include "third_party/base/logging.h"
+#include "third_party/base/check_op.h"
 #include "third_party/base/notreached.h"
 #include "third_party/base/stl_util.h"
 

diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index a392392..9f98a44 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp

@@ -24,7 +24,7 @@
 #include "core/fxcrt/fx_extension.h"
 #include "core/fxcrt/fx_memory_wrappers.h"
 #include "core/fxcrt/fx_unicode.h"
-#include "third_party/base/logging.h"
+#include "third_party/base/check_op.h"
 #include "third_party/base/stl_util.h"
 
 namespace {

diff --git a/fpdfsdk/cpdfsdk_baannothandler_embeddertest.cpp b/fpdfsdk/cpdfsdk_baannothandler_embeddertest.cpp
index d81fb3c..8b48313 100644
--- a/fpdfsdk/cpdfsdk_baannothandler_embeddertest.cpp
+++ b/fpdfsdk/cpdfsdk_baannothandler_embeddertest.cpp

@@ -10,7 +10,7 @@
 #include "fpdfsdk/cpdfsdk_helpers.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
 #include "testing/embedder_test.h"
-#include "third_party/base/logging.h"
+#include "third_party/base/check_op.h"
 
 class CPDFSDK_BAAnnotHandlerTest : public EmbedderTest {
  public:

diff --git a/fpdfsdk/fpdf_formfill_embeddertest.cpp b/fpdfsdk/fpdf_formfill_embeddertest.cpp
index 067f27b..721bee2 100644
--- a/fpdfsdk/fpdf_formfill_embeddertest.cpp
+++ b/fpdfsdk/fpdf_formfill_embeddertest.cpp

@@ -19,7 +19,7 @@
 #include "testing/embedder_test_timer_handling_delegate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/logging.h"
+#include "third_party/base/check_op.h"
 #include "third_party/base/stl_util.h"
 
 using pdfium::kTextFormChecksum;

diff --git a/fxjs/cjs_util.cpp b/fxjs/cjs_util.cpp
index fe2682b..dd5296a 100644
--- a/fxjs/cjs_util.cpp
+++ b/fxjs/cjs_util.cpp

@@ -23,7 +23,7 @@
 #include "fxjs/fx_date_helpers.h"
 #include "fxjs/js_define.h"
 #include "fxjs/js_resources.h"
-#include "third_party/base/logging.h"
+#include "third_party/base/check_op.h"
 #include "third_party/base/stl_util.h"
 
 #if defined(OS_ANDROID)

diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index 10b646e..f73baa5 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn

@@ -592,12 +592,12 @@
     "base/base_export.h",
     "base/bits.h",
     "base/check.h",
+    "base/check_op.h",
     "base/compiler_specific.h",
     "base/containers/adapters.h",
     "base/debug/alias.cc",
     "base/debug/alias.h",
     "base/immediate_crash.h",
-    "base/logging.h",
     "base/memory/aligned_memory.cc",
     "base/memory/aligned_memory.h",
     "base/no_destructor.h",

diff --git a/third_party/base/allocator/partition_allocator/address_space_randomization.cc b/third_party/base/allocator/partition_allocator/address_space_randomization.cc
index 18807a6..dfecde3 100644
--- a/third_party/base/allocator/partition_allocator/address_space_randomization.cc
+++ b/third_party/base/allocator/partition_allocator/address_space_randomization.cc

@@ -8,7 +8,7 @@
 #include "third_party/base/allocator/partition_allocator/page_allocator.h"
 #include "third_party/base/allocator/partition_allocator/random.h"
 #include "third_party/base/allocator/partition_allocator/spin_lock.h"
-#include "third_party/base/logging.h"
+#include "third_party/base/check_op.h"
 
 #if defined(OS_WIN)
 #include <windows.h>  // Must be in front of other Windows header files.

diff --git a/third_party/base/allocator/partition_allocator/oom.h b/third_party/base/allocator/partition_allocator/oom.h
index 8f3e9c6..7b4fb6e 100644
--- a/third_party/base/allocator/partition_allocator/oom.h
+++ b/third_party/base/allocator/partition_allocator/oom.h

@@ -6,7 +6,7 @@
 #define THIRD_PARTY_BASE_ALLOCATOR_PARTITION_ALLOCATOR_OOM_H_
 
 #include "third_party/base/allocator/partition_allocator/oom_callback.h"
-#include "third_party/base/logging.h"
+#include "third_party/base/immediate_crash.h"
 
 #if defined(OS_WIN)
 #include <windows.h>

diff --git a/third_party/base/allocator/partition_allocator/oom_callback.cc b/third_party/base/allocator/partition_allocator/oom_callback.cc
index 9143438..0272f07 100644
--- a/third_party/base/allocator/partition_allocator/oom_callback.cc
+++ b/third_party/base/allocator/partition_allocator/oom_callback.cc

@@ -4,7 +4,7 @@
 
 #include "third_party/base/allocator/partition_allocator/oom_callback.h"
 
-#include "third_party/base/logging.h"
+#include "third_party/base/check.h"
 
 namespace pdfium {
 namespace base {

diff --git a/third_party/base/allocator/partition_allocator/page_allocator.cc b/third_party/base/allocator/partition_allocator/page_allocator.cc
index 91d00d2..e1cf290 100644
--- a/third_party/base/allocator/partition_allocator/page_allocator.cc
+++ b/third_party/base/allocator/partition_allocator/page_allocator.cc

@@ -13,7 +13,7 @@
 #include "third_party/base/allocator/partition_allocator/page_allocator_internal.h"
 #include "third_party/base/allocator/partition_allocator/spin_lock.h"
 #include "third_party/base/bits.h"
-#include "third_party/base/logging.h"
+#include "third_party/base/check_op.h"
 #include "third_party/base/numerics/safe_math.h"
 
 #if defined(OS_WIN)

diff --git a/third_party/base/allocator/partition_allocator/page_allocator_internals_win.h b/third_party/base/allocator/partition_allocator/page_allocator_internals_win.h
index f9d26a5..48635eb 100644
--- a/third_party/base/allocator/partition_allocator/page_allocator_internals_win.h
+++ b/third_party/base/allocator/partition_allocator/page_allocator_internals_win.h

@@ -7,7 +7,7 @@
 
 #include "third_party/base/allocator/partition_allocator/oom.h"
 #include "third_party/base/allocator/partition_allocator/page_allocator_internal.h"
-#include "third_party/base/logging.h"
+#include "third_party/base/check_op.h"
 #include "third_party/base/notreached.h"
 
 namespace pdfium {

diff --git a/third_party/base/allocator/partition_allocator/partition_alloc.h b/third_party/base/allocator/partition_allocator/partition_alloc.h
index 084a2a2..483c75e 100644
--- a/third_party/base/allocator/partition_allocator/partition_alloc.h
+++ b/third_party/base/allocator/partition_allocator/partition_alloc.h

@@ -73,8 +73,8 @@
 #include "third_party/base/allocator/partition_allocator/spin_lock.h"
 #include "third_party/base/base_export.h"
 #include "third_party/base/bits.h"
+#include "third_party/base/check.h"
 #include "third_party/base/compiler_specific.h"
-#include "third_party/base/logging.h"
 #include "third_party/base/stl_util.h"
 #include "third_party/base/sys_byteorder.h"
 

diff --git a/third_party/base/allocator/partition_allocator/partition_alloc_check.h b/third_party/base/allocator/partition_allocator/partition_alloc_check.h
index 51c23e2..26002b6 100644
--- a/third_party/base/allocator/partition_allocator/partition_alloc_check.h
+++ b/third_party/base/allocator/partition_allocator/partition_alloc_check.h

@@ -6,7 +6,7 @@
 #define THIRD_PARTY_BASE_ALLOCATOR_PARTITION_ALLOCATOR_PARTITION_ALLOC_CHECK_H_
 
 #include "third_party/base/allocator/partition_allocator/page_allocator_constants.h"
-#include "third_party/base/logging.h"
+#include "third_party/base/check.h"
 
 #if defined(PAGE_ALLOCATOR_CONSTANTS_ARE_CONSTEXPR)
 

diff --git a/third_party/base/allocator/partition_allocator/partition_cookie.h b/third_party/base/allocator/partition_allocator/partition_cookie.h
index 7cf4e84..3c2b688 100644
--- a/third_party/base/allocator/partition_allocator/partition_cookie.h
+++ b/third_party/base/allocator/partition_allocator/partition_cookie.h

@@ -5,8 +5,8 @@
 #ifndef THIRD_PARTY_BASE_ALLOCATOR_PARTITION_ALLOCATOR_PARTITION_COOKIE_H_
 #define THIRD_PARTY_BASE_ALLOCATOR_PARTITION_ALLOCATOR_PARTITION_COOKIE_H_
 
+#include "third_party/base/check.h"
 #include "third_party/base/compiler_specific.h"
-#include "third_party/base/logging.h"
 
 namespace pdfium {
 namespace base {

diff --git a/third_party/base/logging.h b/third_party/base/check_op.h
similarity index 63%
rename from third_party/base/logging.h
rename to third_party/base/check_op.h
index 2360a24..ef732ab 100644
--- a/third_party/base/logging.h
+++ b/third_party/base/check_op.h

@@ -1,9 +1,9 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2020 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BASE_LOGGING_H_
-#define THIRD_PARTY_BASE_LOGGING_H_
+#ifndef THIRD_PARTY_BASE_CHECK_OP_H_
+#define THIRD_PARTY_BASE_CHECK_OP_H_
 
 #include "third_party/base/check.h"
 
@@ -12,4 +12,4 @@
 #define DCHECK_EQ(x, y) DCHECK((x) == (y))
 #define DCHECK_NE(x, y) DCHECK((x) != (y))
 
-#endif  // THIRD_PARTY_BASE_LOGGING_H_
+#endif  // THIRD_PARTY_BASE_CHECK_OP_H_

diff --git a/third_party/base/memory/aligned_memory.cc b/third_party/base/memory/aligned_memory.cc
index 3cacf3f..8fe2f8a 100644
--- a/third_party/base/memory/aligned_memory.cc
+++ b/third_party/base/memory/aligned_memory.cc

@@ -5,7 +5,7 @@
 #include "third_party/base/memory/aligned_memory.h"
 
 #include "build/build_config.h"
-#include "third_party/base/logging.h"
+#include "third_party/base/check_op.h"
 
 #if defined(OS_ANDROID)
 #include <malloc.h>

diff --git a/xfa/fxfa/layout/cxfa_contentlayoutitem.cpp b/xfa/fxfa/layout/cxfa_contentlayoutitem.cpp
index 39f9035..5631ea3 100644
--- a/xfa/fxfa/layout/cxfa_contentlayoutitem.cpp
+++ b/xfa/fxfa/layout/cxfa_contentlayoutitem.cpp

@@ -7,7 +7,7 @@
 #include "xfa/fxfa/layout/cxfa_contentlayoutitem.h"
 
 #include "fxjs/xfa/cjx_object.h"
-#include "third_party/base/logging.h"
+#include "third_party/base/check_op.h"
 #include "xfa/fxfa/cxfa_ffwidget.h"
 #include "xfa/fxfa/parser/cxfa_margin.h"
 #include "xfa/fxfa/parser/cxfa_node.h"