From bc727dda1c4078a8832e594acf0d02dbc139d2b6 Mon Sep 17 00:00:00 2001 From: James Bursa Date: Wed, 11 Aug 2004 19:02:32 +0000 Subject: [project @ 2004-08-11 19:02:32 by bursa] Start work on removing instances and making content types non-shareable. Clean up some #includes. svn path=/import/netsurf/; revision=1211 --- content/content.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'content/content.h') diff --git a/content/content.h b/content/content.h index 949b00767..c3116c5c5 100644 --- a/content/content.h +++ b/content/content.h @@ -35,6 +35,7 @@ * content_create -> TYPE_UNKNOWN [style=bold]; * TYPE_UNKNOWN -> content_set_type [style=bold]; * content_set_type -> LOADING [label=MSG_LOADING, style=bold]; + * content_set_type -> LOADING [label="MSG_NEWPTR\nMSG_LOADING",style=bold]; * content_set_type -> ERROR [label=MSG_ERROR]; * LOADING -> content_process_data [style=bold]; * content_process_data -> LOADING [style=bold]; @@ -95,8 +96,6 @@ #include "netsurf/utils/config.h" #include "netsurf/content/content_type.h" #include "netsurf/css/css.h" -#include "netsurf/render/box.h" -#include "netsurf/render/font.h" #include "netsurf/render/html.h" #ifdef WITH_JPEG #include "netsurf/riscos/jpeg.h" @@ -121,7 +120,11 @@ #endif +struct box; +struct browser_window; +struct content; struct fetch; +struct object_params; /** Used in callbacks to indicate what has occurred. */ @@ -134,6 +137,7 @@ typedef enum { CONTENT_MSG_REDIRECT, /**< replacement URL */ CONTENT_MSG_REFORMAT, /**< content_reformat done */ CONTENT_MSG_REDRAW, /**< needs redraw (eg. new animation frame) */ + CONTENT_MSG_NEWPTR, /**< address of structure has changed */ #ifdef WITH_AUTH CONTENT_MSG_AUTH /**< authentication required */ #endif @@ -244,6 +248,17 @@ struct content { } error_list[40]; unsigned int error_count; /**< Number of valid error entries. */ + /** Browser window that this content is in, valid only if + * handler_map[type].no_share and 1 user, 0 if not visible. */ + struct browser_window *owning_bw; + /** Box window that this content is in, valid only if + * handler_map[type].no_share and 1 user, 0 if not in an HTML tree. */ + struct box *owning_box; + /** Parameters of or , valid only if + * handler_map[type].no_share and 1 user, 0 if not in an or + * . */ + struct object_params *params; + struct content *prev; /**< Previous in global content list. */ struct content *next; /**< Next in global content list. */ }; @@ -253,9 +268,6 @@ extern const char *content_type_name[]; extern const char *content_status_name[]; -struct browser_window; - - content_type content_lookup(const char *mime_type); struct content * content_create(const char *url); struct content * content_get(const char *url); -- cgit v1.2.3