Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/dcdd0148b2d61caa118172df97d44c3b1a4ffa47
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/dcdd0148b2d61caa118172df97d44c3b1a4ffa47
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/dcdd0148b2d61caa118172df97d44c3b1a4ffa47

The branch, master has been updated
       via  dcdd0148b2d61caa118172df97d44c3b1a4ffa47 (commit)
       via  571a9ca0c9fe6ab4b2340fc3627fafc53bb82eab (commit)
       via  33bba1d9fdffad503f9f6529dbecc3eca261b864 (commit)
       via  74ab1eb244ba4470ec968bd7dcd1f9bec182f202 (commit)
      from  303d5f251f462193f7a15af997f3fa843f78d12b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=dcdd0148b2d61caa118172df97d44c3b1a4ffa47
commit dcdd0148b2d61caa118172df97d44c3b1a4ffa47
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    html: css: Remove redundant origin filtering for author_level_css

diff --git a/content/handlers/html/css.c b/content/handlers/html/css.c
index 7ee94c1..0bc3884 100644
--- a/content/handlers/html/css.c
+++ b/content/handlers/html/css.c
@@ -687,11 +687,6 @@ html_css_new_selection_context(html_content *c, 
css_select_ctx **ret_select_ctx)
                        origin = CSS_ORIGIN_USER;
                }
 
-               if (origin == CSS_ORIGIN_AUTHOR &&
-                   nsoption_bool(author_level_css) == false) {
-                       continue;
-               }
-
                if (hsheet->sheet != NULL) {
                        sheet = nscss_get_stylesheet(hsheet->sheet);
                }


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=571a9ca0c9fe6ab4b2340fc3627fafc53bb82eab
commit 571a9ca0c9fe6ab4b2340fc3627fafc53bb82eab
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    html: Avoid processing STYLE elements if author_level_css disabled

diff --git a/content/handlers/html/dom_event.c 
b/content/handlers/html/dom_event.c
index 36a020b..d389a21 100644
--- a/content/handlers/html/dom_event.c
+++ b/content/handlers/html/dom_event.c
@@ -622,7 +622,9 @@ dom_default_action_DOMNodeInserted_cb(struct dom_event 
*evt, void *pw)
                        break;
 
                case DOM_HTML_ELEMENT_TYPE_STYLE:
-                       html_css_process_style(htmlc, (dom_node *)node);
+                       if (nsoption_bool(author_level_css)) {
+                               html_css_process_style(htmlc, (dom_node *)node);
+                       }
                        break;
 
                case DOM_HTML_ELEMENT_TYPE_SCRIPT:
@@ -730,7 +732,10 @@ dom_default_action_DOMSubtreeModified_cb(struct dom_event 
*evt, void *pw)
 
                        switch (tag_type) {
                        case DOM_HTML_ELEMENT_TYPE_STYLE:
-                               html_css_update_style(htmlc, (dom_node *)node);
+                               if (nsoption_bool(author_level_css)) {
+                                       html_css_update_style(htmlc,
+                                                       (dom_node *)node);
+                               }
                                break;
                        case DOM_HTML_ELEMENT_TYPE_TEXTAREA:
                        case DOM_HTML_ELEMENT_TYPE_INPUT:


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=33bba1d9fdffad503f9f6529dbecc3eca261b864
commit 33bba1d9fdffad503f9f6529dbecc3eca261b864
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    html: Avoid fetching (and decoding) linked stylesheets
    
    When the `author_level_css` option is disabled, avoid fetching
    stylesheets that won't be used for selection.

diff --git a/content/handlers/html/css.c b/content/handlers/html/css.c
index cdb9494..7ee94c1 100644
--- a/content/handlers/html/css.c
+++ b/content/handlers/html/css.c
@@ -406,6 +406,10 @@ bool html_css_process_link(html_content *htmlc, dom_node 
*node)
        }
        dom_string_unref(rel);
 
+       if (nsoption_bool(author_level_css) == false) {
+               return true;
+       }
+
        /* type='text/css' or not present */
        exc = dom_element_get_attribute(node, corestring_dom_type, &type_attr);
        if (exc == DOM_NO_ERR && type_attr != NULL) {


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=74ab1eb244ba4470ec968bd7dcd1f9bec182f202
commit 74ab1eb244ba4470ec968bd7dcd1f9bec182f202
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>

    html: css: Minor code style fix

diff --git a/content/handlers/html/css.c b/content/handlers/html/css.c
index 69d5458..cdb9494 100644
--- a/content/handlers/html/css.c
+++ b/content/handlers/html/css.c
@@ -396,10 +396,10 @@ bool html_css_process_link(html_content *htmlc, dom_node 
*node)
        if (exc != DOM_NO_ERR || rel == NULL)
                return true;
 
-       if (strcasestr(dom_string_data(rel), "stylesheet") == 0) {
+       if (strcasestr(dom_string_data(rel), "stylesheet") == NULL) {
                dom_string_unref(rel);
                return true;
-       } else if (strcasestr(dom_string_data(rel), "alternate") != 0) {
+       } else if (strcasestr(dom_string_data(rel), "alternate") != NULL) {
                /* Ignore alternate stylesheets */
                dom_string_unref(rel);
                return true;


-----------------------------------------------------------------------

Summary of changes:
 content/handlers/html/css.c       |   13 ++++++-------
 content/handlers/html/dom_event.c |    9 +++++++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/content/handlers/html/css.c b/content/handlers/html/css.c
index 69d5458..0bc3884 100644
--- a/content/handlers/html/css.c
+++ b/content/handlers/html/css.c
@@ -396,16 +396,20 @@ bool html_css_process_link(html_content *htmlc, dom_node 
*node)
        if (exc != DOM_NO_ERR || rel == NULL)
                return true;
 
-       if (strcasestr(dom_string_data(rel), "stylesheet") == 0) {
+       if (strcasestr(dom_string_data(rel), "stylesheet") == NULL) {
                dom_string_unref(rel);
                return true;
-       } else if (strcasestr(dom_string_data(rel), "alternate") != 0) {
+       } else if (strcasestr(dom_string_data(rel), "alternate") != NULL) {
                /* Ignore alternate stylesheets */
                dom_string_unref(rel);
                return true;
        }
        dom_string_unref(rel);
 
+       if (nsoption_bool(author_level_css) == false) {
+               return true;
+       }
+
        /* type='text/css' or not present */
        exc = dom_element_get_attribute(node, corestring_dom_type, &type_attr);
        if (exc == DOM_NO_ERR && type_attr != NULL) {
@@ -683,11 +687,6 @@ html_css_new_selection_context(html_content *c, 
css_select_ctx **ret_select_ctx)
                        origin = CSS_ORIGIN_USER;
                }
 
-               if (origin == CSS_ORIGIN_AUTHOR &&
-                   nsoption_bool(author_level_css) == false) {
-                       continue;
-               }
-
                if (hsheet->sheet != NULL) {
                        sheet = nscss_get_stylesheet(hsheet->sheet);
                }
diff --git a/content/handlers/html/dom_event.c 
b/content/handlers/html/dom_event.c
index 36a020b..d389a21 100644
--- a/content/handlers/html/dom_event.c
+++ b/content/handlers/html/dom_event.c
@@ -622,7 +622,9 @@ dom_default_action_DOMNodeInserted_cb(struct dom_event 
*evt, void *pw)
                        break;
 
                case DOM_HTML_ELEMENT_TYPE_STYLE:
-                       html_css_process_style(htmlc, (dom_node *)node);
+                       if (nsoption_bool(author_level_css)) {
+                               html_css_process_style(htmlc, (dom_node *)node);
+                       }
                        break;
 
                case DOM_HTML_ELEMENT_TYPE_SCRIPT:
@@ -730,7 +732,10 @@ dom_default_action_DOMSubtreeModified_cb(struct dom_event 
*evt, void *pw)
 
                        switch (tag_type) {
                        case DOM_HTML_ELEMENT_TYPE_STYLE:
-                               html_css_update_style(htmlc, (dom_node *)node);
+                               if (nsoption_bool(author_level_css)) {
+                                       html_css_update_style(htmlc,
+                                                       (dom_node *)node);
+                               }
                                break;
                        case DOM_HTML_ELEMENT_TYPE_TEXTAREA:
                        case DOM_HTML_ELEMENT_TYPE_INPUT:


-- 
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to