diff options
author | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-03-28 12:56:39 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2010-03-28 12:56:39 +0000 |
commit | 270ef59a98d34fef418fb6cd27e46f3edc912948 (patch) | |
tree | 9d363b42d441640e1d2dbff3ba548a2cdf8d67a9 /render/box.h | |
parent | 21da4f5bdf74c6654730c32dfcc1c6b3d24da4b4 (diff) | |
download | netsurf-270ef59a98d34fef418fb6cd27e46f3edc912948.tar.gz netsurf-270ef59a98d34fef418fb6cd27e46f3edc912948.tar.bz2 |
Merge jmb/new-cache; r=dsilvers,rs=vince
svn path=/trunk/netsurf/; revision=10180
Diffstat (limited to 'render/box.h')
-rw-r--r-- | render/box.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/render/box.h b/render/box.h index b53e0481c..665565f2f 100644 --- a/render/box.h +++ b/render/box.h @@ -239,10 +239,10 @@ struct box { char *id; /**< value of id attribute (or name for anchors) */ /** Background image for this box, or 0 if none */ - struct content *background; + struct hlcache_handle *background; /** Object in this box (usually an image), or 0 if none. */ - struct content* object; + struct hlcache_handle* object; /** Parameters for the object, or 0. */ struct object_params *object_params; }; @@ -307,9 +307,9 @@ void box_free_object_params(struct object_params *op); void box_bounds(struct box *box, struct rect *r); void box_coords(struct box *box, int *x, int *y); struct box *box_at_point(struct box *box, const int x, const int y, - int *box_x, int *box_y, struct content **content); -struct box *box_object_at_point(struct content *c, int x, int y); -struct box *box_href_at_point(struct content *c, int x, int y); + int *box_x, int *box_y, struct hlcache_handle **content); +struct box *box_object_at_point(struct hlcache_handle *h, int x, int y); +struct box *box_href_at_point(struct hlcache_handle *h, int x, int y); 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); |