summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2014-09-18 18:07:52 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2014-09-18 18:07:52 +0100
commit35f7f2b9f39f000a652b0bdf423b4042338f474f (patch)
treeef66ac96859ec94bfcc1d6774f14e1715e7bad84
parent1878bc88a9c2ead4e12e6ed9165a27e99ef9c6f9 (diff)
downloadnetsurf-35f7f2b9f39f000a652b0bdf423b4042338f474f.tar.gz
netsurf-35f7f2b9f39f000a652b0bdf423b4042338f474f.tar.bz2
Resolve relative URLs in inline CSS relative to document's base URL, rather than its content URL.
This means passing the base URL as the URL param to LibCSS's css_stylesheet_create, rather than the URL of the source of the style data.
-rw-r--r--css/select.c2
-rw-r--r--render/box_construct.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/css/select.c b/css/select.c
index 72f72d9b8..cb98f24ec 100644
--- a/css/select.c
+++ b/css/select.c
@@ -163,7 +163,7 @@ static css_select_handler selection_handler = {
* \param data Source data
* \param len Length of data in bytes
* \param charset Charset of data, or NULL if unknown
- * \param url URL of document containing data
+ * \param url Base URL of document containing data
* \param allow_quirks True to permit CSS parsing quirks
* \return Pointer to stylesheet, or NULL on failure.
*/
diff --git a/render/box_construct.c b/render/box_construct.c
index 8eeb7bc33..17cb3306d 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -1338,7 +1338,7 @@ css_select_results *box_get_style(html_content *c,
(const uint8_t *) dom_string_data(s),
dom_string_byte_length(s),
c->encoding,
- nsurl_access(content_get_url(&c->base)),
+ nsurl_access(c->base_url),
c->quirks != DOM_DOCUMENT_QUIRKS_MODE_NONE);
dom_string_unref(s);