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/renderer/v8_impl.cc
View File

@@ -353,11 +353,11 @@ class V8TrackObject : public CefTrackNode {
return handler_;
}
inline void SetUserData(CefRefPtr<CefBase> user_data) {
inline void SetUserData(CefRefPtr<CefBaseRefCounted> user_data) {
user_data_ = user_data;
}
inline CefRefPtr<CefBase> GetUserData() {
inline CefRefPtr<CefBaseRefCounted> GetUserData() {
return user_data_;
}
@@ -383,7 +383,7 @@ class V8TrackObject : public CefTrackNode {
CefRefPtr<CefV8Accessor> accessor_;
CefRefPtr<CefV8Interceptor> interceptor_;
CefRefPtr<CefV8Handler> handler_;
CefRefPtr<CefBase> user_data_;
CefRefPtr<CefBaseRefCounted> user_data_;
int external_memory_;
};
@@ -2094,7 +2094,7 @@ bool CefV8ValueImpl::GetKeys(std::vector<CefString>& keys) {
return true;
}
bool CefV8ValueImpl::SetUserData(CefRefPtr<CefBase> user_data) {
bool CefV8ValueImpl::SetUserData(CefRefPtr<CefBaseRefCounted> user_data) {
CEF_V8_REQUIRE_OBJECT_RETURN(false);
v8::Isolate* isolate = handle_->isolate();
@@ -2118,7 +2118,7 @@ bool CefV8ValueImpl::SetUserData(CefRefPtr<CefBase> user_data) {
return false;
}
CefRefPtr<CefBase> CefV8ValueImpl::GetUserData() {
CefRefPtr<CefBaseRefCounted> CefV8ValueImpl::GetUserData() {
CEF_V8_REQUIRE_OBJECT_RETURN(NULL);
v8::Isolate* isolate = handle_->isolate();

4
libcef/renderer/v8_impl.h
View File

@@ -264,8 +264,8 @@ class CefV8ValueImpl : public CefV8Value {
bool SetValue(const CefString& key, AccessControl settings,
PropertyAttribute attribute) override;
bool GetKeys(std::vector<CefString>& keys) override;
bool SetUserData(CefRefPtr<CefBase> user_data) override;
CefRefPtr<CefBase> GetUserData() override;
bool SetUserData(CefRefPtr<CefBaseRefCounted> user_data) override;
CefRefPtr<CefBaseRefCounted> GetUserData() override;
int GetExternallyAllocatedMemory() override;
int AdjustExternallyAllocatedMemory(int change_in_bytes) override;
int GetArrayLength() override;