diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2003-12-21 22:10:15 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2003-12-21 22:10:15 +0000 |
| commit | adc34761577a0508a3319af88273e3a6d1f0cb90 (patch) | |
| tree | d493b50585456e307cdeddf15ebbd200246282d1 /riscos/htmlinstance.c | |
| parent | 96bbdbc7ab6bcb4affccc7c356587891a15b133d (diff) | |
| download | netsurf-adc34761577a0508a3319af88273e3a6d1f0cb90.tar.gz netsurf-adc34761577a0508a3319af88273e3a6d1f0cb90.tar.bz2 | |
[project @ 2003-12-21 22:10:15 by jmb]
Tidy up and integrate frames code. Still incomplete.
svn path=/import/netsurf/; revision=439
Diffstat (limited to 'riscos/htmlinstance.c')
| -rw-r--r-- | riscos/htmlinstance.c | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/riscos/htmlinstance.c b/riscos/htmlinstance.c index 78f6bdd57..e9ca0931e 100644 --- a/riscos/htmlinstance.c +++ b/riscos/htmlinstance.c @@ -4,7 +4,7 @@ * http://www.opensource.org/licenses/gpl-license * Copyright 2003 James Bursa <bursa@users.sourceforge.net> */ - + #include "netsurf/content/content.h" #include "netsurf/desktop/browser.h" #include "netsurf/render/box.h" @@ -21,8 +21,13 @@ void html_add_instance(struct content *c, struct browser_window *bw, if (c->data.html.object[i].content == 0) continue; if (c->data.html.object[i].content->type == CONTENT_HTML) - LOG(("html object")); - content_add_instance(c->data.html.object[i].content, + frame_add_instance(c->data.html.object[i].content, + bw, c, + c->data.html.object[i].box, + c->data.html.object[i].box->object_params, + &c->data.html.object[i].box->object_state); + else + content_add_instance(c->data.html.object[i].content, bw, c, c->data.html.object[i].box, c->data.html.object[i].box->object_params, @@ -39,7 +44,14 @@ void html_reshape_instance(struct content *c, struct browser_window *bw, for (i = 0; i != c->data.html.object_count; i++) { if (c->data.html.object[i].content == 0) continue; - content_reshape_instance(c->data.html.object[i].content, + if (c->data.html.object[i].content->type == CONTENT_HTML) + frame_reshape_instance(c->data.html.object[i].content, + bw, c, + c->data.html.object[i].box, + c->data.html.object[i].box->object_params, + &c->data.html.object[i].box->object_state); + else + content_reshape_instance(c->data.html.object[i].content, bw, c, c->data.html.object[i].box, c->data.html.object[i].box->object_params, @@ -55,10 +67,17 @@ void html_remove_instance(struct content *c, struct browser_window *bw, for (i = 0; i != c->data.html.object_count; i++) { if (c->data.html.object[i].content == 0) continue; - content_remove_instance(c->data.html.object[i].content, + if (c->data.html.object[i].content->type == CONTENT_HTML) + frame_remove_instance(c->data.html.object[i].content, + bw, c, + c->data.html.object[i].box, + c->data.html.object[i].box->object_params, + &c->data.html.object[i].box->object_state); + else + content_remove_instance(c->data.html.object[i].content, bw, c, c->data.html.object[i].box, c->data.html.object[i].box->object_params, &c->data.html.object[i].box->object_state); } -}
\ No newline at end of file +} |