From 539ba31abbd119968068b3eb49d4ad47a180487a Mon Sep 17 00:00:00 2001
From: Oriol Brufau <oriol-bugzilla@hotmail.com>
Date: Sun, 27 Aug 2017 16:13:14 +0200
Subject: [PATCH 1/4] Bug 1149830 removed nsIProgrammingLanguage

See https://bugzilla.mozilla.org/show_bug.cgi?id=1149830.
---
 components/stylishDataSource.js | 1 -
 components/stylishStyle.js      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/components/stylishDataSource.js b/components/stylishDataSource.js
index df63ae0..3a77eb7 100644
--- a/components/stylishDataSource.js
+++ b/components/stylishDataSource.js
@@ -25,7 +25,6 @@ StylishDataSource.prototype = {
 	classDescription: "Stylish Data Source",
 	classID: Components.ID("{d6fe57ea-1126-4dc6-8636-d25d5b901929}"),
 	contractID: "@userstyles.org/stylish-data-source;1",
-	implementationLanguage: Components.interfaces.nsIProgrammingLanguage.JAVASCRIPT,
 	flags: 0,
 	alreadyComplained: false,
 
diff --git a/components/stylishStyle.js b/components/stylishStyle.js
index 3d588c7..da6e4c4 100644
--- a/components/stylishStyle.js
+++ b/components/stylishStyle.js
@@ -48,7 +48,6 @@ Style.prototype = {
 	classDescription: "Stylish Style",
 	classID: Components.ID("{ea17a766-cdd4-444b-8d8d-b5bb935a2a22}"),
 	contractID: "@userstyles.org/style;1",
-	implementationLanguage: Components.interfaces.nsIProgrammingLanguage.JAVASCRIPT,
 	flags: 0,
 
 

From ec5f62c08824a940756cba40ffac0d9e615f1ca9 Mon Sep 17 00:00:00 2001
From: Oriol Brufau <oriol-bugzilla@hotmail.com>
Date: Sun, 27 Aug 2017 16:15:47 +0200
Subject: [PATCH 2/4] Bug 1390106 removed versioned scripts

See https://bugzilla.mozilla.org/show_bug.cgi?id=1390106
---
 content/edit.xul | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/edit.xul b/content/edit.xul
index 9a29bf8..fd03400 100644
--- a/content/edit.xul
+++ b/content/edit.xul
@@ -23,8 +23,8 @@
 	<script type="application/javascript" src="chrome://stylish/content/edit.js"/>
 	<script type="application/javascript" src="chrome://stylish/content/frame-utils.js"/>
 	<script type="application/javascript" src="chrome://stylish/content/common.js"/>
-	<script type="application/javascript;version=1.8" src="chrome://browser/content/devtools/theme-switching.js"></script>
-	<script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"></script>
+	<script type="application/javascript" src="chrome://browser/content/devtools/theme-switching.js"></script>
+	<script type="application/javascript" src="chrome://devtools/content/shared/theme-switching.js"></script>
 
 	<script type="application/javascript" src="chrome://itsalltext/content/API.js"/>
 

From 7e596bf8ecc0039cb9078f2f33bcda341ec9e1ce Mon Sep 17 00:00:00 2001
From: Oriol Brufau <oriol-bugzilla@hotmail.com>
Date: Sun, 27 Aug 2017 16:17:58 +0200
Subject: [PATCH 3/4] browsers[i].contentDocument can be null

---
 content/common.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/content/common.js b/content/common.js
index d95dac4..9662806 100644
--- a/content/common.js
+++ b/content/common.js
@@ -71,11 +71,14 @@ var stylishCommon = {
 			for (var i = 0; i < browsers.length; i++) {
 				// We can't read into remote documents easily. We only work with about:, anyway.
 				if (browsers[i].currentURI.schemeIs("about")) {
-					var de = browsers[i].contentDocument.documentElement;
-					if (de && de.getAttribute("windowtype") == name) {
-						tbWin.gBrowser.selectTabAtIndex(i);
-						tbWin.focus();
-						return true;
+					var doc = browsers[i].contentDocument;
+					if (doc) {
+						var de = browsers[i].contentDocument.documentElement;
+						if (de && de.getAttribute("windowtype") == name) {
+							tbWin.gBrowser.selectTabAtIndex(i);
+							tbWin.focus();
+							return true;
+						}
 					}
 				}
 			}

From 28cf85b1da5742dc89594aea906c53371cb3d924 Mon Sep 17 00:00:00 2001
From: Oriol Brufau <oriol-bugzilla@hotmail.com>
Date: Sun, 27 Aug 2017 16:22:25 +0200
Subject: [PATCH 4/4] Bug 645049 removed various mozIStorageBaseStatement
 methods

See https://bugzilla.mozilla.org/show_bug.cgi?id=645049.
---
 components/stylishStyle.js | 109 ++++++++++++++++++-------------------
 1 file changed, 52 insertions(+), 57 deletions(-)

diff --git a/components/stylishStyle.js b/components/stylishStyle.js
index da6e4c4..e9782d3 100644
--- a/components/stylishStyle.js
+++ b/components/stylishStyle.js
@@ -100,8 +100,10 @@ Style.prototype = {
 		var connection = this.getConnection();
 		var statement = connection.createStatement("SELECT style_id FROM style_meta WHERE style_meta.name = :name AND style_meta.value = :value;");
 		try {
-			this.bind(statement, "name", name);
-			this.bind(statement, "value", value);
+			this.bind(statement, {
+				name: name,
+				value: value
+			});
 			var styles = [];
 			while (statement.executeStep()) {
 				// theoretically we shouldn't find a style that doesn't exist, but who knows?
@@ -208,7 +210,7 @@ Style.prototype = {
 		this.unregister();
 		var connection = this.getConnection();
 		var statement = connection.createStatement("DELETE FROM styles WHERE id = :id;");
-		this.bind(statement, "id", this.id);
+		this.bind(statement, {id: this.id});
 		try {
 			statement.execute();
 		} finally {
@@ -216,7 +218,7 @@ Style.prototype = {
 			statement.finalize();
 		}
 		var statement = connection.createStatement("DELETE FROM style_meta WHERE style_id = :id;");
-		this.bind(statement, "id", this.id);
+		this.bind(statement, {id: this.id});
 		try {
 			statement.execute();
 		} finally {
@@ -237,44 +239,43 @@ Style.prototype = {
 		var newStyle = this.id == 0;
 
 		var that = this;
-		function b(name, value) {
-			that.bind(statement, name, value);
-		}
+		var data = {};
 		if (this.id == 0) {
 			statement = connection.createStatement("INSERT INTO styles (`url`, `idUrl`, `updateUrl`, `md5Url`, `name`, `code`, `enabled`, `originalCode`, `applyBackgroundUpdates`, `originalMd5`) VALUES (:url, :idUrl, :updateUrl, :md5Url, :name, :code, :enabled, :originalCode, :applyBackgroundUpdates, :originalMd5);");
 		} else {
 			statement = connection.createStatement("UPDATE styles SET `url` = :url, `idUrl` = :idUrl, `updateUrl` = :updateUrl, `md5Url` = :md5Url, `name` = :name, `code` = :code, `enabled` = :enabled, `originalCode` = :originalCode, `applyBackgroundUpdates` = :applyBackgroundUpdates, `originalMd5` = :originalMd5 WHERE `id` = :id;");
-			b("id", this.id);
+			data.id = this.id;
 		}
 
 		// style is not updatable, original code is useless
 		if (!this.updateUrl && !this.md5Url) {
 			this.originalCode = null;
-			b("originalCode", this.originalCode);
+			data.originalCode = this.originalCode;
 		// original code matches current code, no need to remember original
 		} else if (this.originalCode == this.code) {
 			this.originalCode = null;
-			b("originalCode", this.originalCode);
+			data.originalCode = this.originalCode;
 		// original code exists and is different, don't touch
 		} else if (this.originalCode) {
-			b("originalCode", this.originalCode);
+			data.originalCode = this.originalCode;
 		// style has changed
 		} else if (this.lastSavedCode != this.code) {
 			this.originalCode = this.lastSavedCode;
-			b("originalCode", this.originalCode);
+			data.originalCode = this.originalCode;
 		} else {
-			b("originalCode", null);
+			data.originalCode = null;
 		}
 
-		b("url", this.url);
-		b("idUrl", this.idUrl);
-		b("updateUrl", this.updateUrl);
-		b("md5Url", this.md5Url);
-		b("name", this.name);
-		b("code", this.code);
-		b("enabled", this.enabled);
-		b("applyBackgroundUpdates", this.applyBackgroundUpdates);
-		b("originalMd5", this.originalMd5);
+		data.url = this.url;
+		data.idUrl = this.idUrl;
+		data.updateUrl = this.updateUrl;
+		data.md5Url = this.md5Url;
+		data.name = this.name;
+		data.code = this.code;
+		data.enabled = this.enabled;
+		data.applyBackgroundUpdates = this.applyBackgroundUpdates;
+		data.originalMd5 = this.originalMd5;
+		this.bind(statement, data);
 
 		try {
 			statement.execute();
@@ -305,16 +306,18 @@ Style.prototype = {
 				//delete the previous calculated meta data
 				if (!newStyle) {
 					statement = connection.createStatement("DELETE FROM style_meta WHERE style_id = :id;");
-					b("id", this.id);
+					this.bind(statement, {id: this.id});
 					statement.execute();
 					statement.finalize();
 				}
 
 				statement = connection.createStatement("INSERT INTO style_meta (`style_id`, `name`, `value`) VALUES (:id, :name, :value);");
 				this.meta.forEach(function(a) {
-					b("id", that.id);
-					b("name", a[0]);
-					b("value", a[1]);
+					that.bind(statement, {
+						id: that.id,
+						name: a[0],
+						value: a[1]
+					});
 					statement.execute();
 				});
 				connection.commitTransaction();
@@ -735,36 +738,30 @@ Style.prototype = {
 		this.appliedInfo = null;
 	},
 
-	bind: function(statement, name, value) {
-		var index;
-		try {
-			index = statement.getParameterIndex(":" + name);
-		} catch (ex) {
-			if (ex.name == "NS_ERROR_ILLEGAL_VALUE") {
-				index = statement.getParameterIndex(name);
-			} else {
-				throw ex;
-			}
-		}
-		if (value === undefined)
-			throw "Attempted to bind undefined parameter '" + name + "'";
-		else if (value === null)
-			statement.bindNullParameter(index);
-		else {
-			switch(typeof value) {
-				case "string":
-					statement.bindStringParameter(index, value);
-					break;
-				case "number":
-					statement.bindInt32Parameter(index, value);
-					break;
-				case "boolean":
-					statement.bindInt32Parameter(index, value ? 1 : 0);
-					break;
-				default:
-					throw "Unknown value type '" + typeof value + "' for value '" + value + "'";
+	bind: function(statement, data) {
+		let params = statement.newBindingParamsArray();
+		let binding = params.newBindingParams();
+		for (let [name, value] of Object.entries(data)) {
+			var index;
+			try {
+				index = statement.getParameterIndex(":" + name);
+			} catch (ex) {
+				if (ex.name == "NS_ERROR_ILLEGAL_VALUE") {
+					index = statement.getParameterIndex(name);
+				} else {
+					throw ex;
+				}
 			}
+			if (value === undefined)
+				throw "Attempted to bind undefined parameter '" + name + "'";
+			else if (value !== null && !["string", "number", "boolean"].includes(typeof value))
+				throw "Unknown value type '" + typeof value + "' for value '" + value + "'";
+			if (typeof value === "boolean")
+				value = +value;
+			binding.bindByIndex(index, value);
 		}
+		params.addParams(binding);
+    statement.bindParameters(params);
 	},
 
 	extract: function(statement, name) {
@@ -805,9 +802,7 @@ Style.prototype = {
 			closeConnection = true;
 		}
 		var statement = connection.createStatement(sql);
-		for (var i in parameters) {
-			this.bind(statement, i, parameters[i]);
-		}
+		this.bind(statement, parameters);
 		try {
 			var that = this;
 			var e = function (name) {