Move core/fxcrt/observable.h to observed_ptr.h.
Make consistent with retain_ptr.h and unowned_ptr.h. A subsequent
CL is likely to unnest the ObservedPtr class from the Observable,
at which point this becomes even more correct.
Mechanical transaction with git mv and mass_rename.sh.
Change-Id: I25c1c8ccc9db2f555e1fca845310b170a92b8d17
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/55950
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_colorspace.h b/core/fpdfapi/page/cpdf_colorspace.h
index a4827ba..4be7ae4 100644
--- a/core/fpdfapi/page/cpdf_colorspace.h
+++ b/core/fpdfapi/page/cpdf_colorspace.h
@@ -13,7 +13,7 @@
#include "core/fpdfapi/page/cpdf_pattern.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
-#include "core/fxcrt/observable.h"
+#include "core/fxcrt/observed_ptr.h"
#include "core/fxcrt/retain_ptr.h"
#include "core/fxcrt/unowned_ptr.h"
diff --git a/core/fpdfapi/parser/cpdf_document.h b/core/fpdfapi/parser/cpdf_document.h
index 918fcfa..d8dbcf9 100644
--- a/core/fpdfapi/parser/cpdf_document.h
+++ b/core/fpdfapi/parser/cpdf_document.h
@@ -16,7 +16,7 @@
#include "build/build_config.h"
#include "core/fpdfapi/parser/cpdf_object.h"
#include "core/fpdfapi/parser/cpdf_parser.h"
-#include "core/fxcrt/observable.h"
+#include "core/fxcrt/observed_ptr.h"
#include "core/fxcrt/retain_ptr.h"
#include "core/fxcrt/unowned_ptr.h"
diff --git a/core/fxcrt/BUILD.gn b/core/fxcrt/BUILD.gn
index 0b31e16..f8529e4 100644
--- a/core/fxcrt/BUILD.gn
+++ b/core/fxcrt/BUILD.gn
@@ -53,7 +53,7 @@
"fx_unicode.cpp",
"fx_unicode.h",
"maybe_owned.h",
- "observable.h",
+ "observed_ptr.h",
"pauseindicator_iface.h",
"retain_ptr.h",
"retained_tree_node.h",
@@ -142,7 +142,7 @@
"fx_string_unittest.cpp",
"fx_system_unittest.cpp",
"maybe_owned_unittest.cpp",
- "observable_unittest.cpp",
+ "observed_ptr_unittest.cpp",
"pdfium_span_unittest.cpp",
"retain_ptr_unittest.cpp",
"retained_tree_node_unittest.cpp",
diff --git a/core/fxcrt/observable.h b/core/fxcrt/observed_ptr.h
similarity index 95%
rename from core/fxcrt/observable.h
rename to core/fxcrt/observed_ptr.h
index 3205bc0..d674c22 100644
--- a/core/fxcrt/observable.h
+++ b/core/fxcrt/observed_ptr.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CORE_FXCRT_OBSERVABLE_H_
-#define CORE_FXCRT_OBSERVABLE_H_
+#ifndef CORE_FXCRT_OBSERVED_PTR_H_
+#define CORE_FXCRT_OBSERVED_PTR_H_
#include <set>
@@ -93,4 +93,4 @@
using fxcrt::Observable;
-#endif // CORE_FXCRT_OBSERVABLE_H_
+#endif // CORE_FXCRT_OBSERVED_PTR_H_
diff --git a/core/fxcrt/observable_unittest.cpp b/core/fxcrt/observed_ptr_unittest.cpp
similarity index 99%
rename from core/fxcrt/observable_unittest.cpp
rename to core/fxcrt/observed_ptr_unittest.cpp
index 0c84c5d..34c09fe 100644
--- a/core/fxcrt/observable_unittest.cpp
+++ b/core/fxcrt/observed_ptr_unittest.cpp
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "core/fxcrt/observable.h"
+#include "core/fxcrt/observed_ptr.h"
#include <utility>
#include <vector>
diff --git a/core/fxcrt/retained_tree_node_unittest.cpp b/core/fxcrt/retained_tree_node_unittest.cpp
index 02c23e5..02ba61a 100644
--- a/core/fxcrt/retained_tree_node_unittest.cpp
+++ b/core/fxcrt/retained_tree_node_unittest.cpp
@@ -4,7 +4,7 @@
#include "core/fxcrt/retained_tree_node.h"
-#include "core/fxcrt/observable.h"
+#include "core/fxcrt/observed_ptr.h"
#include "core/fxcrt/retain_ptr.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/core/fxge/cfx_glyphcache.h b/core/fxge/cfx_glyphcache.h
index 2d1acef..7cdc5a4 100644
--- a/core/fxge/cfx_glyphcache.h
+++ b/core/fxge/cfx_glyphcache.h
@@ -12,7 +12,7 @@
#include <tuple>
#include "core/fxcrt/fx_string.h"
-#include "core/fxcrt/observable.h"
+#include "core/fxcrt/observed_ptr.h"
#include "core/fxcrt/retain_ptr.h"
#include "core/fxge/fx_freetype.h"
diff --git a/fpdfsdk/cpdfsdk_annot.h b/fpdfsdk/cpdfsdk_annot.h
index c2cdf11..527e79e 100644
--- a/fpdfsdk/cpdfsdk_annot.h
+++ b/fpdfsdk/cpdfsdk_annot.h
@@ -10,7 +10,7 @@
#include "core/fpdfdoc/cpdf_aaction.h"
#include "core/fpdfdoc/cpdf_annot.h"
#include "core/fpdfdoc/cpdf_defaultappearance.h"
-#include "core/fxcrt/observable.h"
+#include "core/fxcrt/observed_ptr.h"
#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/cfx_systemhandler.h"
#include "fpdfsdk/cpdfsdk_helpers.h"
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h
index 68e4054..d68b244 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.h
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.h
@@ -14,7 +14,7 @@
#include "core/fpdfapi/page/cpdf_occontext.h"
#include "core/fpdfapi/page/cpdf_page.h"
#include "core/fpdfapi/parser/cpdf_document.h"
-#include "core/fxcrt/observable.h"
+#include "core/fxcrt/observed_ptr.h"
#include "fpdfsdk/cpdfsdk_annot.h"
#include "fpdfsdk/cpdfsdk_helpers.h"
#include "public/fpdf_formfill.h"
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.h b/fpdfsdk/fpdfxfa/cpdfxfa_context.h
index f434b8c..be68b48 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_context.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.h
@@ -12,7 +12,7 @@
#include "core/fpdfapi/parser/cpdf_document.h"
#include "core/fxcrt/fx_system.h"
-#include "core/fxcrt/observable.h"
+#include "core/fxcrt/observed_ptr.h"
#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_helpers.h"
diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h
index 2fe605e..6eea536 100644
--- a/fpdfsdk/pwl/cpwl_wnd.h
+++ b/fpdfsdk/pwl/cpwl_wnd.h
@@ -11,7 +11,7 @@
#include <vector>
#include "core/fpdfdoc/cpdf_formcontrol.h"
-#include "core/fxcrt/observable.h"
+#include "core/fxcrt/observed_ptr.h"
#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/cfx_color.h"
#include "core/fxge/cfx_renderdevice.h"
diff --git a/fxjs/cjs_document.h b/fxjs/cjs_document.h
index f4eab26..0ba57f6 100644
--- a/fxjs/cjs_document.h
+++ b/fxjs/cjs_document.h
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/observable.h"
+#include "core/fxcrt/observed_ptr.h"
#include "fxjs/cjs_object.h"
#include "fxjs/js_define.h"
diff --git a/fxjs/cjs_runtime.h b/fxjs/cjs_runtime.h
index 33c41f2..b03bea1 100644
--- a/fxjs/cjs_runtime.h
+++ b/fxjs/cjs_runtime.h
@@ -12,7 +12,7 @@
#include <utility>
#include <vector>
-#include "core/fxcrt/observable.h"
+#include "core/fxcrt/observed_ptr.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fxjs/cfxjs_engine.h"
#include "fxjs/cjs_eventrecorder.h"
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h
index 5a92ba3..9dff7e4 100644
--- a/xfa/fgas/font/cfgas_fontmgr.h
+++ b/xfa/fgas/font/cfgas_fontmgr.h
@@ -15,7 +15,7 @@
#include "build/build_config.h"
#include "core/fxcrt/fx_extension.h"
-#include "core/fxcrt/observable.h"
+#include "core/fxcrt/observed_ptr.h"
#include "core/fxcrt/retain_ptr.h"
#include "core/fxge/fx_freetype.h"
#include "core/fxge/systemfontinfo_iface.h"
diff --git a/xfa/fgas/font/cfgas_pdffontmgr.h b/xfa/fgas/font/cfgas_pdffontmgr.h
index d2274fb..e1b09c1 100644
--- a/xfa/fgas/font/cfgas_pdffontmgr.h
+++ b/xfa/fgas/font/cfgas_pdffontmgr.h
@@ -10,7 +10,7 @@
#include <map>
#include "core/fxcrt/fx_string.h"
-#include "core/fxcrt/observable.h"
+#include "core/fxcrt/observed_ptr.h"
#include "core/fxcrt/retain_ptr.h"
class CFGAS_FontMgr;
