summaryrefslogtreecommitdiff
path: root/framebuffer
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2014-10-13 11:56:31 +0100
committerVincent Sanders <vince@kyllikki.org>2014-10-13 11:56:31 +0100
commit17be8cf216e08a57c511ec1ea43eae40874fa9de (patch)
tree270667cd4a3418b185e5432be1c7c8b7dca8792f /framebuffer
parent33c6073dbed882506e5a16fc43e7e2a71a2d6be2 (diff)
downloadnetsurf-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 'framebuffer')
-rw-r--r--framebuffer/fbtk/text.c2
-rw-r--r--framebuffer/font_freetype.c2
-rw-r--r--framebuffer/font_internal.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/framebuffer/fbtk/text.c b/framebuffer/fbtk/text.c
index b05271b44..f15586a92 100644
--- a/framebuffer/fbtk/text.c
+++ b/framebuffer/fbtk/text.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "desktop/browser.h"
-#include "render/font.h"
+#include "desktop/font.h"
#include "framebuffer/gui.h"
#include "framebuffer/fbtk.h"
diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c
index eaaf2f099..3469a95ec 100644
--- a/framebuffer/font_freetype.c
+++ b/framebuffer/font_freetype.c
@@ -27,8 +27,8 @@
#include "utils/utf8.h"
#include "utils/log.h"
#include "utils/nsoption.h"
-#include "render/font.h"
#include "desktop/gui.h"
+#include "desktop/font.h"
#include "desktop/browser.h"
#include "framebuffer/gui.h"
diff --git a/framebuffer/font_internal.c b/framebuffer/font_internal.c
index 9b850d5c8..4ac850448 100644
--- a/framebuffer/font_internal.c
+++ b/framebuffer/font_internal.c
@@ -20,12 +20,12 @@
#include <inttypes.h>
#include <string.h>
#include <assert.h>
+#include <stdlib.h>
#include "utils/nsoption.h"
#include "utils/utf8.h"
#include "desktop/gui.h"
-#include "css/css.h"
-#include "render/font.h"
+#include "desktop/font.h"
#include "framebuffer/gui.h"
#include "framebuffer/font.h"