Pass html_content to imagemap_get, instead of hlcache_handle.

svn path=/trunk/netsurf/; revision=12752

3 files changed, 3 insertions, 4 deletions

diff --git a/render/html_interaction.c b/render/html_interaction.c
index 813736175..f6861a79f 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -287,7 +287,7 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
 		}
 
 		if (box->usemap) {
-			url = imagemap_get(content, box->usemap,
+			url = imagemap_get(html, box->usemap,
 					box_x, box_y, x, y, &target);
 			if (url) {
 				imagemap = true;
diff --git a/render/imagemap.c b/render/imagemap.c
index e8d61384f..7632b458c 100644
--- a/render/imagemap.c
+++ b/render/imagemap.c
@@ -632,12 +632,11 @@ void imagemap_freelist(struct mapentry *list)
  * \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(hlcache_handle *h, const char *key,
+const char *imagemap_get(struct html_content *c, const char *key,
 		unsigned long x, unsigned long y,
 		unsigned long click_x, unsigned long click_y,
 		const char **target)
 {
-	html_content *c = (html_content *) hlcache_handle_get_content(h);
 	unsigned int slot = 0;
 	struct imagemap *map;
 	struct mapentry *entry;
diff --git a/render/imagemap.h b/render/imagemap.h
index 60d73653c..01d07e73d 100644
--- a/render/imagemap.h
+++ b/render/imagemap.h
@@ -28,7 +28,7 @@ void imagemap_destroy(struct html_content *c);
 void imagemap_dump(struct html_content *c);
 bool imagemap_extract(xmlNode *node, struct html_content *c);
 
-const char *imagemap_get(struct hlcache_handle *h, const char *key,
+const char *imagemap_get(struct html_content *c, const char *key,
 		unsigned long x, unsigned long y,
 		unsigned long click_x, unsigned long click_y,
 		const char **target);