Remove frame flattening toggle

This has been deprecated since 2.38.

diff --git a/config.def.h b/config.def.h
index 93cfeebe034300dfb77a6a6c0a587b6becf58870..73a4d39dcd2c7cf10199c24594831919daf0883a 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -27,7 +27,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 },     },
@@ -173,7 +172,6 @@ static Key keys[] = {
        { MODKEY|GDK_SHIFT_MASK, GDK_KEY_o,      toggleinspector, { 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 fa18bc82f3610e73dcb751a9ae653a46bc57fd0e..23117b1d1e032cee925d1ae63290ca0b91a765a4 100644 (file)
--- a/surf.1
+++ b/surf.1
@@ -261,9 +261,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 2780072001ad4f5e5e5ab7223720ea854b72333d..34ac455dabc2a79c45c88d11b8bb20d67a06de71 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -64,7 +64,6 @@ typedef enum {
        Ephemeral,
        FileURLsCrossAccess,
        FontSize,
-       FrameFlattening,
        Geolocation,
        HideBackground,
        Inspector,
@@ -283,7 +282,6 @@ static ParamName loadcommitted[] = {
        DarkMode,
        DefaultCharset,
        FontSize,
-       FrameFlattening,
        Geolocation,
        HideBackground,
        Inspector,
@@ -679,7 +677,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';
 }
@@ -802,9 +799,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;
@@ -1128,7 +1122,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,