summaryrefslogtreecommitdiff
path: root/desktop/frames.c
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-06-06 08:59:23 +0100
committerVincent Sanders <vince@kyllikki.org>2016-06-06 09:01:38 +0100
commit76a68d7dd02f3819e4e60cd9febfd45e20821e14 (patch)
treea86fc61314fd53d383cb95a313a2897779984214 /desktop/frames.c
parentd923e109cd56c553c8e87cdb8bdab5085e68cc73 (diff)
downloadnetsurf-76a68d7dd02f3819e4e60cd9febfd45e20821e14.tar.gz
netsurf-76a68d7dd02f3819e4e60cd9febfd45e20821e14.tar.bz2
Update content to split public and internal API
Diffstat (limited to 'desktop/frames.c')
-rw-r--r--desktop/frames.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/desktop/frames.c b/desktop/frames.c
index 7be75ce77..70e51e754 100644
--- a/desktop/frames.c
+++ b/desktop/frames.c
@@ -29,18 +29,17 @@
#include <time.h>
#include <math.h>
-#include "utils/config.h"
-#include "content/hlcache.h"
-#include "desktop/browser_private.h"
-#include "desktop/frames.h"
-#include "desktop/scrollbar.h"
-#include "desktop/selection.h"
#include "utils/log.h"
-#include "utils/messages.h"
#include "utils/utils.h"
+#include "netsurf/content.h"
+#include "content/hlcache.h"
#include "render/html.h"
#include "render/box.h"
+#include "desktop/browser_private.h"
+#include "desktop/frames.h"
+#include "desktop/scrollbar.h"
+
/** maximum frame resize margin */
#define FRAME_RESIZE 6
@@ -98,7 +97,7 @@ void browser_window_scroll_callback(void *client_data,
/* exported interface, documented in browser.h */
void browser_window_handle_scrollbars(struct browser_window *bw)
{
- hlcache_handle *h = bw->current_content;
+ struct hlcache_handle *h = bw->current_content;
bool scroll_x;
bool scroll_y;
int c_width = 0;
@@ -380,8 +379,8 @@ nserror browser_window_create_frameset(struct browser_window *bw,
/* Use the URL of the first ancestor window containing html content
* as the referer */
for (window = bw; window->parent; window = window->parent) {
- if (window->current_content &&
- content_get_type(window->current_content) ==
+ if (window->current_content &&
+ content_get_type(window->current_content) ==
CONTENT_HTML)
break;
}