eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-instate the knockout renderers after a nested flush(). Make so knockout rendering is always used. 

svn path=/trunk/netsurf/; revision=2693
This commit is contained in:
Richard Wilson 2006-07-02 17:23:49 +00:00
parent 0f36a3e6a5
commit dbe40cffb3
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desktop/knockout.c
View File

@ -16,7 +16,7 @@
#include "netsurf/image/bitmap.h"
#include "netsurf/utils/log.h"
#define NDEBUG
//#define NDEBUG
#define KNOCKOUT_ENTRIES 3072 /* 40 bytes each */
#define KNOCKOUT_BOXES 768 /* 28 bytes each */
@ -405,6 +405,10 @@ bool knockout_plot_flush(void)
knockout_box_cur = 0;
knockout_polygon_cur = 0;
knockout_list = NULL;
/* re-instate knockout plotters if we are still active */
if (nested_depth > 0)
plot = knockout_plotters;
return success;
}
@ -440,7 +444,7 @@ void knockout_calculate(int x0, int y0, int x1, int y1, struct knockout_box *own
if (owner) {
/* first valid element: update child reference */
owner->child = parent->next;
/* have we deleted all children node? */
/* have we deleted all child nodes? */
if (!owner->child)
owner->deleted = true;
} else {

2
desktop/options.c
View File

@ -102,7 +102,6 @@ int option_max_fetchers_per_host = 5;
*/
int option_max_cached_fetch_handles = 6;
/** Whether to use knockout rendering */
bool option_knockout_rendering = false;
EXTRA_OPTION_DEFINE
@ -144,7 +143,6 @@ struct {
OPTION_INTEGER, &option_max_fetchers_per_host },
{ "max_cached_fetch_handles",
OPTION_INTEGER, &option_max_cached_fetch_handles },
{ "knockout_rendering", OPTION_BOOL, &option_knockout_rendering },
EXTRA_OPTION_TABLE
};

1
desktop/options.h
View File

@ -55,7 +55,6 @@ extern char *option_ca_bundle;
extern char *option_cookie_file;
extern char *option_cookie_jar;
extern char *option_homepage_url;
extern bool option_knockout_rendering;
/* Fetcher configuration. */
extern int option_max_fetchers;

5
riscos/window.c
View File

@ -2031,11 +2031,6 @@ bool ro_gui_window_keypress(struct gui_window *g, int key, bool toolbar)
return ro_gui_menu_handle_action(g->window,
BROWSER_SCALE_VIEW, false);
case wimp_KEY_CONTROL + wimp_KEY_F11: /* Toggle knockout rendering */
option_knockout_rendering = !option_knockout_rendering;
gui_window_redraw_window(g);
return true;
case wimp_KEY_SHIFT + wimp_KEY_F11: /* Toggle display of box outlines. */
html_redraw_debug = !html_redraw_debug;
gui_window_redraw_window(g);