netsurf: branch master updated. release/3.0-96-gbec089e

NetSurf Browser Project (Commit Mailer) no-reply at netsurf-browser.org
Mon May 20 19:51:23 BST 2013


Gitweb links:

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

The branch, master has been updated
       via  bec089e7aa1e2befcedb31a842d18de31bca4206 (commit)
      from  2f94771f419423d25b4dc4bc6927c49add0ad196 (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=bec089e7aa1e2befcedb31a842d18de31bca4206
commit bec089e7aa1e2befcedb31a842d18de31bca4206
Author: Michael Drake <tlsa at netsurf-browser.org>
Commit: Michael Drake <tlsa at netsurf-browser.org>

    Tiny simplification.

diff --git a/render/html.c b/render/html.c
index 364083b..3fdbc5b 100644
--- a/render/html.c
+++ b/render/html.c
@@ -1134,18 +1134,15 @@ static bool html_convert(struct content *c)
 bool html_can_begin_conversion(html_content *htmlc)
 {
 	unsigned int i;
-	bool got_modified_stylesheet = false;
+
+	if (htmlc->base.active != 0)
+		return false;
 
 	for (i = 0; i != htmlc->stylesheet_count; i++) {
-		if (htmlc->stylesheets[i].modified) {
-			got_modified_stylesheet = true;
-			break;
-		}
+		if (htmlc->stylesheets[i].modified)
+			return false;
 	}
 
-	if (htmlc->base.active != 0 || got_modified_stylesheet)
-		return false;
-
 	return true;
 }
 


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

Summary of changes:
 render/html.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/render/html.c b/render/html.c
index 364083b..3fdbc5b 100644
--- a/render/html.c
+++ b/render/html.c
@@ -1134,18 +1134,15 @@ static bool html_convert(struct content *c)
 bool html_can_begin_conversion(html_content *htmlc)
 {
 	unsigned int i;
-	bool got_modified_stylesheet = false;
+
+	if (htmlc->base.active != 0)
+		return false;
 
 	for (i = 0; i != htmlc->stylesheet_count; i++) {
-		if (htmlc->stylesheets[i].modified) {
-			got_modified_stylesheet = true;
-			break;
-		}
+		if (htmlc->stylesheets[i].modified)
+			return false;
 	}
 
-	if (htmlc->base.active != 0 || got_modified_stylesheet)
-		return false;
-
 	return true;
 }
 


-- 
NetSurf Browser



More information about the netsurf-commits mailing list