diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-14 19:58:54 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-14 19:58:54 +0000 |
commit | 9f10babe645fe67b02fae90f852d5e4cdfcbb70e (patch) | |
tree | 909b77e3c48418204a23ac4723684ca0bc76a081 /render/html.h | |
parent | 0d9023148d2a34bd908aac38e44d449359b03438 (diff) | |
parent | 7dab7cb43d4091648ceb40684ff70aff7091c648 (diff) | |
download | netsurf-9f10babe645fe67b02fae90f852d5e4cdfcbb70e.tar.gz netsurf-9f10babe645fe67b02fae90f852d5e4cdfcbb70e.tar.bz2 |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/menuclass
Diffstat (limited to 'render/html.h')
-rw-r--r-- | render/html.h | 5 |
1 files changed, 3 insertions, 2 deletions
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, |