diff options
author | Vincent Sanders <vince@kyllikki.org> | 2017-01-13 10:01:25 +0000 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2017-01-13 10:03:24 +0000 |
commit | 7dab7cb43d4091648ceb40684ff70aff7091c648 (patch) | |
tree | 88e77a9be8ff1dea4c20db61a5788383e070942d /render | |
parent | 8ffc2e753b04a9e794e7a6302d57d590b311e41f (diff) | |
download | netsurf-7dab7cb43d4091648ceb40684ff70aff7091c648.tar.gz netsurf-7dab7cb43d4091648ceb40684ff70aff7091c648.tar.bz2 |
move plot style header to netsurf include directory
move plotter style header and adjust all callers to use only what they
actually require.
Diffstat (limited to 'render')
-rw-r--r-- | render/box_construct.c | 5 | ||||
-rw-r--r-- | render/font.c | 1 | ||||
-rw-r--r-- | render/font.h | 4 | ||||
-rw-r--r-- | render/form.c | 9 | ||||
-rw-r--r-- | render/html.h | 5 |
5 files changed, 14 insertions, 10 deletions
diff --git a/render/box_construct.c b/render/box_construct.c index 4b54a3075..d7de68c18 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -41,11 +41,12 @@ #include "utils/utils.h" #include "utils/string.h" #include "utils/ascii.h" +#include "netsurf/css.h" +#include "netsurf/misc.h" +#include "netsurf/plot_style.h" #include "content/content_protected.h" #include "css/hints.h" #include "css/select.h" -#include "netsurf/css.h" -#include "netsurf/misc.h" #include "desktop/gui_internal.h" #include "render/box.h" diff --git a/render/font.c b/render/font.c index 8128269fe..94ef877c7 100644 --- a/render/font.c +++ b/render/font.c @@ -23,6 +23,7 @@ */ #include "utils/nsoption.h" +#include "netsurf/plot_style.h" #include "css/utils.h" #include "render/font.h" diff --git a/render/font.h b/render/font.h index e4353df64..fba368a97 100644 --- a/render/font.h +++ b/render/font.h @@ -27,6 +27,8 @@ #ifndef _NETSURF_RENDER_FONT_H_ #define _NETSURF_RENDER_FONT_H_ +struct plot_font_style; + /** * Populate a font style using data from a computed CSS style * @@ -34,6 +36,6 @@ * \param fstyle Font style to populate */ void font_plot_style_from_css(const css_computed_style *css, - plot_font_style_t *fstyle); + struct plot_font_style *fstyle); #endif diff --git a/render/form.c b/render/form.c index 52e54e477..093b11fbc 100644 --- a/render/form.c +++ b/render/form.c @@ -40,17 +40,16 @@ #include "utils/utf8.h" #include "utils/utils.h" #include "utils/ascii.h" +#include "netsurf/browser_window.h" +#include "netsurf/mouse.h" +#include "netsurf/plotters.h" +#include "netsurf/misc.h" #include "content/fetch.h" #include "content/hlcache.h" #include "css/utils.h" -#include "netsurf/browser_window.h" -#include "netsurf/mouse.h" #include "desktop/knockout.h" -#include "desktop/plot_style.h" -#include "netsurf/plotters.h" #include "desktop/scrollbar.h" #include "desktop/textarea.h" -#include "netsurf/misc.h" #include "desktop/gui_internal.h" #include "render/box.h" diff --git a/render/html.h b/render/html.h index 871eb331e..b8429fd17 100644 --- a/render/html.h +++ b/render/html.h @@ -30,10 +30,10 @@ #include <dom/dom.h> #include <dom/bindings/hubbub/parser.h> +#include "netsurf/types.h" #include "netsurf/content_type.h" #include "netsurf/browser_window.h" #include "netsurf/mouse.h" -#include "desktop/plot_style.h" #include "desktop/frame_types.h" struct fetch_multipart_data; @@ -52,6 +52,7 @@ struct scrollbar_msg_data; struct search_context; struct selection; struct nsurl; +struct plot_font_style; /** * Container for stylesheets used by an HTML document @@ -158,7 +159,7 @@ void html_overflow_scroll_drag_end(struct scrollbar *scrollbar, bool text_redraw(const char *utf8_text, size_t utf8_len, size_t offset, int space, - const plot_font_style_t *fstyle, + const struct plot_font_style *fstyle, int x, int y, const struct rect *clip, int height, |