53aaeb7a16
Closes #21666. This PR is fixing crashes caused by referencing and attempting to modify previously destroyed views. Before, when a view was destroyed and then the contents were referenced for modification, the system would crash as undefined memory was accessed. This fix explicitly makes the pointer to the destroyed view's contents null, so that this will not happen.
38 lines
1 KiB
C++
38 lines
1 KiB
C++
// Copyright (c) 2017 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include <vector>
|
|
|
|
#include "shell/browser/native_browser_view.h"
|
|
|
|
#include "shell/browser/api/electron_api_web_contents.h"
|
|
#include "shell/browser/ui/inspectable_web_contents.h"
|
|
|
|
namespace electron {
|
|
|
|
NativeBrowserView::NativeBrowserView(
|
|
InspectableWebContents* inspectable_web_contents)
|
|
: inspectable_web_contents_(inspectable_web_contents) {
|
|
Observe(inspectable_web_contents_->GetWebContents());
|
|
}
|
|
|
|
NativeBrowserView::~NativeBrowserView() = default;
|
|
|
|
InspectableWebContentsView* NativeBrowserView::GetInspectableWebContentsView() {
|
|
if (!inspectable_web_contents_)
|
|
return nullptr;
|
|
return inspectable_web_contents_->GetView();
|
|
}
|
|
|
|
content::WebContents* NativeBrowserView::GetWebContents() {
|
|
if (!inspectable_web_contents_)
|
|
return nullptr;
|
|
return inspectable_web_contents_->GetWebContents();
|
|
}
|
|
|
|
void NativeBrowserView::WebContentsDestroyed() {
|
|
inspectable_web_contents_ = nullptr;
|
|
}
|
|
|
|
} // namespace electron
|