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

Apply raw_ptr rewrite to libcef (see #3239)

Browse Source
This commit is contained in:
Marshall Greenblatt
2024-05-11 11:48:38 -04:00
parent 2156c9fd5d
commit 0170f431a0
109 changed files with 290 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libcef/browser/devtools/devtools_controller.h
View File

@@ -8,6 +8,7 @@
#include <memory>
#include "base/containers/span.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
@@ -68,7 +69,7 @@ class CefDevToolsController : public content::DevToolsAgentHostClient {
bool EnsureAgentHost();
content::WebContents* const inspected_contents_;
const raw_ptr<content::WebContents> inspected_contents_;
scoped_refptr<content::DevToolsAgentHost> agent_host_;
int next_message_id_ = 1;

15
libcef/browser/devtools/devtools_protocol_manager.cc
View File

@@ -4,6 +4,7 @@
#include "cef/libcef/browser/devtools/devtools_protocol_manager.h"
#include "base/memory/raw_ptr.h"
#include "cef/libcef/browser/browser_host_base.h"
#include "cef/libcef/browser/devtools/devtools_controller.h"
#include "cef/libcef/browser/thread_util.h"
@@ -51,7 +52,7 @@ class CefDevToolsRegistrationImpl : public CefRegistration,
// CefDevToolsController::Observer methods:
bool OnDevToolsMessage(const std::string_view& message) override {
CEF_REQUIRE_UIT();
return observer_->OnDevToolsMessage(browser_, message.data(),
return observer_->OnDevToolsMessage(browser_.get(), message.data(),
message.size());
}
@@ -59,25 +60,25 @@ class CefDevToolsRegistrationImpl : public CefRegistration,
bool success,
const std::string_view& result) override {
CEF_REQUIRE_UIT();
observer_->OnDevToolsMethodResult(browser_, message_id, success,
observer_->OnDevToolsMethodResult(browser_.get(), message_id, success,
result.data(), result.size());
}
void OnDevToolsEvent(const std::string_view& method,
const std::string_view& params) override {
CEF_REQUIRE_UIT();
observer_->OnDevToolsEvent(browser_, std::string(method), params.data(),
params.size());
observer_->OnDevToolsEvent(browser_.get(), std::string(method),
params.data(), params.size());
}
void OnDevToolsAgentAttached() override {
CEF_REQUIRE_UIT();
observer_->OnDevToolsAgentAttached(browser_);
observer_->OnDevToolsAgentAttached(browser_.get());
}
void OnDevToolsAgentDetached() override {
CEF_REQUIRE_UIT();
observer_->OnDevToolsAgentDetached(browser_);
observer_->OnDevToolsAgentDetached(browser_.get());
}
void OnDevToolsControllerDestroyed() override {
@@ -88,7 +89,7 @@ class CefDevToolsRegistrationImpl : public CefRegistration,
CefRefPtr<CefDevToolsMessageObserver> observer_;
CefBrowserHostBase* browser_ = nullptr;
raw_ptr<CefBrowserHostBase> browser_ = nullptr;
base::WeakPtr<CefDevToolsController> controller_;
IMPLEMENT_REFCOUNTING_DELETE_ON_UIT(CefDevToolsRegistrationImpl);

3
libcef/browser/devtools/devtools_protocol_manager.h
View File

@@ -8,6 +8,7 @@
#include <memory>
#include "base/memory/raw_ptr.h"
#include "cef/include/cef_browser.h"
class CefBrowserHostBase;
@@ -48,7 +49,7 @@ class CefDevToolsProtocolManager {
private:
bool EnsureController();
CefBrowserHostBase* const inspected_browser_;
const raw_ptr<CefBrowserHostBase> inspected_browser_;
std::unique_ptr<CefDevToolsController> devtools_controller_;
};