content_get_url -> hlcache_handle_get_url, content__get_url -> content_get_url

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

6 files changed, 18 insertions, 18 deletions

diff --git a/render/box.c b/render/box.c
index a65094548..d622101a1 100644
--- a/render/box.c
+++ b/render/box.c
@@ -942,7 +942,7 @@ void box_dump(FILE *stream, struct box *box, unsigned int depth)
 		fprintf(stream, "space ");
 	if (box->object) {
 		fprintf(stream, "(object '%s') ", 
-				nsurl_access(content_get_url(box->object)));
+				nsurl_access(hlcache_handle_get_url(box->object)));
 	}
 	if (box->iframe) {
 		fprintf(stream, "(iframe) ");
diff --git a/render/box_construct.c b/render/box_construct.c
index 845490451..2aa9ff091 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -1103,7 +1103,7 @@ css_select_results *box_get_style(html_content *c,
 		inline_style = nscss_create_inline_style(
 				(uint8_t *) s, strlen(s),
 				c->encoding,
-				nsurl_access(content__get_url(&c->base)), 
+				nsurl_access(content_get_url(&c->base)), 
 				c->quirks != BINDING_QUIRKS_MODE_NONE,
 				box_style_alloc, NULL);
 
diff --git a/render/form.c b/render/form.c
index ac5dbe9cc..d11630192 100644
--- a/render/form.c
+++ b/render/form.c
@@ -1500,7 +1500,7 @@ void form_submit(hlcache_handle *h, struct browser_window *target,
 
 		url_destroy_components(&components);
 
-		browser_window_go(target, url, nsurl_access(content_get_url(h)),
+		browser_window_go(target, url, nsurl_access(hlcache_handle_get_url(h)),
 				true);
 		break;
 
@@ -1513,13 +1513,13 @@ void form_submit(hlcache_handle *h, struct browser_window *target,
 		}
 
 		browser_window_go_post(target, form->action, data, 0,
-				true,  nsurl_access(content_get_url(h)),
+				true,  nsurl_access(hlcache_handle_get_url(h)),
 				false, true, 0);
 		break;
 
 	case method_POST_MULTIPART:
 		browser_window_go_post(target, form->action, 0,
-				success, true, nsurl_access(content_get_url(h)),
+				success, true, nsurl_access(hlcache_handle_get_url(h)),
 				false, true, 0);
 		break;
 	}
diff --git a/render/html.c b/render/html.c
index 348f2a3ef..de6737f0c 100644
--- a/render/html.c
+++ b/render/html.c
@@ -274,7 +274,7 @@ nserror html_create_html_data(html_content *c, const http_parameter *params)
 	c->document = NULL;
 	c->quirks = BINDING_QUIRKS_MODE_NONE;
 	c->encoding = NULL;
-	c->base_url = nsurl_ref(content__get_url(&c->base));
+	c->base_url = nsurl_ref(content_get_url(&c->base));
 	c->base_target = NULL;
 	c->aborted = false;
 	c->layout = NULL;
@@ -584,7 +584,7 @@ bool html_convert(struct content *c)
 		/* Make all actions absolute */
 		if (f->action == NULL || f->action[0] == '\0') {
 			/* HTML5 4.10.22.3 step 11 */
-			res = url_join(nsurl_access(content__get_url(c)), 
+			res = url_join(nsurl_access(content_get_url(c)), 
 					nsurl_access(htmlc->base_url), &action);
 		} else {
 			res = url_join(f->action, nsurl_access(htmlc->base_url),
@@ -1034,7 +1034,7 @@ bool html_meta_refresh(html_content *c, xmlNode *head)
 			xmlFree(content);
 
 			c->base.refresh = nsurl_ref(
-					content__get_url(&c->base));
+					content_get_url(&c->base));
 
 			content_broadcast(&c->base, CONTENT_MSG_REFRESH, 
 					msg_data);
@@ -1169,7 +1169,7 @@ bool html_find_stylesheets(html_content *c, xmlNode *html)
 	c->base.active = 0;
 
 	ns_error = hlcache_handle_retrieve(html_default_stylesheet_url, 0,
-			content__get_url(&c->base), NULL,
+			content_get_url(&c->base), NULL,
 			html_convert_css_callback, c, &child, accept,
 			&c->stylesheets[STYLESHEET_BASE].data.external);
 	if (ns_error != NSERROR_OK)
@@ -1179,7 +1179,7 @@ bool html_find_stylesheets(html_content *c, xmlNode *html)
 
 	if (c->quirks == BINDING_QUIRKS_MODE_FULL) {
 		ns_error = hlcache_handle_retrieve(html_quirks_stylesheet_url, 
-				0, content__get_url(&c->base), NULL,
+				0, content_get_url(&c->base), NULL,
 				html_convert_css_callback, c, &child, accept,
 				&c->stylesheets[STYLESHEET_QUIRKS].
 						data.external);
@@ -1191,7 +1191,7 @@ bool html_find_stylesheets(html_content *c, xmlNode *html)
 
 	if (option_block_ads) {
 		ns_error = hlcache_handle_retrieve(html_adblock_stylesheet_url,
-				0, content__get_url(&c->base), NULL,
+				0, content_get_url(&c->base), NULL,
 				html_convert_css_callback, c, &child, accept,
 				&c->stylesheets[STYLESHEET_ADBLOCK].
 						data.external);
@@ -1291,7 +1291,7 @@ bool html_find_stylesheets(html_content *c, xmlNode *html)
 			c->stylesheet_count++;
 			c->stylesheets[i].type = HTML_STYLESHEET_EXTERNAL;
 			ns_error = hlcache_handle_retrieve(joined, 0,
-					content__get_url(&c->base), NULL,
+					content_get_url(&c->base), NULL,
 					html_convert_css_callback, c, &child,
 					accept,
 					&c->stylesheets[i].data.external);
@@ -1471,7 +1471,7 @@ nserror html_convert_css_callback(hlcache_handle *css,
 		break;
 
 	case CONTENT_MSG_DONE:
-		LOG(("got stylesheet '%s'", nsurl_access(content_get_url(css))));
+		LOG(("got stylesheet '%s'", nsurl_access(hlcache_handle_get_url(css))));
 		parent->base.active--;
 		break;
 
@@ -1543,7 +1543,7 @@ bool html_fetch_object(html_content *c, nsurl *url, struct box *box,
  
 	error = hlcache_handle_retrieve(url, 
 			HLCACHE_RETRIEVE_SNIFF_TYPE, 
-			content__get_url(&c->base), NULL, 
+			content_get_url(&c->base), NULL, 
 			html_object_callback, object, &child, 
 			object->permitted_types, &object->content);
        	if (error != NSERROR_OK) {
@@ -1596,7 +1596,7 @@ bool html_replace_object(struct content_html_object *object, nsurl *url)
 
 	/* initialise fetch */
 	error = hlcache_handle_retrieve(url, HLCACHE_RETRIEVE_SNIFF_TYPE, 
-			content__get_url(&c->base), NULL, 
+			content_get_url(&c->base), NULL, 
 			html_object_callback, object, &child,
 			object->permitted_types,
 			&object->content);
diff --git a/render/html_interaction.c b/render/html_interaction.c
index 95993d594..b6508570f 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -554,7 +554,7 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
 				mouse & BROWSER_MOUSE_MOD_1) {
 			/* force download of link */
 			browser_window_go_post(bw, nsurl_access(url), 0, 0,
-					false, nsurl_access(content_get_url(h)),
+					false, nsurl_access(hlcache_handle_get_url(h)),
 					true, true, 0);
 		} else if (mouse & BROWSER_MOUSE_CLICK_2 &&
 				mouse & BROWSER_MOUSE_MOD_1) {
@@ -692,7 +692,7 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
 	case ACTION_GO:
 		browser_window_go(browser_window_find_target(bw, target, mouse),
 				nsurl_access(url),
-				nsurl_access(content_get_url(h)), true);
+				nsurl_access(hlcache_handle_get_url(h)), true);
 		break;
 	case ACTION_NONE:
 		break;
diff --git a/render/layout.c b/render/layout.c
index 8d4d50fd7..d1eefdc46 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -989,7 +989,7 @@ bool layout_block_object(struct box *block)
 
 #ifdef LAYOUT_DEBUG
 	LOG(("block %p, object %s, width %i", block,
-			content_get_url(block->object), block->width));
+			hlcache_handle_get_url(block->object), block->width));
 #endif
 
 	if (content_get_type(block->object) == CONTENT_HTML) {