diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-10-13 11:56:31 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-10-13 11:56:31 +0100 |
| commit | 17be8cf216e08a57c511ec1ea43eae40874fa9de (patch) | |
| tree | 270667cd4a3418b185e5432be1c7c8b7dca8792f /gtk | |
| parent | 33c6073dbed882506e5a16fc43e7e2a71a2d6be2 (diff) | |
| download | netsurf-17be8cf216e08a57c511ec1ea43eae40874fa9de.tar.gz netsurf-17be8cf216e08a57c511ec1ea43eae40874fa9de.tar.bz2 | |
Put the font operations table alongside all the other core API
The netsurf core is driven from numerous operation tables most of
which are now set through a common netsurf_register() interface. The
font and plotting interfaces are currently separate and unlike all the
other operation tables are modified for differing contexts.
This change moves the font operations alongside all the other
operations table and remove unnecessary interaction with the renderers
font internals. Further this also removes the need for css internals
to be visible in frontends.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/font_pango.c | 7 | ||||
| -rw-r--r-- | gtk/plotters.c | 1 | ||||
| -rw-r--r-- | gtk/print.c | 7 | ||||
| -rw-r--r-- | gtk/scaffolding.c | 2 | ||||
| -rw-r--r-- | gtk/thumbnail.c | 8 |
5 files changed, 13 insertions, 12 deletions
diff --git a/gtk/font_pango.c b/gtk/font_pango.c index 1cb536e9e..c49b32b25 100644 --- a/gtk/font_pango.c +++ b/gtk/font_pango.c @@ -27,12 +27,13 @@ #include <stdio.h> #include <gtk/gtk.h> -#include "gtk/font_pango.h" -#include "gtk/plotters.h" -#include "render/font.h" #include "utils/utils.h" #include "utils/log.h" #include "utils/nsoption.h" +#include "desktop/font.h" + +#include "gtk/font_pango.h" +#include "gtk/plotters.h" static bool nsfont_width(const plot_font_style_t *fstyle, const char *string, size_t length, diff --git a/gtk/plotters.c b/gtk/plotters.c index b2a7edecc..de0bf9d48 100644 --- a/gtk/plotters.c +++ b/gtk/plotters.c @@ -33,7 +33,6 @@ #include "utils/log.h" #include "desktop/plotters.h" -#include "render/font.h" #include "utils/nsoption.h" #include "gtk/font_pango.h" diff --git a/gtk/print.c b/gtk/print.c index 68a96dc2d..e5870267a 100644 --- a/gtk/print.c +++ b/gtk/print.c @@ -31,19 +31,20 @@ #include <gdk/gdk.h> #include <gtk/gtk.h> +#include "utils/log.h" +#include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" #include "utils/nsoption.h" #include "desktop/plotters.h" #include "desktop/print.h" #include "desktop/printer.h" +#include "desktop/font.h" + #include "gtk/font_pango.h" #include "gtk/bitmap.h" #include "gtk/print.h" #include "gtk/scaffolding.h" -#include "render/font.h" -#include "utils/log.h" -#include "utils/utils.h" /* Globals */ cairo_t *gtk_print_current_cr; diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 4706c6f60..4be27c7db 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -44,7 +44,7 @@ #include "desktop/save_text.h" #include "desktop/searchweb.h" #include "desktop/textinput.h" -#include "render/font.h" +#include "desktop/font.h" #include "render/html.h" #include "content/hlcache.h" diff --git a/gtk/thumbnail.c b/gtk/thumbnail.c index 19c5fc193..4bdab7485 100644 --- a/gtk/thumbnail.c +++ b/gtk/thumbnail.c @@ -28,19 +28,19 @@ #include <gtk/gtk.h> #include <gdk/gdk.h> +#include "utils/log.h" +#include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" #include "desktop/plotters.h" #include "desktop/browser.h" #include "desktop/thumbnail.h" +#include "image/bitmap.h" + #include "gtk/scaffolding.h" #include "gtk/plotters.h" #include "gtk/bitmap.h" -#include "image/bitmap.h" -#include "render/font.h" -#include "utils/log.h" -#include "utils/utils.h" /** * Create a thumbnail of a page. |