mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant parameter from content_open API 

svn path=/trunk/netsurf/; revision=11964
This commit is contained in:
John Mark Bell 2011-03-10 23:13:03 +00:00
parent 8f3ed71cba
commit 1edcef6141
8 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
amiga/plugin.c
View File

@ -137,12 +137,11 @@ bool plugin_redraw(struct content *c, int x, int y,
* \param bw browser window containing the content * \param bw browser window containing the content
* \param page content of type CONTENT_HTML containing c, or 0 if not an * \param page content of type CONTENT_HTML containing c, or 0 if not an
* object within a page * object within a page
* \param index index in page->data.html.object, or 0 if not an object
* \param box box containing c, or 0 if not an object * \param box box containing c, or 0 if not an object
* \param params object parameters, or 0 if not an object * \param params object parameters, or 0 if not an object
*/ */
void plugin_open(struct content *c, struct browser_window *bw, void plugin_open(struct content *c, struct browser_window *bw,
struct content *page, unsigned int index, struct box *box, struct content *page, struct box *box,
struct object_params *params) struct object_params *params)
{ {
LOG(("plugin_open")); LOG(("plugin_open"));

7
content/content.c
View File

@ -295,7 +295,7 @@ struct handler_entry {
float scale, colour background_colour, float scale, colour background_colour,
bool repeat_x, bool repeat_y); bool repeat_x, bool repeat_y);
void (*open)(struct content *c, struct browser_window *bw, void (*open)(struct content *c, struct browser_window *bw,
struct content *page, unsigned int index, struct content *page,
struct box *box, struct box *box,
struct object_params *params); struct object_params *params);
void (*close)(struct content *c); void (*close)(struct content *c);
@ -1129,7 +1129,6 @@ void content_broadcast(struct content *c, content_msg msg,
* \param bw browser window containing the content * \param bw browser window containing the content
* \param page content of type CONTENT_HTML containing c, or 0 if not an * \param page content of type CONTENT_HTML containing c, or 0 if not an
* object within a page * object within a page
* \param index index in page->data.html.object, or 0 if not an object
* \param box box containing c, or 0 if not an object * \param box box containing c, or 0 if not an object
* \param params object parameters, or 0 if not an object * \param params object parameters, or 0 if not an object
* *
@ -1137,7 +1136,7 @@ void content_broadcast(struct content *c, content_msg msg,
*/ */
void content_open(hlcache_handle *h, struct browser_window *bw, void content_open(hlcache_handle *h, struct browser_window *bw,
struct content *page, unsigned int index, struct box *box, struct content *page, struct box *box,
struct object_params *params) struct object_params *params)
{ {
struct content *c = hlcache_handle_get_content(h); struct content *c = hlcache_handle_get_content(h);
@ -1145,7 +1144,7 @@ void content_open(hlcache_handle *h, struct browser_window *bw,
assert(c->type < CONTENT_UNKNOWN); assert(c->type < CONTENT_UNKNOWN);
LOG(("content %p %s", c, llcache_handle_get_url(c->llcache))); LOG(("content %p %s", c, llcache_handle_get_url(c->llcache)));
if (handler_map[c->type].open) if (handler_map[c->type].open)
handler_map[c->type].open(c, bw, page, index, box, params); handler_map[c->type].open(c, bw, page, box, params);
} }

2
content/content.h
View File

@ -132,7 +132,7 @@ bool content_redraw_tiled(struct hlcache_handle *h, int x, int y,
float scale, colour background_colour, float scale, colour background_colour,
bool repeat_x, bool repeat_y); bool repeat_x, bool repeat_y);
void content_open(struct hlcache_handle *h, struct browser_window *bw, void content_open(struct hlcache_handle *h, struct browser_window *bw,
struct content *page, unsigned int index, struct box *box, struct content *page, struct box *box,
struct object_params *params); struct object_params *params);
void content_close(struct hlcache_handle *h); void content_close(struct hlcache_handle *h);

2
desktop/browser.c
View File

@ -546,7 +546,7 @@ nserror browser_window_callback(hlcache_handle *c,
/* new content; set scroll_to_top */ /* new content; set scroll_to_top */
browser_window_update(bw, true); browser_window_update(bw, true);
content_open(c, bw, 0, 0, 0, 0); content_open(c, bw, 0, 0, 0);
browser_window_set_status(bw, content_get_status_message(c)); browser_window_set_status(bw, content_get_status_message(c));
/* history */ /* history */

2
desktop/plugin.h
View File

@ -50,7 +50,7 @@ bool plugin_redraw(struct content *c, int x, int y,
int width, int height, const struct rect *clip, int width, int height, const struct rect *clip,
float scale, colour background_colour); float scale, colour background_colour);
void plugin_open(struct content *c, struct browser_window *bw, void plugin_open(struct content *c, struct browser_window *bw,
struct content *page, unsigned int index, struct box *box, struct content *page, struct box *box,
struct object_params *params); struct object_params *params);
void plugin_close(struct content *c); void plugin_close(struct content *c);
bool plugin_clone(const struct content *old, struct content *new_content); bool plugin_clone(const struct content *old, struct content *new_content);

6
render/html.c
View File

@ -1383,7 +1383,7 @@ nserror html_object_callback(hlcache_handle *object,
if (c->data.html.bw != NULL) if (c->data.html.bw != NULL)
content_open(object, content_open(object,
c->data.html.bw, c, c->data.html.bw, c,
0, box, box,
box->object_params); box->object_params);
break; break;
} }
@ -1874,7 +1874,7 @@ void html_set_status(struct content *c, const char *extra)
*/ */
void html_open(struct content *c, struct browser_window *bw, void html_open(struct content *c, struct browser_window *bw,
struct content *page, unsigned int index, struct box *box, struct content *page, struct box *box,
struct object_params *params) struct object_params *params)
{ {
struct content_html_object *object, *next; struct content_html_object *object, *next;
@ -1893,7 +1893,7 @@ void html_open(struct content *c, struct browser_window *bw,
continue; continue;
content_open(object->content, content_open(object->content,
bw, c, 0, bw, c,
object->box, object->box,
object->box->object_params); object->box->object_params);
} }

2
render/html.h
View File

@ -201,7 +201,7 @@ bool html_fetch_object(struct content *c, const char *url, struct box *box,
bool background); bool background);
void html_stop(struct content *c); void html_stop(struct content *c);
void html_open(struct content *c, struct browser_window *bw, void html_open(struct content *c, struct browser_window *bw,
struct content *page, unsigned int index, struct box *box, struct content *page, struct box *box,
struct object_params *params); struct object_params *params);
void html_close(struct content *c); void html_close(struct content *c);
void html_set_status(struct content *c, const char *extra); void html_set_status(struct content *c, const char *extra);

3
riscos/plugin.c
View File

@ -264,12 +264,11 @@ bool plugin_redraw(struct content *c, int x, int y,
* \param bw browser window containing the content * \param bw browser window containing the content
* \param page content of type CONTENT_HTML containing c, or 0 if not an * \param page content of type CONTENT_HTML containing c, or 0 if not an
* object within a page * object within a page
* \param index index in page->data.html.object, or 0 if not an object
* \param box box containing c, or 0 if not an object * \param box box containing c, or 0 if not an object
* \param params object parameters, or 0 if not an object * \param params object parameters, or 0 if not an object
*/ */
void plugin_open(struct content *c, struct browser_window *bw, void plugin_open(struct content *c, struct browser_window *bw,
struct content *page, unsigned int index, struct box *box, struct content *page, struct box *box,
struct object_params *params) struct object_params *params)
{ {
bool standalone = false, helper = false; bool standalone = false, helper = false;