forked from pool/nodejs-electron
81 lines
2.6 KiB
Diff
81 lines
2.6 KiB
Diff
|
|
--- src/content/browser/web_contents/web_contents_impl.h.orig 2022-10-12 18:11:24.194407371 +0200
|
||
|
|
+++ src/content/browser/web_contents/web_contents_impl.h 2022-10-15 11:00:48.215200372 +0200
|
||
|
|
@@ -103,9 +103,7 @@
|
||
|
|
} // namespace service_manager
|
||
|
|
|
||
|
|
namespace content {
|
||
|
|
-namespace {
|
||
|
|
class JavaScriptDialogDismissNotifier;
|
||
|
|
-}
|
||
|
|
enum class PictureInPictureResult;
|
||
|
|
class BeforeUnloadBlockingDelegate; // content_browser_test_utils_internal.h
|
||
|
|
class BrowserPluginEmbedder;
|
||
|
|
--- src/content/browser/web_contents/web_contents_impl.cc.orig 2022-10-12 18:11:52.102315425 +0200
|
||
|
|
+++ src/content/browser/web_contents/web_contents_impl.cc 2022-10-15 14:52:19.403874437 +0200
|
||
|
|
@@ -284,32 +284,6 @@
|
||
|
|
CloseCallback callback_;
|
||
|
|
};
|
||
|
|
|
||
|
|
-// This is a small helper class created while a JavaScript dialog is showing
|
||
|
|
-// and destroyed when it's dismissed. Clients can register callbacks to receive
|
||
|
|
-// a notification when the dialog is dismissed.
|
||
|
|
-class JavaScriptDialogDismissNotifier {
|
||
|
|
- public:
|
||
|
|
- JavaScriptDialogDismissNotifier() = default;
|
||
|
|
-
|
||
|
|
- JavaScriptDialogDismissNotifier(const JavaScriptDialogDismissNotifier&) =
|
||
|
|
- delete;
|
||
|
|
- JavaScriptDialogDismissNotifier& operator=(
|
||
|
|
- const JavaScriptDialogDismissNotifier&) = delete;
|
||
|
|
-
|
||
|
|
- ~JavaScriptDialogDismissNotifier() {
|
||
|
|
- for (auto& callback : callbacks_) {
|
||
|
|
- std::move(callback).Run();
|
||
|
|
- }
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- void NotifyOnDismiss(base::OnceClosure callback) {
|
||
|
|
- callbacks_.push_back(std::move(callback));
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- private:
|
||
|
|
- std::vector<base::OnceClosure> callbacks_;
|
||
|
|
-};
|
||
|
|
-
|
||
|
|
bool FrameCompareDepth(RenderFrameHostImpl* a, RenderFrameHostImpl* b) {
|
||
|
|
return a->GetFrameDepth() < b->GetFrameDepth();
|
||
|
|
}
|
||
|
|
@@ -551,6 +525,32 @@
|
||
|
|
|
||
|
|
} // namespace
|
||
|
|
|
||
|
|
+// This is a small helper class created while a JavaScript dialog is showing
|
||
|
|
+// and destroyed when it's dismissed. Clients can register callbacks to receive
|
||
|
|
+// a notification when the dialog is dismissed.
|
||
|
|
+class JavaScriptDialogDismissNotifier {
|
||
|
|
+ public:
|
||
|
|
+ JavaScriptDialogDismissNotifier() = default;
|
||
|
|
+
|
||
|
|
+ JavaScriptDialogDismissNotifier(const JavaScriptDialogDismissNotifier&) =
|
||
|
|
+ delete;
|
||
|
|
+ JavaScriptDialogDismissNotifier& operator=(
|
||
|
|
+ const JavaScriptDialogDismissNotifier&) = delete;
|
||
|
|
+
|
||
|
|
+ ~JavaScriptDialogDismissNotifier() {
|
||
|
|
+ for (auto& callback : callbacks_) {
|
||
|
|
+ std::move(callback).Run();
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ void NotifyOnDismiss(base::OnceClosure callback) {
|
||
|
|
+ callbacks_.push_back(std::move(callback));
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ private:
|
||
|
|
+ std::vector<base::OnceClosure> callbacks_;
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
CreatedWindow::CreatedWindow() = default;
|
||
|
|
CreatedWindow::CreatedWindow(std::unique_ptr<WebContentsImpl> contents,
|
||
|
|
GURL target_url)
|