Skip to content

Commit a779efe

Browse files
authored
browser(webkit): always dispose persistent context before exiting (#649)
1 parent 9e0cf72 commit a779efe

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

browser_patches/webkit/BUILD_NUMBER

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1113
1+
1114

browser_patches/webkit/patches/bootstrap.diff

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11546,7 +11546,7 @@ index 1570d65effb5d601ee3c44a2a7461436f4691c2c..456f96cf589320efa70a76f76e230b67
1154611546

1154711547
typedef struct _BrowserWindow BrowserWindow;
1154811548
diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c
11549-
index 4c5147dcd38a53e2feaeaae0fce38f92dc60eba6..19a6d2cd9605a83b5233604be9d371f61c8529dd 100644
11549+
index 4c5147dcd38a53e2feaeaae0fce38f92dc60eba6..4b1cab0c187352688740c7cca79483fa256aa7fe 100644
1155011550
--- a/Tools/MiniBrowser/gtk/main.c
1155111551
+++ b/Tools/MiniBrowser/gtk/main.c
1155211552
@@ -53,6 +53,9 @@ static const char *cookiesFile;
@@ -11630,6 +11630,16 @@ index 4c5147dcd38a53e2feaeaae0fce38f92dc60eba6..19a6d2cd9605a83b5233604be9d371f6
1163011630
if (cookiesPolicy) {
1163111631
WebKitCookieManager *cookieManager = webkit_web_context_get_cookie_manager(webContext);
1163211632
GEnumClass *enumClass = g_type_class_ref(WEBKIT_TYPE_COOKIE_ACCEPT_POLICY);
11633+
@@ -648,8 +696,7 @@ int main(int argc, char *argv[])
11634+
11635+
gtk_main();
11636+
11637+
- if (privateMode)
11638+
- g_object_unref(webContext);
11639+
+ g_object_unref(webContext);
11640+
11641+
return 0;
11642+
}
1163311643
diff --git a/Tools/MiniBrowser/win/BrowserWindow.h b/Tools/MiniBrowser/win/BrowserWindow.h
1163411644
index 564dd6c29b950a213d83a397cf5edc18af170f29..9d772f310fb5fc13b360b45790ae5c01fa17935b 100644
1163511645
--- a/Tools/MiniBrowser/win/BrowserWindow.h
@@ -12207,7 +12217,7 @@ index 245f319abf2595e154d03e1ee8b3250d7f46aafd..9cae87b23deade7c163f34aade2b2aed
1220712217
${WPEBACKEND_FDO_INCLUDE_DIRS}
1220812218
)
1220912219
diff --git a/Tools/MiniBrowser/wpe/main.cpp b/Tools/MiniBrowser/wpe/main.cpp
12210-
index 2d183d394123bd84545dc51f53eb9be796fb8873..05df1b0713cd6c7cf22d8f3a298d86364fdbc5e6 100644
12220+
index 2d183d394123bd84545dc51f53eb9be796fb8873..355c94aff2b99de7e9ab29d2d39986df3ab700cc 100644
1221112221
--- a/Tools/MiniBrowser/wpe/main.cpp
1221212222
+++ b/Tools/MiniBrowser/wpe/main.cpp
1221312223
@@ -25,7 +25,7 @@
@@ -12379,6 +12389,16 @@ index 2d183d394123bd84545dc51f53eb9be796fb8873..05df1b0713cd6c7cf22d8f3a298d8636
1237912389
webkit_web_view_load_uri(webView, "about:blank");
1238012390
else
1238112391
webkit_web_view_load_uri(webView, "https://wpewebkit.org");
12392+
@@ -326,8 +406,7 @@ int main(int argc, char *argv[])
12393+
g_main_loop_run(loop);
12394+
12395+
g_object_unref(webView);
12396+
- if (privateMode || automationMode)
12397+
- g_object_unref(webContext);
12398+
+ g_object_unref(webContext);
12399+
g_main_loop_unref(loop);
12400+
12401+
return 0;
1238212402
diff --git a/Tools/Playwright/Configurations/Base.xcconfig b/Tools/Playwright/Configurations/Base.xcconfig
1238312403
new file mode 100644
1238412404
index 0000000000000000000000000000000000000000..fc61d5227c8608488514cbd92a28dc7c1c2efaf4

0 commit comments

Comments
 (0)