Merge with main repo.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/html.cc b/src/html.cc
index 3b49fae8..9224f43b 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -405,7 +405,7 @@ DilloHtml::DilloHtml(BrowserWindow *p_bw, const DilloUrl *url,
    DocType = DT_NONE;    /* assume Tag Soup 0.0!   :-) */
    DocTypeVersion = 0.0f;
 
-   styleEngine = new StyleEngine (HT2LT (this), base_url);
+   styleEngine = new StyleEngine (HT2LT (this), page_url, base_url);
 
    cssUrls = new misc::SimpleVector <DilloUrl*> (1);
 
@@ -644,10 +644,12 @@ void DilloHtml::loadImages (const DilloUrl *pattern)
 {
    dReturn_if (a_Bw_expecting(bw));
 
-   /* If the user asked for a specific URL, the user (NULL) is the requester,
-    * but if the user just asked for all URLs, use the page URL as the
-    * requester. If the possible patterns become more complex, it might be
-    * good to have the caller supply the requester instead.
+   /* If the user asked for a specific image, the user (NULL) is the requester,
+    * and the domain mechanism will always permit the request. But if the user
+    * just asked for all images (clicking "Load images"), use the page URL as
+    * the requester so that the domain mechanism can act as a filter.
+    * If the possible patterns become more complex, it might be good to have
+    * the caller supply the requester instead.
     */
    const DilloUrl *requester = pattern ? NULL : this->page_url;