From a94752f9ee13f450317928f28f6a851a6e65aae3 Mon Sep 17 00:00:00 2001
From: Quentin Rameau <quinq@fifth.space>
Date: Sun, 17 Mar 2024 06:40:28 +0100
Subject: Remove frame flattening toggle

This has been deprecated since 2.38.
---
 config.def.h | 2 --
 surf.1       | 3 ---
 surf.c       | 7 -------
 3 files changed, 12 deletions(-)

diff --git a/config.def.h b/config.def.h
index 001e142..97a573d 100644
--- a/config.def.h
+++ b/config.def.h
@@ -33,7 +33,6 @@ static Parameter defconfig[ParameterLast] = {
 	[Ephemeral]           =       { { .i = 0 },     },
 	[FileURLsCrossAccess] =       { { .i = 0 },     },
 	[FontSize]            =       { { .i = 12 },    },
-	[FrameFlattening]     =       { { .i = 0 },     },
 	[Geolocation]         =       { { .i = 0 },     },
 	[HideBackground]      =       { { .i = 0 },     },
 	[Inspector]           =       { { .i = 0 },     },
@@ -194,7 +193,6 @@ static Key keys[] = {
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_e,      toggletitle,        { 0 } },
 
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_c,      toggle,     { .i = CaretBrowsing } },
-	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_f,      toggle,     { .i = FrameFlattening } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_g,      toggle,     { .i = Geolocation } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_s,      toggle,     { .i = JavaScript } },
 	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_i,      toggle,     { .i = LoadImages } },
diff --git a/surf.1 b/surf.1
index b362d23..6d52dd6 100644
--- a/surf.1
+++ b/surf.1
@@ -268,9 +268,6 @@ scripts
 .B m M
 styles
 .TP
-.B f F
-frame flattening
-.TP
 .B x X
 custom certificates
 .TP
diff --git a/surf.c b/surf.c
index 28331d5..82da2f4 100644
--- a/surf.c
+++ b/surf.c
@@ -64,7 +64,6 @@ typedef enum {
 	Ephemeral,
 	FileURLsCrossAccess,
 	FontSize,
-	FrameFlattening,
 	Geolocation,
 	HideBackground,
 	Inspector,
@@ -286,7 +285,6 @@ static ParamName loadcommitted[] = {
 	DarkMode,
 	DefaultCharset,
 	FontSize,
-	FrameFlattening,
 	Geolocation,
 	HideBackground,
 	Inspector,
@@ -705,7 +703,6 @@ gettogglestats(Client *c)
 	togglestats[4] = curconfig[LoadImages].val.i ?      'I' : 'i';
 	togglestats[5] = curconfig[JavaScript].val.i ?      'S' : 's';
 	togglestats[6] = curconfig[Style].val.i ?           'M' : 'm';
-	togglestats[7] = curconfig[FrameFlattening].val.i ? 'F' : 'f';
 	togglestats[8] = curconfig[Certificate].val.i ?     'X' : 'x';
 	togglestats[9] = curconfig[StrictTLS].val.i ?       'T' : 't';
 }
@@ -828,9 +825,6 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a)
 	case FontSize:
 		webkit_settings_set_default_font_size(c->settings, a->i);
 		return; /* do not update */
-	case FrameFlattening:
-		webkit_settings_set_enable_frame_flattening(c->settings, a->i);
-		break;
 	case Geolocation:
 		refresh = 0;
 		break;
@@ -1159,7 +1153,6 @@ newview(Client *c, WebKitWebView *rv)
 		   "enable-caret-browsing", curconfig[CaretBrowsing].val.i,
 		   "enable-developer-extras", curconfig[Inspector].val.i,
 		   "enable-dns-prefetching", curconfig[DNSPrefetch].val.i,
-		   "enable-frame-flattening", curconfig[FrameFlattening].val.i,
 		   "enable-html5-database", curconfig[DiskCache].val.i,
 		   "enable-html5-local-storage", curconfig[DiskCache].val.i,
 		   "enable-java", curconfig[Java].val.i,
-- 
cgit v1.2.3