mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: dangling_raw_ptr warning in electron_api_web_contents (#38403)

Browse source 
fix: dangling_raw_ptr warning in electron_api_web_contents
This commit is contained in:
Charles Kerr 2023-05-23 20:52:07 -05:00 • committed by GitHub
parent 30e992dec4
commit b6c80ba646
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
shell/browser/api/electron_api_web_contents.h
View file

@ -773,9 +773,6 @@ class WebContents : public ExclusiveAccessContext,
// Whether the guest view has been attached. // Whether the guest view has been attached.
bool attached_ = false; bool attached_ = false;
// The zoom controller for this webContents.
raw_ptr<WebContentsZoomController> zoom_controller_ = nullptr;
// The type of current WebContents. // The type of current WebContents.
Type type_ = Type::kBrowserWindow; Type type_ = Type::kBrowserWindow;
@ -820,6 +817,11 @@ class WebContents : public ExclusiveAccessContext,
// destroyed before dialog_manager_, otherwise a crash would happen. // destroyed before dialog_manager_, otherwise a crash would happen.
std::unique_ptr<InspectableWebContents> inspectable_web_contents_; std::unique_ptr<InspectableWebContents> inspectable_web_contents_;
// The zoom controller for this webContents.
// Note: owned by inspectable_web_contents_, so declare this *after*
// that field to ensure the dtor destroys them in the right order.
raw_ptr<WebContentsZoomController> zoom_controller_ = nullptr;
// Maps url to file path, used by the file requests sent from devtools. // Maps url to file path, used by the file requests sent from devtools.
typedef std::map<std::string, base::FilePath> PathsMap; typedef std::map<std::string, base::FilePath> PathsMap;
PathsMap saved_files_; PathsMap saved_files_;