diff options
| author | James Bursa <james@netsurf-browser.org> | 2004-08-11 22:08:26 +0000 |
|---|---|---|
| committer | James Bursa <james@netsurf-browser.org> | 2004-08-11 22:08:26 +0000 |
| commit | acfb4c0adb113b0dfaff7f07e93be58fd4238bd6 (patch) | |
| tree | 4d0775011a0f7502618b26308eb80139f28d68d3 /desktop | |
| parent | 45b241906ed3b29ee6bd0e62fe71f1f5a7facba5 (diff) | |
| download | netsurf-acfb4c0adb113b0dfaff7f07e93be58fd4238bd6.tar.gz netsurf-acfb4c0adb113b0dfaff7f07e93be58fd4238bd6.tar.bz2 | |
[project @ 2004-08-11 22:08:25 by bursa]
Remove content_add_instance(), content_remove_instance(), content_reshape_instance(). Add content_open(), content_close(). Implement for CONTENT_HTML.
svn path=/import/netsurf/; revision=1213
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/browser.c | 20 | ||||
| -rw-r--r-- | desktop/browser.h | 2 |
2 files changed, 8 insertions, 14 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index 256e9effd..949d7511b 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -217,12 +217,10 @@ void browser_window_callback(content_msg msg, struct content *c, if (bw->current_content) { if (bw->current_content->status == + CONTENT_STATUS_READY || + bw->current_content->status == CONTENT_STATUS_DONE) - content_remove_instance( - bw->current_content, - bw, 0, 0, - 0, - &bw->current_content_state); + content_close(bw->current_content); content_remove_user(bw->current_content, browser_window_callback, bw, 0); @@ -233,6 +231,7 @@ void browser_window_callback(content_msg msg, struct content *c, gui_window_new_content(bw->window); gui_window_set_url(bw->window, c->url); browser_window_update(bw, true); + content_open(c, bw, 0, 0, 0); browser_window_set_status(bw, c->status_message); if (bw->history_add) history_add(bw->history, c, bw->frag_id); @@ -241,11 +240,7 @@ void browser_window_callback(content_msg msg, struct content *c, case CONTENT_MSG_DONE: assert(bw->current_content == c); - content_add_instance(c, bw, 0, 0, 0, - &bw->current_content_state); browser_window_update(bw, false); - content_reshape_instance(c, bw, 0, 0, 0, - &bw->current_content_state); sprintf(status, messages_get("Complete"), ((float) (clock() - bw->time0)) / CLOCKS_PER_SEC); @@ -510,9 +505,10 @@ void browser_window_destroy(struct browser_window *bw) } if (bw->current_content) { - if (bw->current_content->status == CONTENT_STATUS_DONE) - content_remove_instance(bw->current_content, bw, 0, - 0, 0, &bw->current_content_state); + if (bw->current_content->status == CONTENT_STATUS_READY || + bw->current_content->status == + CONTENT_STATUS_DONE) + content_close(bw->current_content); content_remove_user(bw->current_content, browser_window_callback, bw, 0); } diff --git a/desktop/browser.h b/desktop/browser.h index 42bdb39d4..77f084349 100644 --- a/desktop/browser.h +++ b/desktop/browser.h @@ -28,8 +28,6 @@ struct browser_window { /** Page currently displayed, or 0. Must have status READY or DONE. */ struct content *current_content; - /** Instance state pointer for current_content. */ - void *current_content_state; /** Page being loaded, or 0. */ struct content *loading_content; |