summaryrefslogtreecommitdiff
path: root/render/box.h
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2011-10-03 20:28:29 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2011-10-03 20:28:29 +0000
commit898b01e72163a53aac3a93bda5181b5897299cb1 (patch)
tree7e74675cf999d342806a3f9da02698a69565a659 /render/box.h
parentb9a40d8e47bac102c998b78b97d205886bc2dafb (diff)
downloadnetsurf-898b01e72163a53aac3a93bda5181b5897299cb1.tar.gz
netsurf-898b01e72163a53aac3a93bda5181b5897299cb1.tar.bz2
More conversion to nsurl. (box->href, object params, imagemaps, (i)frames)
svn path=/trunk/netsurf/; revision=12933
Diffstat (limited to 'render/box.h')
-rw-r--r--render/box.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/render/box.h b/render/box.h
index 84975ee82..3addb83a2 100644
--- a/render/box.h
+++ b/render/box.h
@@ -213,7 +213,7 @@ struct box {
/** Width of space after current text (depends on font and size). */
int space;
- const char *href; /**< Link, or 0. */
+ nsurl *href; /**< Link, or 0. */
const char *target; /**< Link target, or 0. */
const char *title; /**< Title, or 0. */
@@ -284,11 +284,11 @@ struct column {
/** Parameters for <object> and similar elements. */
struct object_params {
- char *data;
+ nsurl *data;
char *type;
char *codetype;
- char *codebase;
- char *classid;
+ nsurl *codebase;
+ nsurl *classid;
struct object_param *params;
};
@@ -312,7 +312,7 @@ extern const char *TARGET_BLANK;
void *box_style_alloc(void *ptr, size_t len, void *pw);
struct box * box_create(css_select_results *styles, css_computed_style *style,
- bool style_owned, const char *href, const char *target,
+ bool style_owned, nsurl *href, const char *target,
const char *title, char *id, void *context);
void box_add_child(struct box *parent, struct box *child);
void box_insert_sibling(struct box *box, struct box *new_box);
@@ -331,7 +331,7 @@ struct box *box_pick_text_box(struct html_content *html,
struct box *box_find_by_id(struct box *box, const char *id);
bool box_visible(struct box *box);
void box_dump(FILE *stream, struct box *box, unsigned int depth);
-bool box_extract_link(const char *rel, const char *base, char **result);
+bool box_extract_link(const char *rel, nsurl *base, nsurl **result);
bool box_handle_scrollbars(struct content *c, struct box *box,
bool bottom, bool right);