bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename CefBase to CefBaseRefCounted (issue #2090)

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-02-09 17:07:43 -05:00
parent 07ba48b082
commit 0afcb82ee6
679 changed files with 2066 additions and 1962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libcef_dll/cpptoc/views/box_layout_cpptoc.cc
View File

@ -114,17 +114,17 @@ CefBoxLayoutCppToC::CefBoxLayoutCppToC() {
GetStruct()->base.is_valid = box_layout_is_valid;
}
template<> CefRefPtr<CefBoxLayout> CefCppToC<CefBoxLayoutCppToC, CefBoxLayout,
cef_box_layout_t>::UnwrapDerived(CefWrapperType type,
template<> CefRefPtr<CefBoxLayout> CefCppToCRefCounted<CefBoxLayoutCppToC,
CefBoxLayout, cef_box_layout_t>::UnwrapDerived(CefWrapperType type,
cef_box_layout_t* s) {
NOTREACHED() << "Unexpected class type: " << type;
return NULL;
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefBoxLayoutCppToC, CefBoxLayout,
cef_box_layout_t>::DebugObjCt = 0;
template<> base::AtomicRefCount CefCppToCRefCounted<CefBoxLayoutCppToC,
CefBoxLayout, cef_box_layout_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefBoxLayoutCppToC, CefBoxLayout,
template<> CefWrapperType CefCppToCRefCounted<CefBoxLayoutCppToC, CefBoxLayout,
cef_box_layout_t>::kWrapperType = WT_BOX_LAYOUT;

5
libcef_dll/cpptoc/views/box_layout_cpptoc.h
View File

@ -22,12 +22,13 @@
#include "include/capi/views/cef_box_layout_capi.h"
#include "include/views/cef_view.h"
#include "include/capi/views/cef_view_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed DLL-side only.
class CefBoxLayoutCppToC
: public CefCppToC<CefBoxLayoutCppToC, CefBoxLayout, cef_box_layout_t> {
: public CefCppToCRefCounted<CefBoxLayoutCppToC, CefBoxLayout,
cef_box_layout_t> {
public:
CefBoxLayoutCppToC();
};

10
libcef_dll/cpptoc/views/browser_view_cpptoc.cc
View File

@ -960,7 +960,7 @@ CefBrowserViewCppToC::CefBrowserViewCppToC() {
browser_view_convert_point_from_view;
}
template<> CefRefPtr<CefBrowserView> CefCppToC<CefBrowserViewCppToC,
template<> CefRefPtr<CefBrowserView> CefCppToCRefCounted<CefBrowserViewCppToC,
CefBrowserView, cef_browser_view_t>::UnwrapDerived(CefWrapperType type,
cef_browser_view_t* s) {
NOTREACHED() << "Unexpected class type: " << type;
@ -968,9 +968,9 @@ template<> CefRefPtr<CefBrowserView> CefCppToC<CefBrowserViewCppToC,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefBrowserViewCppToC, CefBrowserView,
cef_browser_view_t>::DebugObjCt = 0;
template<> base::AtomicRefCount CefCppToCRefCounted<CefBrowserViewCppToC,
CefBrowserView, cef_browser_view_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefBrowserViewCppToC, CefBrowserView,
cef_browser_view_t>::kWrapperType = WT_BROWSER_VIEW;
template<> CefWrapperType CefCppToCRefCounted<CefBrowserViewCppToC,
CefBrowserView, cef_browser_view_t>::kWrapperType = WT_BROWSER_VIEW;

4
libcef_dll/cpptoc/views/browser_view_cpptoc.h
View File

@ -20,12 +20,12 @@
#include "include/views/cef_browser_view.h"
#include "include/capi/views/cef_browser_view_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed DLL-side only.
class CefBrowserViewCppToC
: public CefCppToC<CefBrowserViewCppToC, CefBrowserView,
: public CefCppToCRefCounted<CefBrowserViewCppToC, CefBrowserView,
cef_browser_view_t> {
public:
CefBrowserViewCppToC();

6
libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.cc
View File

@ -295,7 +295,7 @@ CefBrowserViewDelegateCppToC::CefBrowserViewDelegateCppToC() {
browser_view_delegate_on_child_view_changed;
}
template<> CefRefPtr<CefBrowserViewDelegate> CefCppToC<CefBrowserViewDelegateCppToC,
template<> CefRefPtr<CefBrowserViewDelegate> CefCppToCRefCounted<CefBrowserViewDelegateCppToC,
CefBrowserViewDelegate, cef_browser_view_delegate_t>::UnwrapDerived(
CefWrapperType type, cef_browser_view_delegate_t* s) {
NOTREACHED() << "Unexpected class type: " << type;
@ -303,10 +303,10 @@ template<> CefRefPtr<CefBrowserViewDelegate> CefCppToC<CefBrowserViewDelegateCpp
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefBrowserViewDelegateCppToC,
template<> base::AtomicRefCount CefCppToCRefCounted<CefBrowserViewDelegateCppToC,
CefBrowserViewDelegate, cef_browser_view_delegate_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefBrowserViewDelegateCppToC,
template<> CefWrapperType CefCppToCRefCounted<CefBrowserViewDelegateCppToC,
CefBrowserViewDelegate, cef_browser_view_delegate_t>::kWrapperType =
WT_BROWSER_VIEW_DELEGATE;

6
libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h
View File

@ -24,13 +24,13 @@
#include "include/capi/cef_browser_capi.h"
#include "include/views/cef_browser_view.h"
#include "include/capi/views/cef_browser_view_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed wrapper-side only.
class CefBrowserViewDelegateCppToC
: public CefCppToC<CefBrowserViewDelegateCppToC, CefBrowserViewDelegate,
cef_browser_view_delegate_t> {
: public CefCppToCRefCounted<CefBrowserViewDelegateCppToC,
CefBrowserViewDelegate, cef_browser_view_delegate_t> {
public:
CefBrowserViewDelegateCppToC();
};

6
libcef_dll/cpptoc/views/button_cpptoc.cc
View File

@ -953,7 +953,7 @@ CefButtonCppToC::CefButtonCppToC() {
GetStruct()->base.convert_point_from_view = button_convert_point_from_view;
}
template<> CefRefPtr<CefButton> CefCppToC<CefButtonCppToC, CefButton,
template<> CefRefPtr<CefButton> CefCppToCRefCounted<CefButtonCppToC, CefButton,
cef_button_t>::UnwrapDerived(CefWrapperType type, cef_button_t* s) {
if (type == WT_LABEL_BUTTON) {
return CefLabelButtonCppToC::Unwrap(reinterpret_cast<cef_label_button_t*>(
@ -967,9 +967,9 @@ template<> CefRefPtr<CefButton> CefCppToC<CefButtonCppToC, CefButton,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefButtonCppToC, CefButton,
template<> base::AtomicRefCount CefCppToCRefCounted<CefButtonCppToC, CefButton,
cef_button_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefButtonCppToC, CefButton,
template<> CefWrapperType CefCppToCRefCounted<CefButtonCppToC, CefButton,
cef_button_t>::kWrapperType = WT_BUTTON;

4
libcef_dll/cpptoc/views/button_cpptoc.h
View File

@ -22,12 +22,12 @@
#include "include/capi/views/cef_button_capi.h"
#include "include/views/cef_label_button.h"
#include "include/capi/views/cef_label_button_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed DLL-side only.
class CefButtonCppToC
: public CefCppToC<CefButtonCppToC, CefButton, cef_button_t> {
: public CefCppToCRefCounted<CefButtonCppToC, CefButton, cef_button_t> {
public:
CefButtonCppToC();
};

9
libcef_dll/cpptoc/views/button_delegate_cpptoc.cc
View File

@ -189,7 +189,7 @@ CefButtonDelegateCppToC::CefButtonDelegateCppToC() {
button_delegate_on_child_view_changed;
}
template<> CefRefPtr<CefButtonDelegate> CefCppToC<CefButtonDelegateCppToC,
template<> CefRefPtr<CefButtonDelegate> CefCppToCRefCounted<CefButtonDelegateCppToC,
CefButtonDelegate, cef_button_delegate_t>::UnwrapDerived(
CefWrapperType type, cef_button_delegate_t* s) {
if (type == WT_MENU_BUTTON_DELEGATE) {
@ -201,9 +201,10 @@ template<> CefRefPtr<CefButtonDelegate> CefCppToC<CefButtonDelegateCppToC,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefButtonDelegateCppToC,
template<> base::AtomicRefCount CefCppToCRefCounted<CefButtonDelegateCppToC,
CefButtonDelegate, cef_button_delegate_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefButtonDelegateCppToC, CefButtonDelegate,
cef_button_delegate_t>::kWrapperType = WT_BUTTON_DELEGATE;
template<> CefWrapperType CefCppToCRefCounted<CefButtonDelegateCppToC,
CefButtonDelegate, cef_button_delegate_t>::kWrapperType =
WT_BUTTON_DELEGATE;

4
libcef_dll/cpptoc/views/button_delegate_cpptoc.h
View File

@ -22,12 +22,12 @@
#include "include/capi/views/cef_button_delegate_capi.h"
#include "include/views/cef_button.h"
#include "include/capi/views/cef_button_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed wrapper-side only.
class CefButtonDelegateCppToC
: public CefCppToC<CefButtonDelegateCppToC, CefButtonDelegate,
: public CefCppToCRefCounted<CefButtonDelegateCppToC, CefButtonDelegate,
cef_button_delegate_t> {
public:
CefButtonDelegateCppToC();

11
libcef_dll/cpptoc/views/display_cpptoc.cc
View File

@ -249,16 +249,17 @@ CefDisplayCppToC::CefDisplayCppToC() {
GetStruct()->get_rotation = display_get_rotation;
}
template<> CefRefPtr<CefDisplay> CefCppToC<CefDisplayCppToC, CefDisplay,
cef_display_t>::UnwrapDerived(CefWrapperType type, cef_display_t* s) {
template<> CefRefPtr<CefDisplay> CefCppToCRefCounted<CefDisplayCppToC,
CefDisplay, cef_display_t>::UnwrapDerived(CefWrapperType type,
cef_display_t* s) {
NOTREACHED() << "Unexpected class type: " << type;
return NULL;
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefDisplayCppToC, CefDisplay,
cef_display_t>::DebugObjCt = 0;
template<> base::AtomicRefCount CefCppToCRefCounted<CefDisplayCppToC,
CefDisplay, cef_display_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefDisplayCppToC, CefDisplay,
template<> CefWrapperType CefCppToCRefCounted<CefDisplayCppToC, CefDisplay,
cef_display_t>::kWrapperType = WT_DISPLAY;

4
libcef_dll/cpptoc/views/display_cpptoc.h
View File

@ -20,12 +20,12 @@
#include "include/views/cef_display.h"
#include "include/capi/views/cef_display_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed DLL-side only.
class CefDisplayCppToC
: public CefCppToC<CefDisplayCppToC, CefDisplay, cef_display_t> {
: public CefCppToCRefCounted<CefDisplayCppToC, CefDisplay, cef_display_t> {
public:
CefDisplayCppToC();
};

10
libcef_dll/cpptoc/views/fill_layout_cpptoc.cc
View File

@ -76,7 +76,7 @@ CefFillLayoutCppToC::CefFillLayoutCppToC() {
GetStruct()->base.is_valid = fill_layout_is_valid;
}
template<> CefRefPtr<CefFillLayout> CefCppToC<CefFillLayoutCppToC,
template<> CefRefPtr<CefFillLayout> CefCppToCRefCounted<CefFillLayoutCppToC,
CefFillLayout, cef_fill_layout_t>::UnwrapDerived(CefWrapperType type,
cef_fill_layout_t* s) {
NOTREACHED() << "Unexpected class type: " << type;
@ -84,9 +84,9 @@ template<> CefRefPtr<CefFillLayout> CefCppToC<CefFillLayoutCppToC,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefFillLayoutCppToC, CefFillLayout,
cef_fill_layout_t>::DebugObjCt = 0;
template<> base::AtomicRefCount CefCppToCRefCounted<CefFillLayoutCppToC,
CefFillLayout, cef_fill_layout_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefFillLayoutCppToC, CefFillLayout,
cef_fill_layout_t>::kWrapperType = WT_FILL_LAYOUT;
template<> CefWrapperType CefCppToCRefCounted<CefFillLayoutCppToC,
CefFillLayout, cef_fill_layout_t>::kWrapperType = WT_FILL_LAYOUT;

5
libcef_dll/cpptoc/views/fill_layout_cpptoc.h
View File

@ -20,12 +20,13 @@
#include "include/views/cef_fill_layout.h"
#include "include/capi/views/cef_fill_layout_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed DLL-side only.
class CefFillLayoutCppToC
: public CefCppToC<CefFillLayoutCppToC, CefFillLayout, cef_fill_layout_t> {
: public CefCppToCRefCounted<CefFillLayoutCppToC, CefFillLayout,
cef_fill_layout_t> {
public:
CefFillLayoutCppToC();
};

10
libcef_dll/cpptoc/views/label_button_cpptoc.cc
View File

@ -1198,7 +1198,7 @@ CefLabelButtonCppToC::CefLabelButtonCppToC() {
label_button_convert_point_from_view;
}
template<> CefRefPtr<CefLabelButton> CefCppToC<CefLabelButtonCppToC,
template<> CefRefPtr<CefLabelButton> CefCppToCRefCounted<CefLabelButtonCppToC,
CefLabelButton, cef_label_button_t>::UnwrapDerived(CefWrapperType type,
cef_label_button_t* s) {
if (type == WT_MENU_BUTTON) {
@ -1209,9 +1209,9 @@ template<> CefRefPtr<CefLabelButton> CefCppToC<CefLabelButtonCppToC,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefLabelButtonCppToC, CefLabelButton,
cef_label_button_t>::DebugObjCt = 0;
template<> base::AtomicRefCount CefCppToCRefCounted<CefLabelButtonCppToC,
CefLabelButton, cef_label_button_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefLabelButtonCppToC, CefLabelButton,
cef_label_button_t>::kWrapperType = WT_LABEL_BUTTON;
template<> CefWrapperType CefCppToCRefCounted<CefLabelButtonCppToC,
CefLabelButton, cef_label_button_t>::kWrapperType = WT_LABEL_BUTTON;

4
libcef_dll/cpptoc/views/label_button_cpptoc.h
View File

@ -22,12 +22,12 @@
#include "include/capi/views/cef_label_button_capi.h"
#include "include/views/cef_menu_button.h"
#include "include/capi/views/cef_menu_button_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed DLL-side only.
class CefLabelButtonCppToC
: public CefCppToC<CefLabelButtonCppToC, CefLabelButton,
: public CefCppToCRefCounted<CefLabelButtonCppToC, CefLabelButton,
cef_label_button_t> {
public:
CefLabelButtonCppToC();

6
libcef_dll/cpptoc/views/layout_cpptoc.cc
View File

@ -74,7 +74,7 @@ CefLayoutCppToC::CefLayoutCppToC() {
GetStruct()->is_valid = layout_is_valid;
}
template<> CefRefPtr<CefLayout> CefCppToC<CefLayoutCppToC, CefLayout,
template<> CefRefPtr<CefLayout> CefCppToCRefCounted<CefLayoutCppToC, CefLayout,
cef_layout_t>::UnwrapDerived(CefWrapperType type, cef_layout_t* s) {
if (type == WT_BOX_LAYOUT) {
return CefBoxLayoutCppToC::Unwrap(reinterpret_cast<cef_box_layout_t*>(s));
@ -87,9 +87,9 @@ template<> CefRefPtr<CefLayout> CefCppToC<CefLayoutCppToC, CefLayout,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefLayoutCppToC, CefLayout,
template<> base::AtomicRefCount CefCppToCRefCounted<CefLayoutCppToC, CefLayout,
cef_layout_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefLayoutCppToC, CefLayout,
template<> CefWrapperType CefCppToCRefCounted<CefLayoutCppToC, CefLayout,
cef_layout_t>::kWrapperType = WT_LAYOUT;

4
libcef_dll/cpptoc/views/layout_cpptoc.h
View File

@ -24,12 +24,12 @@
#include "include/capi/views/cef_box_layout_capi.h"
#include "include/views/cef_fill_layout.h"
#include "include/capi/views/cef_fill_layout_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed DLL-side only.
class CefLayoutCppToC
: public CefCppToC<CefLayoutCppToC, CefLayout, cef_layout_t> {
: public CefCppToCRefCounted<CefLayoutCppToC, CefLayout, cef_layout_t> {
public:
CefLayoutCppToC();
};

10
libcef_dll/cpptoc/views/menu_button_cpptoc.cc
View File

@ -1236,7 +1236,7 @@ CefMenuButtonCppToC::CefMenuButtonCppToC() {
menu_button_convert_point_from_view;
}
template<> CefRefPtr<CefMenuButton> CefCppToC<CefMenuButtonCppToC,
template<> CefRefPtr<CefMenuButton> CefCppToCRefCounted<CefMenuButtonCppToC,
CefMenuButton, cef_menu_button_t>::UnwrapDerived(CefWrapperType type,
cef_menu_button_t* s) {
NOTREACHED() << "Unexpected class type: " << type;
@ -1244,9 +1244,9 @@ template<> CefRefPtr<CefMenuButton> CefCppToC<CefMenuButtonCppToC,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefMenuButtonCppToC, CefMenuButton,
cef_menu_button_t>::DebugObjCt = 0;
template<> base::AtomicRefCount CefCppToCRefCounted<CefMenuButtonCppToC,
CefMenuButton, cef_menu_button_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefMenuButtonCppToC, CefMenuButton,
cef_menu_button_t>::kWrapperType = WT_MENU_BUTTON;
template<> CefWrapperType CefCppToCRefCounted<CefMenuButtonCppToC,
CefMenuButton, cef_menu_button_t>::kWrapperType = WT_MENU_BUTTON;

5
libcef_dll/cpptoc/views/menu_button_cpptoc.h
View File

@ -20,12 +20,13 @@
#include "include/views/cef_menu_button.h"
#include "include/capi/views/cef_menu_button_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed DLL-side only.
class CefMenuButtonCppToC
: public CefCppToC<CefMenuButtonCppToC, CefMenuButton, cef_menu_button_t> {
: public CefCppToCRefCounted<CefMenuButtonCppToC, CefMenuButton,
cef_menu_button_t> {
public:
CefMenuButtonCppToC();
};

6
libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.cc
View File

@ -222,7 +222,7 @@ CefMenuButtonDelegateCppToC::CefMenuButtonDelegateCppToC() {
menu_button_delegate_on_child_view_changed;
}
template<> CefRefPtr<CefMenuButtonDelegate> CefCppToC<CefMenuButtonDelegateCppToC,
template<> CefRefPtr<CefMenuButtonDelegate> CefCppToCRefCounted<CefMenuButtonDelegateCppToC,
CefMenuButtonDelegate, cef_menu_button_delegate_t>::UnwrapDerived(
CefWrapperType type, cef_menu_button_delegate_t* s) {
NOTREACHED() << "Unexpected class type: " << type;
@ -230,10 +230,10 @@ template<> CefRefPtr<CefMenuButtonDelegate> CefCppToC<CefMenuButtonDelegateCppTo
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefMenuButtonDelegateCppToC,
template<> base::AtomicRefCount CefCppToCRefCounted<CefMenuButtonDelegateCppToC,
CefMenuButtonDelegate, cef_menu_button_delegate_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefMenuButtonDelegateCppToC,
template<> CefWrapperType CefCppToCRefCounted<CefMenuButtonDelegateCppToC,
CefMenuButtonDelegate, cef_menu_button_delegate_t>::kWrapperType =
WT_MENU_BUTTON_DELEGATE;

6
libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h
View File

@ -22,13 +22,13 @@
#include "include/capi/views/cef_menu_button_delegate_capi.h"
#include "include/views/cef_menu_button.h"
#include "include/capi/views/cef_menu_button_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed wrapper-side only.
class CefMenuButtonDelegateCppToC
: public CefCppToC<CefMenuButtonDelegateCppToC, CefMenuButtonDelegate,
cef_menu_button_delegate_t> {
: public CefCppToCRefCounted<CefMenuButtonDelegateCppToC,
CefMenuButtonDelegate, cef_menu_button_delegate_t> {
public:
CefMenuButtonDelegateCppToC();
};

6
libcef_dll/cpptoc/views/panel_cpptoc.cc
View File

@ -1095,7 +1095,7 @@ CefPanelCppToC::CefPanelCppToC() {
GetStruct()->base.convert_point_from_view = panel_convert_point_from_view;
}
template<> CefRefPtr<CefPanel> CefCppToC<CefPanelCppToC, CefPanel,
template<> CefRefPtr<CefPanel> CefCppToCRefCounted<CefPanelCppToC, CefPanel,
cef_panel_t>::UnwrapDerived(CefWrapperType type, cef_panel_t* s) {
if (type == WT_WINDOW) {
return CefWindowCppToC::Unwrap(reinterpret_cast<cef_window_t*>(s));
@ -1105,9 +1105,9 @@ template<> CefRefPtr<CefPanel> CefCppToC<CefPanelCppToC, CefPanel,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefPanelCppToC, CefPanel,
template<> base::AtomicRefCount CefCppToCRefCounted<CefPanelCppToC, CefPanel,
cef_panel_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefPanelCppToC, CefPanel,
template<> CefWrapperType CefCppToCRefCounted<CefPanelCppToC, CefPanel,
cef_panel_t>::kWrapperType = WT_PANEL;

4
libcef_dll/cpptoc/views/panel_cpptoc.h
View File

@ -28,12 +28,12 @@
#include "include/capi/views/cef_layout_capi.h"
#include "include/views/cef_window.h"
#include "include/capi/views/cef_window_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed DLL-side only.
class CefPanelCppToC
: public CefCppToC<CefPanelCppToC, CefPanel, cef_panel_t> {
: public CefCppToCRefCounted<CefPanelCppToC, CefPanel, cef_panel_t> {
public:
CefPanelCppToC();
};

8
libcef_dll/cpptoc/views/panel_delegate_cpptoc.cc
View File

@ -170,7 +170,7 @@ CefPanelDelegateCppToC::CefPanelDelegateCppToC() {
panel_delegate_on_child_view_changed;
}
template<> CefRefPtr<CefPanelDelegate> CefCppToC<CefPanelDelegateCppToC,
template<> CefRefPtr<CefPanelDelegate> CefCppToCRefCounted<CefPanelDelegateCppToC,
CefPanelDelegate, cef_panel_delegate_t>::UnwrapDerived(CefWrapperType type,
cef_panel_delegate_t* s) {
if (type == WT_WINDOW_DELEGATE) {
@ -182,9 +182,9 @@ template<> CefRefPtr<CefPanelDelegate> CefCppToC<CefPanelDelegateCppToC,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefPanelDelegateCppToC,
template<> base::AtomicRefCount CefCppToCRefCounted<CefPanelDelegateCppToC,
CefPanelDelegate, cef_panel_delegate_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefPanelDelegateCppToC, CefPanelDelegate,
cef_panel_delegate_t>::kWrapperType = WT_PANEL_DELEGATE;
template<> CefWrapperType CefCppToCRefCounted<CefPanelDelegateCppToC,
CefPanelDelegate, cef_panel_delegate_t>::kWrapperType = WT_PANEL_DELEGATE;

4
libcef_dll/cpptoc/views/panel_delegate_cpptoc.h
View File

@ -20,12 +20,12 @@
#include "include/views/cef_panel_delegate.h"
#include "include/capi/views/cef_panel_delegate_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed wrapper-side only.
class CefPanelDelegateCppToC
: public CefCppToC<CefPanelDelegateCppToC, CefPanelDelegate,
: public CefCppToCRefCounted<CefPanelDelegateCppToC, CefPanelDelegate,
cef_panel_delegate_t> {
public:
CefPanelDelegateCppToC();

10
libcef_dll/cpptoc/views/scroll_view_cpptoc.cc
View File

@ -1019,7 +1019,7 @@ CefScrollViewCppToC::CefScrollViewCppToC() {
scroll_view_convert_point_from_view;
}
template<> CefRefPtr<CefScrollView> CefCppToC<CefScrollViewCppToC,
template<> CefRefPtr<CefScrollView> CefCppToCRefCounted<CefScrollViewCppToC,
CefScrollView, cef_scroll_view_t>::UnwrapDerived(CefWrapperType type,
cef_scroll_view_t* s) {
NOTREACHED() << "Unexpected class type: " << type;
@ -1027,9 +1027,9 @@ template<> CefRefPtr<CefScrollView> CefCppToC<CefScrollViewCppToC,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefScrollViewCppToC, CefScrollView,
cef_scroll_view_t>::DebugObjCt = 0;
template<> base::AtomicRefCount CefCppToCRefCounted<CefScrollViewCppToC,
CefScrollView, cef_scroll_view_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefScrollViewCppToC, CefScrollView,
cef_scroll_view_t>::kWrapperType = WT_SCROLL_VIEW;
template<> CefWrapperType CefCppToCRefCounted<CefScrollViewCppToC,
CefScrollView, cef_scroll_view_t>::kWrapperType = WT_SCROLL_VIEW;

5
libcef_dll/cpptoc/views/scroll_view_cpptoc.h
View File

@ -20,12 +20,13 @@
#include "include/views/cef_scroll_view.h"
#include "include/capi/views/cef_scroll_view_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed DLL-side only.
class CefScrollViewCppToC
: public CefCppToC<CefScrollViewCppToC, CefScrollView, cef_scroll_view_t> {
: public CefCppToCRefCounted<CefScrollViewCppToC, CefScrollView,
cef_scroll_view_t> {
public:
CefScrollViewCppToC();
};

11
libcef_dll/cpptoc/views/textfield_cpptoc.cc
View File

@ -1398,16 +1398,17 @@ CefTextfieldCppToC::CefTextfieldCppToC() {
GetStruct()->base.convert_point_from_view = textfield_convert_point_from_view;
}
template<> CefRefPtr<CefTextfield> CefCppToC<CefTextfieldCppToC, CefTextfield,
cef_textfield_t>::UnwrapDerived(CefWrapperType type, cef_textfield_t* s) {
template<> CefRefPtr<CefTextfield> CefCppToCRefCounted<CefTextfieldCppToC,
CefTextfield, cef_textfield_t>::UnwrapDerived(CefWrapperType type,
cef_textfield_t* s) {
NOTREACHED() << "Unexpected class type: " << type;
return NULL;
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefTextfieldCppToC, CefTextfield,
cef_textfield_t>::DebugObjCt = 0;
template<> base::AtomicRefCount CefCppToCRefCounted<CefTextfieldCppToC,
CefTextfield, cef_textfield_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefTextfieldCppToC, CefTextfield,
template<> CefWrapperType CefCppToCRefCounted<CefTextfieldCppToC, CefTextfield,
cef_textfield_t>::kWrapperType = WT_TEXTFIELD;

5
libcef_dll/cpptoc/views/textfield_cpptoc.h
View File

@ -20,12 +20,13 @@
#include "include/views/cef_textfield.h"
#include "include/capi/views/cef_textfield_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed DLL-side only.
class CefTextfieldCppToC
: public CefCppToC<CefTextfieldCppToC, CefTextfield, cef_textfield_t> {
: public CefCppToCRefCounted<CefTextfieldCppToC, CefTextfield,
cef_textfield_t> {
public:
CefTextfieldCppToC();
};

6
libcef_dll/cpptoc/views/textfield_delegate_cpptoc.cc
View File

@ -221,7 +221,7 @@ CefTextfieldDelegateCppToC::CefTextfieldDelegateCppToC() {
textfield_delegate_on_child_view_changed;
}
template<> CefRefPtr<CefTextfieldDelegate> CefCppToC<CefTextfieldDelegateCppToC,
template<> CefRefPtr<CefTextfieldDelegate> CefCppToCRefCounted<CefTextfieldDelegateCppToC,
CefTextfieldDelegate, cef_textfield_delegate_t>::UnwrapDerived(
CefWrapperType type, cef_textfield_delegate_t* s) {
NOTREACHED() << "Unexpected class type: " << type;
@ -229,10 +229,10 @@ template<> CefRefPtr<CefTextfieldDelegate> CefCppToC<CefTextfieldDelegateCppToC,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefTextfieldDelegateCppToC,
template<> base::AtomicRefCount CefCppToCRefCounted<CefTextfieldDelegateCppToC,
CefTextfieldDelegate, cef_textfield_delegate_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefTextfieldDelegateCppToC,
template<> CefWrapperType CefCppToCRefCounted<CefTextfieldDelegateCppToC,
CefTextfieldDelegate, cef_textfield_delegate_t>::kWrapperType =
WT_TEXTFIELD_DELEGATE;

6
libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h
View File

@ -22,13 +22,13 @@
#include "include/capi/views/cef_textfield_delegate_capi.h"
#include "include/views/cef_textfield.h"
#include "include/capi/views/cef_textfield_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed wrapper-side only.
class CefTextfieldDelegateCppToC
: public CefCppToC<CefTextfieldDelegateCppToC, CefTextfieldDelegate,
cef_textfield_delegate_t> {
: public CefCppToCRefCounted<CefTextfieldDelegateCppToC,
CefTextfieldDelegate, cef_textfield_delegate_t> {
public:
CefTextfieldDelegateCppToC();
};

6
libcef_dll/cpptoc/views/view_cpptoc.cc
View File

@ -828,7 +828,7 @@ CefViewCppToC::CefViewCppToC() {
GetStruct()->convert_point_from_view = view_convert_point_from_view;
}
template<> CefRefPtr<CefView> CefCppToC<CefViewCppToC, CefView,
template<> CefRefPtr<CefView> CefCppToCRefCounted<CefViewCppToC, CefView,
cef_view_t>::UnwrapDerived(CefWrapperType type, cef_view_t* s) {
if (type == WT_BROWSER_VIEW) {
return CefBrowserViewCppToC::Unwrap(reinterpret_cast<cef_browser_view_t*>(
@ -861,9 +861,9 @@ template<> CefRefPtr<CefView> CefCppToC<CefViewCppToC, CefView,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefViewCppToC, CefView,
template<> base::AtomicRefCount CefCppToCRefCounted<CefViewCppToC, CefView,
cef_view_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefViewCppToC, CefView,
template<> CefWrapperType CefCppToCRefCounted<CefViewCppToC, CefView,
cef_view_t>::kWrapperType = WT_VIEW;

4
libcef_dll/cpptoc/views/view_cpptoc.h
View File

@ -32,12 +32,12 @@
#include "include/capi/views/cef_textfield_capi.h"
#include "include/views/cef_window.h"
#include "include/capi/views/cef_window_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed DLL-side only.
class CefViewCppToC
: public CefCppToC<CefViewCppToC, CefView, cef_view_t> {
: public CefCppToCRefCounted<CefViewCppToC, CefView, cef_view_t> {
public:
CefViewCppToC();
};

8
libcef_dll/cpptoc/views/view_delegate_cpptoc.cc
View File

@ -167,7 +167,7 @@ CefViewDelegateCppToC::CefViewDelegateCppToC() {
GetStruct()->on_child_view_changed = view_delegate_on_child_view_changed;
}
template<> CefRefPtr<CefViewDelegate> CefCppToC<CefViewDelegateCppToC,
template<> CefRefPtr<CefViewDelegate> CefCppToCRefCounted<CefViewDelegateCppToC,
CefViewDelegate, cef_view_delegate_t>::UnwrapDerived(CefWrapperType type,
cef_view_delegate_t* s) {
if (type == WT_BROWSER_VIEW_DELEGATE) {
@ -199,9 +199,9 @@ template<> CefRefPtr<CefViewDelegate> CefCppToC<CefViewDelegateCppToC,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefViewDelegateCppToC,
template<> base::AtomicRefCount CefCppToCRefCounted<CefViewDelegateCppToC,
CefViewDelegate, cef_view_delegate_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefViewDelegateCppToC, CefViewDelegate,
cef_view_delegate_t>::kWrapperType = WT_VIEW_DELEGATE;
template<> CefWrapperType CefCppToCRefCounted<CefViewDelegateCppToC,
CefViewDelegate, cef_view_delegate_t>::kWrapperType = WT_VIEW_DELEGATE;

4
libcef_dll/cpptoc/views/view_delegate_cpptoc.h
View File

@ -22,12 +22,12 @@
#include "include/capi/views/cef_view_delegate_capi.h"
#include "include/views/cef_view.h"
#include "include/capi/views/cef_view_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed wrapper-side only.
class CefViewDelegateCppToC
: public CefCppToC<CefViewDelegateCppToC, CefViewDelegate,
: public CefCppToCRefCounted<CefViewDelegateCppToC, CefViewDelegate,
cef_view_delegate_t> {
public:
CefViewDelegateCppToC();

6
libcef_dll/cpptoc/views/window_cpptoc.cc
View File

@ -1616,16 +1616,16 @@ CefWindowCppToC::CefWindowCppToC() {
window_convert_point_from_view;
}
template<> CefRefPtr<CefWindow> CefCppToC<CefWindowCppToC, CefWindow,
template<> CefRefPtr<CefWindow> CefCppToCRefCounted<CefWindowCppToC, CefWindow,
cef_window_t>::UnwrapDerived(CefWrapperType type, cef_window_t* s) {
NOTREACHED() << "Unexpected class type: " << type;
return NULL;
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefWindowCppToC, CefWindow,
template<> base::AtomicRefCount CefCppToCRefCounted<CefWindowCppToC, CefWindow,
cef_window_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefWindowCppToC, CefWindow,
template<> CefWrapperType CefCppToCRefCounted<CefWindowCppToC, CefWindow,
cef_window_t>::kWrapperType = WT_WINDOW;

4
libcef_dll/cpptoc/views/window_cpptoc.h
View File

@ -20,12 +20,12 @@
#include "include/views/cef_window.h"
#include "include/capi/views/cef_window_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed DLL-side only.
class CefWindowCppToC
: public CefCppToC<CefWindowCppToC, CefWindow, cef_window_t> {
: public CefCppToCRefCounted<CefWindowCppToC, CefWindow, cef_window_t> {
public:
CefWindowCppToC();
};

9
libcef_dll/cpptoc/views/window_delegate_cpptoc.cc
View File

@ -313,7 +313,7 @@ CefWindowDelegateCppToC::CefWindowDelegateCppToC() {
window_delegate_on_child_view_changed;
}
template<> CefRefPtr<CefWindowDelegate> CefCppToC<CefWindowDelegateCppToC,
template<> CefRefPtr<CefWindowDelegate> CefCppToCRefCounted<CefWindowDelegateCppToC,
CefWindowDelegate, cef_window_delegate_t>::UnwrapDerived(
CefWrapperType type, cef_window_delegate_t* s) {
NOTREACHED() << "Unexpected class type: " << type;
@ -321,9 +321,10 @@ template<> CefRefPtr<CefWindowDelegate> CefCppToC<CefWindowDelegateCppToC,
}
#if DCHECK_IS_ON()
template<> base::AtomicRefCount CefCppToC<CefWindowDelegateCppToC,
template<> base::AtomicRefCount CefCppToCRefCounted<CefWindowDelegateCppToC,
CefWindowDelegate, cef_window_delegate_t>::DebugObjCt = 0;
#endif
template<> CefWrapperType CefCppToC<CefWindowDelegateCppToC, CefWindowDelegate,
cef_window_delegate_t>::kWrapperType = WT_WINDOW_DELEGATE;
template<> CefWrapperType CefCppToCRefCounted<CefWindowDelegateCppToC,
CefWindowDelegate, cef_window_delegate_t>::kWrapperType =
WT_WINDOW_DELEGATE;

4
libcef_dll/cpptoc/views/window_delegate_cpptoc.h
View File

@ -22,12 +22,12 @@
#include "include/capi/views/cef_window_delegate_capi.h"
#include "include/views/cef_window.h"
#include "include/capi/views/cef_window_capi.h"
#include "libcef_dll/cpptoc/cpptoc.h"
#include "libcef_dll/cpptoc/cpptoc_ref_counted.h"
// Wrap a C++ class with a C structure.
// This class may be instantiated and accessed wrapper-side only.
class CefWindowDelegateCppToC
: public CefCppToC<CefWindowDelegateCppToC, CefWindowDelegate,
: public CefCppToCRefCounted<CefWindowDelegateCppToC, CefWindowDelegate,
cef_window_delegate_t> {
public:
CefWindowDelegateCppToC();