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/imagemap.c | |
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/imagemap.c')
-rw-r--r-- | render/imagemap.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/render/imagemap.c b/render/imagemap.c index d52e5bdd4..07a46d404 100644 --- a/render/imagemap.c +++ b/render/imagemap.c @@ -24,7 +24,8 @@ #include <stdbool.h> #include <string.h> #include <strings.h> -#include "content/content.h" +#include "content/content_protected.h" +#include "content/hlcache.h" #include "render/box.h" #include "render/imagemap.h" #include "utils/log.h" @@ -626,20 +627,21 @@ void imagemap_freelist(struct mapentry *list) /** * Retrieve url associated with imagemap entry * - * \param c The containing content - * \param key The map name to search for - * \param x The left edge of the containing box - * \param y The top edge of the containing box - * \param click_x The horizontal location of the click - * \param click_y The vertical location of the click - * \param target Pointer to location to receive target pointer (if any) + * \param h The containing content + * \param key The map name to search for + * \param x The left edge of the containing box + * \param y The top edge of the containing box + * \param click_x The horizontal location of the click + * \param click_y The vertical location of the click + * \param target Pointer to location to receive target pointer (if any) * \return The url associated with this area, or NULL if not found */ -const char *imagemap_get(struct content *c, const char *key, +const char *imagemap_get(hlcache_handle *h, const char *key, unsigned long x, unsigned long y, unsigned long click_x, unsigned long click_y, const char **target) { + struct content *c = hlcache_handle_get_content(h); unsigned int slot = 0; struct imagemap *map; struct mapentry *entry; |