Rename CefBase to CefBaseRefCounted (issue #2090)

2025-06-05 21:39:12 +02:00 · 2017-02-09 17:07:43 -05:00
parent 07ba48b082
commit 0afcb82ee6
679 changed files with 2066 additions and 1962 deletions
--- a/libcef_dll/ctocpp/test/translator_test_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_ctocpp.cc
@@ -1396,7 +1396,7 @@ bool CefTranslatorTestCToCpp::SetRawPtrClientList(
 CefTranslatorTestCToCpp::CefTranslatorTestCToCpp() {
 }

-template<> cef_translator_test_t* CefCToCpp<CefTranslatorTestCToCpp,
+template<> cef_translator_test_t* CefCToCppRefCounted<CefTranslatorTestCToCpp,
    CefTranslatorTest, cef_translator_test_t>::UnwrapDerived(
    CefWrapperType type, CefTranslatorTest* c) {
  NOTREACHED() << "Unexpected class type: " << type;
@@ -1404,9 +1404,10 @@ template<> cef_translator_test_t* CefCToCpp<CefTranslatorTestCToCpp,
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefTranslatorTestCToCpp,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefTranslatorTestCToCpp,
    CefTranslatorTest, cef_translator_test_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCpp<CefTranslatorTestCToCpp, CefTranslatorTest,
-    cef_translator_test_t>::kWrapperType = WT_TRANSLATOR_TEST;
+template<> CefWrapperType CefCToCppRefCounted<CefTranslatorTestCToCpp,
+    CefTranslatorTest, cef_translator_test_t>::kWrapperType =
+    WT_TRANSLATOR_TEST;
--- a/libcef_dll/ctocpp/test/translator_test_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_ctocpp.h
@@ -22,12 +22,12 @@
 #include <vector>
 #include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefTranslatorTestCToCpp
-    : public CefCToCpp<CefTranslatorTestCToCpp, CefTranslatorTest,
+    : public CefCToCppRefCounted<CefTranslatorTestCToCpp, CefTranslatorTest,
        cef_translator_test_t> {
 public:
  CefTranslatorTestCToCpp();
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.cc
@@ -51,7 +51,7 @@ CefTranslatorTestRefPtrClientChildCToCpp::CefTranslatorTestRefPtrClientChildCToC
    ) {
 }

-template<> cef_translator_test_ref_ptr_client_child_t* CefCToCpp<CefTranslatorTestRefPtrClientChildCToCpp,
+template<> cef_translator_test_ref_ptr_client_child_t* CefCToCppRefCounted<CefTranslatorTestRefPtrClientChildCToCpp,
    CefTranslatorTestRefPtrClientChild,
    cef_translator_test_ref_ptr_client_child_t>::UnwrapDerived(
    CefWrapperType type, CefTranslatorTestRefPtrClientChild* c) {
@@ -60,12 +60,12 @@ template<> cef_translator_test_ref_ptr_client_child_t* CefCToCpp<CefTranslatorTe
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefTranslatorTestRefPtrClientChildCToCpp,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefTranslatorTestRefPtrClientChildCToCpp,
    CefTranslatorTestRefPtrClientChild,
    cef_translator_test_ref_ptr_client_child_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCpp<CefTranslatorTestRefPtrClientChildCToCpp,
+template<> CefWrapperType CefCToCppRefCounted<CefTranslatorTestRefPtrClientChildCToCpp,
    CefTranslatorTestRefPtrClientChild,
    cef_translator_test_ref_ptr_client_child_t>::kWrapperType =
    WT_TRANSLATOR_TEST_REF_PTR_CLIENT_CHILD;
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h
@@ -20,12 +20,12 @@

 #include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed DLL-side only.
 class CefTranslatorTestRefPtrClientChildCToCpp
-    : public CefCToCpp<CefTranslatorTestRefPtrClientChildCToCpp,
+    : public CefCToCppRefCounted<CefTranslatorTestRefPtrClientChildCToCpp,
        CefTranslatorTestRefPtrClientChild,
        cef_translator_test_ref_ptr_client_child_t> {
 public:
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc
@@ -36,7 +36,7 @@ int CefTranslatorTestRefPtrClientCToCpp::GetValue() {
 CefTranslatorTestRefPtrClientCToCpp::CefTranslatorTestRefPtrClientCToCpp() {
 }

-template<> cef_translator_test_ref_ptr_client_t* CefCToCpp<CefTranslatorTestRefPtrClientCToCpp,
+template<> cef_translator_test_ref_ptr_client_t* CefCToCppRefCounted<CefTranslatorTestRefPtrClientCToCpp,
    CefTranslatorTestRefPtrClient,
    cef_translator_test_ref_ptr_client_t>::UnwrapDerived(CefWrapperType type,
    CefTranslatorTestRefPtrClient* c) {
@@ -50,12 +50,12 @@ template<> cef_translator_test_ref_ptr_client_t* CefCToCpp<CefTranslatorTestRefP
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefTranslatorTestRefPtrClientCToCpp,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefTranslatorTestRefPtrClientCToCpp,
    CefTranslatorTestRefPtrClient,
    cef_translator_test_ref_ptr_client_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCpp<CefTranslatorTestRefPtrClientCToCpp,
+template<> CefWrapperType CefCToCppRefCounted<CefTranslatorTestRefPtrClientCToCpp,
    CefTranslatorTestRefPtrClient,
    cef_translator_test_ref_ptr_client_t>::kWrapperType =
    WT_TRANSLATOR_TEST_REF_PTR_CLIENT;
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h
@@ -20,12 +20,12 @@

 #include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed DLL-side only.
 class CefTranslatorTestRefPtrClientCToCpp
-    : public CefCToCpp<CefTranslatorTestRefPtrClientCToCpp,
+    : public CefCToCppRefCounted<CefTranslatorTestRefPtrClientCToCpp,
        CefTranslatorTestRefPtrClient, cef_translator_test_ref_ptr_client_t> {
 public:
  CefTranslatorTestRefPtrClientCToCpp();
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.cc
@@ -125,7 +125,7 @@ CefTranslatorTestRefPtrLibraryChildChildCToCpp::CefTranslatorTestRefPtrLibraryCh
    ) {
 }

-template<> cef_translator_test_ref_ptr_library_child_child_t* CefCToCpp<CefTranslatorTestRefPtrLibraryChildChildCToCpp,
+template<> cef_translator_test_ref_ptr_library_child_child_t* CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildChildCToCpp,
    CefTranslatorTestRefPtrLibraryChildChild,
    cef_translator_test_ref_ptr_library_child_child_t>::UnwrapDerived(
    CefWrapperType type, CefTranslatorTestRefPtrLibraryChildChild* c) {
@@ -134,12 +134,12 @@ template<> cef_translator_test_ref_ptr_library_child_child_t* CefCToCpp<CefTrans
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefTranslatorTestRefPtrLibraryChildChildCToCpp,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildChildCToCpp,
    CefTranslatorTestRefPtrLibraryChildChild,
    cef_translator_test_ref_ptr_library_child_child_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCpp<CefTranslatorTestRefPtrLibraryChildChildCToCpp,
+template<> CefWrapperType CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildChildCToCpp,
    CefTranslatorTestRefPtrLibraryChildChild,
    cef_translator_test_ref_ptr_library_child_child_t>::kWrapperType =
    WT_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CHILD;
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h
@@ -20,12 +20,12 @@

 #include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefTranslatorTestRefPtrLibraryChildChildCToCpp
-    : public CefCToCpp<CefTranslatorTestRefPtrLibraryChildChildCToCpp,
+    : public CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildChildCToCpp,
        CefTranslatorTestRefPtrLibraryChildChild,
        cef_translator_test_ref_ptr_library_child_child_t> {
 public:
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc
@@ -94,7 +94,7 @@ CefTranslatorTestRefPtrLibraryChildCToCpp::CefTranslatorTestRefPtrLibraryChildCT
    ) {
 }

-template<> cef_translator_test_ref_ptr_library_child_t* CefCToCpp<CefTranslatorTestRefPtrLibraryChildCToCpp,
+template<> cef_translator_test_ref_ptr_library_child_t* CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildCToCpp,
    CefTranslatorTestRefPtrLibraryChild,
    cef_translator_test_ref_ptr_library_child_t>::UnwrapDerived(
    CefWrapperType type, CefTranslatorTestRefPtrLibraryChild* c) {
@@ -108,12 +108,12 @@ template<> cef_translator_test_ref_ptr_library_child_t* CefCToCpp<CefTranslatorT
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefTranslatorTestRefPtrLibraryChildCToCpp,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildCToCpp,
    CefTranslatorTestRefPtrLibraryChild,
    cef_translator_test_ref_ptr_library_child_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCpp<CefTranslatorTestRefPtrLibraryChildCToCpp,
+template<> CefWrapperType CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildCToCpp,
    CefTranslatorTestRefPtrLibraryChild,
    cef_translator_test_ref_ptr_library_child_t>::kWrapperType =
    WT_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD;
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h
@@ -20,12 +20,12 @@

 #include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefTranslatorTestRefPtrLibraryChildCToCpp
-    : public CefCToCpp<CefTranslatorTestRefPtrLibraryChildCToCpp,
+    : public CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildCToCpp,
        CefTranslatorTestRefPtrLibraryChild,
        cef_translator_test_ref_ptr_library_child_t> {
 public:
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc
@@ -65,7 +65,7 @@ void CefTranslatorTestRefPtrLibraryCToCpp::SetValue(int value) {
 CefTranslatorTestRefPtrLibraryCToCpp::CefTranslatorTestRefPtrLibraryCToCpp() {
 }

-template<> cef_translator_test_ref_ptr_library_t* CefCToCpp<CefTranslatorTestRefPtrLibraryCToCpp,
+template<> cef_translator_test_ref_ptr_library_t* CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryCToCpp,
    CefTranslatorTestRefPtrLibrary,
    cef_translator_test_ref_ptr_library_t>::UnwrapDerived(CefWrapperType type,
    CefTranslatorTestRefPtrLibrary* c) {
@@ -84,12 +84,12 @@ template<> cef_translator_test_ref_ptr_library_t* CefCToCpp<CefTranslatorTestRef
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCpp<CefTranslatorTestRefPtrLibraryCToCpp,
+template<> base::AtomicRefCount CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryCToCpp,
    CefTranslatorTestRefPtrLibrary,
    cef_translator_test_ref_ptr_library_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCpp<CefTranslatorTestRefPtrLibraryCToCpp,
+template<> CefWrapperType CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryCToCpp,
    CefTranslatorTestRefPtrLibrary,
    cef_translator_test_ref_ptr_library_t>::kWrapperType =
    WT_TRANSLATOR_TEST_REF_PTR_LIBRARY;
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h
@@ -20,12 +20,12 @@

 #include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
-#include "libcef_dll/ctocpp/ctocpp.h"
+#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefTranslatorTestRefPtrLibraryCToCpp
-    : public CefCToCpp<CefTranslatorTestRefPtrLibraryCToCpp,
+    : public CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryCToCpp,
        CefTranslatorTestRefPtrLibrary,
        cef_translator_test_ref_ptr_library_t> {
 public: