diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-05-06 20:40:09 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-05-06 20:40:09 +0000 |
commit | e71691bae890040b83cfd54a2d9a1097d5026866 (patch) | |
tree | 96b2680dc6559ca0ab88fa0b6a533c13b7c9487e /riscos/print.c | |
parent | e77b1a29550e4753f771848705975295a6ebe99e (diff) | |
download | netsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.gz netsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.bz2 |
Merge branches/jmb/content-factory to trunk
svn path=/trunk/netsurf/; revision=12283
Diffstat (limited to 'riscos/print.c')
-rw-r--r-- | riscos/print.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/riscos/print.c b/riscos/print.c index a1e940f4d..486742c64 100644 --- a/riscos/print.c +++ b/riscos/print.c @@ -33,10 +33,6 @@ #include "content/content.h" #include "content/hlcache.h" #include "desktop/plotters.h" -#include "render/box.h" -#include "render/font.h" -#include "render/html.h" -#include "render/layout.h" #include "riscos/dialog.h" #include "riscos/menus.h" #include "riscos/print.h" @@ -592,8 +588,7 @@ bool print_document(struct gui_window *g, const char *filename) saved_width = content_get_width(h); saved_height = content_get_height(h); if (content_get_type(h) == CONTENT_HTML) - /* TODO: Front end code shouldn't see contents */ - layout_document(hlcache_handle_get_content(h), width, height); + content_reformat(h, width, height); /* open printer file */ error = xosfind_openoutw(osfind_NO_PATH | osfind_ERROR_IF_DIR | @@ -763,9 +758,7 @@ bool print_document(struct gui_window *g, const char *filename) /* restore document layout and redraw browser window */ if (content_get_type(h) == CONTENT_HTML) - /* TODO: Front end code shouldn't see contents */ - layout_document(hlcache_handle_get_content(h), - saved_width, saved_height); + content_reformat(h, saved_width, saved_height); gui_window_redraw_window(g); @@ -785,9 +778,7 @@ error: /* restore document layout */ if (content_get_type(h) == CONTENT_HTML) - /* TODO: Front end code shouldn't see contents */ - layout_document(hlcache_handle_get_content(h), - saved_width, saved_height); + content_reformat(h, saved_width, saved_height); return false; } |