From b184d2f94dc40f07e1c857348264c0e3dbfcde3a Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 16 Nov 2017 19:22:08 +0600
Subject: [PATCH 001/229] dirty initial port of chrome caretbrowser extension

---
 qutebrowser/browser/webengine/webenginetab.py |    5 +-
 qutebrowser/javascript/axs_testing.js         | 2643 +++++++++++++++++
 qutebrowser/javascript/webengine_caret.js     | 2188 ++++++++++++++
 qutebrowser/keyinput/modeman.py               |    4 -
 4 files changed, 4835 insertions(+), 5 deletions(-)
 create mode 100644 qutebrowser/javascript/axs_testing.js
 create mode 100644 qutebrowser/javascript/webengine_caret.js

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 7339cd422..3a779f480 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -179,7 +179,8 @@ class WebEngineCaret(browsertab.AbstractCaret):
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_entered(self, mode):
-        pass
+        js_code = javascript.assemble('caret', 'setInitialCursor')
+        self._tab.run_js_async(js_code)
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
@@ -547,6 +548,8 @@ class WebEngineTab(browsertab.AbstractTab):
             'window._qutebrowser = {};',
             utils.read_file('javascript/scroll.js'),
             utils.read_file('javascript/webelem.js'),
+            utils.read_file('javascript/webengine_caret.js'),
+            utils.read_file('javascript/axs_testing.js'),
         ])
         script = QWebEngineScript()
         script.setInjectionPoint(QWebEngineScript.DocumentCreation)
diff --git a/qutebrowser/javascript/axs_testing.js b/qutebrowser/javascript/axs_testing.js
new file mode 100644
index 000000000..e6b1a3755
--- /dev/null
+++ b/qutebrowser/javascript/axs_testing.js
@@ -0,0 +1,2643 @@
+/*
+ * Copyright 2016 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/7d778f7da58af341a47b3a6f6457c2842b24d4d8
+ *
+ * See project README for build steps.
+ */
+
+// AUTO-GENERATED CONTENT BELOW: DO NOT EDIT! See above for details.
+
+var fn = (function() {
+  var COMPILED = !0, goog = goog || {};
+goog.global = this;
+goog.isDef = function(a) {
+  return void 0 !== a;
+};
+goog.exportPath_ = function(a, b, c) {
+  a = a.split(".");
+  c = c || goog.global;
+  a[0] in c || !c.execScript || c.execScript("var " + a[0]);
+  for (var d;a.length && (d = a.shift());) {
+    !a.length && goog.isDef(b) ? c[d] = b : c = c[d] ? c[d] : c[d] = {};
+  }
+};
+goog.define = function(a, b) {
+  var c = b;
+  COMPILED || (goog.global.CLOSURE_UNCOMPILED_DEFINES && Object.prototype.hasOwnProperty.call(goog.global.CLOSURE_UNCOMPILED_DEFINES, a) ? c = goog.global.CLOSURE_UNCOMPILED_DEFINES[a] : goog.global.CLOSURE_DEFINES && Object.prototype.hasOwnProperty.call(goog.global.CLOSURE_DEFINES, a) && (c = goog.global.CLOSURE_DEFINES[a]));
+  goog.exportPath_(a, c);
+};
+goog.DEBUG = !0;
+goog.LOCALE = "en";
+goog.TRUSTED_SITE = !0;
+goog.STRICT_MODE_COMPATIBLE = !1;
+goog.DISALLOW_TEST_ONLY_CODE = COMPILED && !goog.DEBUG;
+goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING = !1;
+goog.provide = function(a) {
+  if (goog.isInModuleLoader_()) {
+    throw Error("goog.provide can not be used within a goog.module.");
+  }
+  if (!COMPILED && goog.isProvided_(a)) {
+    throw Error('Namespace "' + a + '" already declared.');
+  }
+  goog.constructNamespace_(a);
+};
+goog.constructNamespace_ = function(a, b) {
+  if (!COMPILED) {
+    delete goog.implicitNamespaces_[a];
+    for (var c = a;(c = c.substring(0, c.lastIndexOf("."))) && !goog.getObjectByName(c);) {
+      goog.implicitNamespaces_[c] = !0;
+    }
+  }
+  goog.exportPath_(a, b);
+};
+goog.VALID_MODULE_RE_ = /^[a-zA-Z_$][a-zA-Z0-9._$]*$/;
+goog.module = function(a) {
+  if (!goog.isString(a) || !a || -1 == a.search(goog.VALID_MODULE_RE_)) {
+    throw Error("Invalid module identifier");
+  }
+  if (!goog.isInModuleLoader_()) {
+    throw Error("Module " + a + " has been loaded incorrectly.");
+  }
+  if (goog.moduleLoaderState_.moduleName) {
+    throw Error("goog.module may only be called once per module.");
+  }
+  goog.moduleLoaderState_.moduleName = a;
+  if (!COMPILED) {
+    if (goog.isProvided_(a)) {
+      throw Error('Namespace "' + a + '" already declared.');
+    }
+    delete goog.implicitNamespaces_[a];
+  }
+};
+goog.module.get = function(a) {
+  return goog.module.getInternal_(a);
+};
+goog.module.getInternal_ = function(a) {
+  if (!COMPILED) {
+    return goog.isProvided_(a) ? a in goog.loadedModules_ ? goog.loadedModules_[a] : goog.getObjectByName(a) : null;
+  }
+};
+goog.moduleLoaderState_ = null;
+goog.isInModuleLoader_ = function() {
+  return null != goog.moduleLoaderState_;
+};
+goog.module.declareLegacyNamespace = function() {
+  if (!COMPILED && !goog.isInModuleLoader_()) {
+    throw Error("goog.module.declareLegacyNamespace must be called from within a goog.module");
+  }
+  if (!COMPILED && !goog.moduleLoaderState_.moduleName) {
+    throw Error("goog.module must be called prior to goog.module.declareLegacyNamespace.");
+  }
+  goog.moduleLoaderState_.declareLegacyNamespace = !0;
+};
+goog.setTestOnly = function(a) {
+  if (goog.DISALLOW_TEST_ONLY_CODE) {
+    throw a = a || "", Error("Importing test-only code into non-debug environment" + (a ? ": " + a : "."));
+  }
+};
+goog.forwardDeclare = function(a) {
+};
+COMPILED || (goog.isProvided_ = function(a) {
+  return a in goog.loadedModules_ || !goog.implicitNamespaces_[a] && goog.isDefAndNotNull(goog.getObjectByName(a));
+}, goog.implicitNamespaces_ = {"goog.module":!0});
+goog.getObjectByName = function(a, b) {
+  for (var c = a.split("."), d = b || goog.global, e;e = c.shift();) {
+    if (goog.isDefAndNotNull(d[e])) {
+      d = d[e];
+    } else {
+      return null;
+    }
+  }
+  return d;
+};
+goog.globalize = function(a, b) {
+  var c = b || goog.global, d;
+  for (d in a) {
+    c[d] = a[d];
+  }
+};
+goog.addDependency = function(a, b, c, d) {
+  if (goog.DEPENDENCIES_ENABLED) {
+    var e;
+    a = a.replace(/\\/g, "/");
+    var f = goog.dependencies_;
+    d && "boolean" !== typeof d || (d = d ? {module:"goog"} : {});
+    for (var g = 0;e = b[g];g++) {
+      f.nameToPath[e] = a, f.loadFlags[a] = d;
+    }
+    for (d = 0;b = c[d];d++) {
+      a in f.requires || (f.requires[a] = {}), f.requires[a][b] = !0;
+    }
+  }
+};
+goog.ENABLE_DEBUG_LOADER = !0;
+goog.logToConsole_ = function(a) {
+  goog.global.console && goog.global.console.error(a);
+};
+goog.require = function(a) {
+  if (!COMPILED) {
+    goog.ENABLE_DEBUG_LOADER && goog.IS_OLD_IE_ && goog.maybeProcessDeferredDep_(a);
+    if (goog.isProvided_(a)) {
+      return goog.isInModuleLoader_() ? goog.module.getInternal_(a) : null;
+    }
+    if (goog.ENABLE_DEBUG_LOADER) {
+      var b = goog.getPathFromDeps_(a);
+      if (b) {
+        return goog.writeScripts_(b), null;
+      }
+    }
+    a = "goog.require could not find: " + a;
+    goog.logToConsole_(a);
+    throw Error(a);
+  }
+};
+goog.basePath = "";
+goog.nullFunction = function() {
+};
+goog.abstractMethod = function() {
+  throw Error("unimplemented abstract method");
+};
+goog.addSingletonGetter = function(a) {
+  a.getInstance = function() {
+    if (a.instance_) {
+      return a.instance_;
+    }
+    goog.DEBUG && (goog.instantiatedSingletons_[goog.instantiatedSingletons_.length] = a);
+    return a.instance_ = new a;
+  };
+};
+goog.instantiatedSingletons_ = [];
+goog.LOAD_MODULE_USING_EVAL = !0;
+goog.SEAL_MODULE_EXPORTS = goog.DEBUG;
+goog.loadedModules_ = {};
+goog.DEPENDENCIES_ENABLED = !COMPILED && goog.ENABLE_DEBUG_LOADER;
+goog.ALWAYS_TRANSPILE = !1;
+goog.NEVER_TRANSPILE = !1;
+goog.DEPENDENCIES_ENABLED && (goog.dependencies_ = {loadFlags:{}, nameToPath:{}, requires:{}, visited:{}, written:{}, deferred:{}}, goog.inHtmlDocument_ = function() {
+  var a = goog.global.document;
+  return null != a && "write" in a;
+}, goog.findBasePath_ = function() {
+  if (goog.isDef(goog.global.CLOSURE_BASE_PATH)) {
+    goog.basePath = goog.global.CLOSURE_BASE_PATH;
+  } else {
+    if (goog.inHtmlDocument_()) {
+      for (var a = goog.global.document.getElementsByTagName("SCRIPT"), b = a.length - 1;0 <= b;--b) {
+        var c = a[b].src, d = c.lastIndexOf("?"), d = -1 == d ? c.length : d;
+        if ("base.js" == c.substr(d - 7, 7)) {
+          goog.basePath = c.substr(0, d - 7);
+          break;
+        }
+      }
+    }
+  }
+}, goog.importScript_ = function(a, b) {
+  (goog.global.CLOSURE_IMPORT_SCRIPT || goog.writeScriptTag_)(a, b) && (goog.dependencies_.written[a] = !0);
+}, goog.IS_OLD_IE_ = !(goog.global.atob || !goog.global.document || !goog.global.document.all), goog.importProcessedScript_ = function(a, b, c) {
+  goog.importScript_("", 'goog.retrieveAndExec_("' + a + '", ' + b + ", " + c + ");");
+}, goog.queuedModules_ = [], goog.wrapModule_ = function(a, b) {
+  return goog.LOAD_MODULE_USING_EVAL && goog.isDef(goog.global.JSON) ? "goog.loadModule(" + goog.global.JSON.stringify(b + "\n//# sourceURL=" + a + "\n") + ");" : 'goog.loadModule(function(exports) {"use strict";' + b + "\n;return exports});\n//# sourceURL=" + a + "\n";
+}, goog.loadQueuedModules_ = function() {
+  var a = goog.queuedModules_.length;
+  if (0 < a) {
+    var b = goog.queuedModules_;
+    goog.queuedModules_ = [];
+    for (var c = 0;c < a;c++) {
+      goog.maybeProcessDeferredPath_(b[c]);
+    }
+  }
+}, goog.maybeProcessDeferredDep_ = function(a) {
+  goog.isDeferredModule_(a) && goog.allDepsAreAvailable_(a) && (a = goog.getPathFromDeps_(a), goog.maybeProcessDeferredPath_(goog.basePath + a));
+}, goog.isDeferredModule_ = function(a) {
+  var b = (a = goog.getPathFromDeps_(a)) && goog.dependencies_.loadFlags[a] || {};
+  return a && ("goog" == b.module || goog.needsTranspile_(b.lang)) ? goog.basePath + a in goog.dependencies_.deferred : !1;
+}, goog.allDepsAreAvailable_ = function(a) {
+  if ((a = goog.getPathFromDeps_(a)) && a in goog.dependencies_.requires) {
+    for (var b in goog.dependencies_.requires[a]) {
+      if (!goog.isProvided_(b) && !goog.isDeferredModule_(b)) {
+        return !1;
+      }
+    }
+  }
+  return !0;
+}, goog.maybeProcessDeferredPath_ = function(a) {
+  if (a in goog.dependencies_.deferred) {
+    var b = goog.dependencies_.deferred[a];
+    delete goog.dependencies_.deferred[a];
+    goog.globalEval(b);
+  }
+}, goog.loadModuleFromUrl = function(a) {
+  goog.retrieveAndExec_(a, !0, !1);
+}, goog.loadModule = function(a) {
+  var b = goog.moduleLoaderState_;
+  try {
+    goog.moduleLoaderState_ = {moduleName:void 0, declareLegacyNamespace:!1};
+    var c;
+    if (goog.isFunction(a)) {
+      c = a.call(goog.global, {});
+    } else {
+      if (goog.isString(a)) {
+        c = goog.loadModuleFromSource_.call(goog.global, a);
+      } else {
+        throw Error("Invalid module definition");
+      }
+    }
+    var d = goog.moduleLoaderState_.moduleName;
+    if (!goog.isString(d) || !d) {
+      throw Error('Invalid module name "' + d + '"');
+    }
+    goog.moduleLoaderState_.declareLegacyNamespace ? goog.constructNamespace_(d, c) : goog.SEAL_MODULE_EXPORTS && Object.seal && Object.seal(c);
+    goog.loadedModules_[d] = c;
+  } finally {
+    goog.moduleLoaderState_ = b;
+  }
+}, goog.loadModuleFromSource_ = function(a) {
+  eval(a);
+  return {};
+}, goog.writeScriptSrcNode_ = function(a) {
+  goog.global.document.write('<script type="text/javascript" src="' + a + '">\x3c/script>');
+}, goog.appendScriptSrcNode_ = function(a) {
+  var b = goog.global.document, c = b.createElement("script");
+  c.type = "text/javascript";
+  c.src = a;
+  c.defer = !1;
+  c.async = !1;
+  b.head.appendChild(c);
+}, goog.writeScriptTag_ = function(a, b) {
+  if (goog.inHtmlDocument_()) {
+    var c = goog.global.document;
+    if (!goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING && "complete" == c.readyState) {
+      if (/\bdeps.js$/.test(a)) {
+        return !1;
+      }
+      throw Error('Cannot write "' + a + '" after document load');
+    }
+    if (void 0 === b) {
+      if (goog.IS_OLD_IE_) {
+        var d = " onreadystatechange='goog.onScriptLoad_(this, " + ++goog.lastNonModuleScriptIndex_ + ")' ";
+        c.write('<script type="text/javascript" src="' + a + '"' + d + ">\x3c/script>");
+      } else {
+        goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING ? goog.appendScriptSrcNode_(a) : goog.writeScriptSrcNode_(a);
+      }
+    } else {
+      c.write('<script type="text/javascript">' + b + "\x3c/script>");
+    }
+    return !0;
+  }
+  return !1;
+}, goog.needsTranspile_ = function(a) {
+  if (goog.ALWAYS_TRANSPILE) {
+    return !0;
+  }
+  if (goog.NEVER_TRANSPILE) {
+    return !1;
+  }
+  if (!goog.transpiledLanguages_) {
+    goog.transpiledLanguages_ = {es5:!0, es6:!0, "es6-impl":!0};
+    try {
+      goog.transpiledLanguages_.es5 = eval("[1,].length!=1"), eval('(()=>{"use strict";let a={};const X=class{constructor(){}x(z){return new Map([...arguments]).get(z[0])==3}};return new X().x([a,3])})()') && (goog.transpiledLanguages_["es6-impl"] = !1), eval('(()=>{"use strict";class X{constructor(){if(new.target!=String)throw 1;this.x=42}}let q=Reflect.construct(X,[],String);if(q.x!=42||!(q instanceof String))throw 1;for(const a of[2,3]){if(a==2)continue;function f(z={a}){let a=0;return z.a}{function f(){return 0;}}return f()==3}})()') && 
+      (goog.transpiledLanguages_.es6 = !1);
+    } catch (b) {
+    }
+  }
+  return !!goog.transpiledLanguages_[a];
+}, goog.transpiledLanguages_ = null, goog.lastNonModuleScriptIndex_ = 0, goog.onScriptLoad_ = function(a, b) {
+  "complete" == a.readyState && goog.lastNonModuleScriptIndex_ == b && goog.loadQueuedModules_();
+  return !0;
+}, goog.writeScripts_ = function(a) {
+  function b(a) {
+    if (!(a in e.written || a in e.visited)) {
+      e.visited[a] = !0;
+      if (a in e.requires) {
+        for (var f in e.requires[a]) {
+          if (!goog.isProvided_(f)) {
+            if (f in e.nameToPath) {
+              b(e.nameToPath[f]);
+            } else {
+              throw Error("Undefined nameToPath for " + f);
+            }
+          }
+        }
+      }
+      a in d || (d[a] = !0, c.push(a));
+    }
+  }
+  var c = [], d = {}, e = goog.dependencies_;
+  b(a);
+  for (a = 0;a < c.length;a++) {
+    var f = c[a];
+    goog.dependencies_.written[f] = !0;
+  }
+  var g = goog.moduleLoaderState_;
+  goog.moduleLoaderState_ = null;
+  for (a = 0;a < c.length;a++) {
+    if (f = c[a]) {
+      var h = e.loadFlags[f] || {}, k = goog.needsTranspile_(h.lang);
+      "goog" == h.module || k ? goog.importProcessedScript_(goog.basePath + f, "goog" == h.module, k) : goog.importScript_(goog.basePath + f);
+    } else {
+      throw goog.moduleLoaderState_ = g, Error("Undefined script input");
+    }
+  }
+  goog.moduleLoaderState_ = g;
+}, goog.getPathFromDeps_ = function(a) {
+  return a in goog.dependencies_.nameToPath ? goog.dependencies_.nameToPath[a] : null;
+}, goog.findBasePath_(), goog.global.CLOSURE_NO_DEPS || goog.importScript_(goog.basePath + "deps.js"));
+goog.normalizePath_ = function(a) {
+  a = a.split("/");
+  for (var b = 0;b < a.length;) {
+    "." == a[b] ? a.splice(b, 1) : b && ".." == a[b] && a[b - 1] && ".." != a[b - 1] ? a.splice(--b, 2) : b++;
+  }
+  return a.join("/");
+};
+goog.loadFileSync_ = function(a) {
+  if (goog.global.CLOSURE_LOAD_FILE_SYNC) {
+    return goog.global.CLOSURE_LOAD_FILE_SYNC(a);
+  }
+  try {
+    var b = new goog.global.XMLHttpRequest;
+    b.open("get", a, !1);
+    b.send();
+    return 0 == b.status || 200 == b.status ? b.responseText : null;
+  } catch (c) {
+    return null;
+  }
+};
+goog.retrieveAndExec_ = function(a, b, c) {
+  if (!COMPILED) {
+    var d = a;
+    a = goog.normalizePath_(a);
+    var e = goog.global.CLOSURE_IMPORT_SCRIPT || goog.writeScriptTag_, f = goog.loadFileSync_(a);
+    if (null == f) {
+      throw Error('Load of "' + a + '" failed');
+    }
+    c && (f = goog.transpile_.call(goog.global, f, a));
+    f = b ? goog.wrapModule_(a, f) : f + ("\n//# sourceURL=" + a);
+    goog.IS_OLD_IE_ ? (goog.dependencies_.deferred[d] = f, goog.queuedModules_.push(d)) : e(a, f);
+  }
+};
+goog.transpile_ = function(a, b) {
+  var c = goog.global.$jscomp;
+  c || (goog.global.$jscomp = c = {});
+  var d = c.transpile;
+  if (!d) {
+    var e = goog.basePath + "transpile.js", f = goog.loadFileSync_(e);
+    f && (eval(f + "\n//# sourceURL=" + e), c = goog.global.$jscomp, d = c.transpile);
+  }
+  d || (d = c.transpile = function(a, b) {
+    goog.logToConsole_(b + " requires transpilation but no transpiler was found.");
+    return a;
+  });
+  return d(a, b);
+};
+goog.typeOf = function(a) {
+  var b = typeof a;
+  if ("object" == b) {
+    if (a) {
+      if (a instanceof Array) {
+        return "array";
+      }
+      if (a instanceof Object) {
+        return b;
+      }
+      var c = Object.prototype.toString.call(a);
+      if ("[object Window]" == c) {
+        return "object";
+      }
+      if ("[object Array]" == c || "number" == typeof a.length && "undefined" != typeof a.splice && "undefined" != typeof a.propertyIsEnumerable && !a.propertyIsEnumerable("splice")) {
+        return "array";
+      }
+      if ("[object Function]" == c || "undefined" != typeof a.call && "undefined" != typeof a.propertyIsEnumerable && !a.propertyIsEnumerable("call")) {
+        return "function";
+      }
+    } else {
+      return "null";
+    }
+  } else {
+    if ("function" == b && "undefined" == typeof a.call) {
+      return "object";
+    }
+  }
+  return b;
+};
+goog.isNull = function(a) {
+  return null === a;
+};
+goog.isDefAndNotNull = function(a) {
+  return null != a;
+};
+goog.isArray = function(a) {
+  return "array" == goog.typeOf(a);
+};
+goog.isArrayLike = function(a) {
+  var b = goog.typeOf(a);
+  return "array" == b || "object" == b && "number" == typeof a.length;
+};
+goog.isDateLike = function(a) {
+  return goog.isObject(a) && "function" == typeof a.getFullYear;
+};
+goog.isString = function(a) {
+  return "string" == typeof a;
+};
+goog.isBoolean = function(a) {
+  return "boolean" == typeof a;
+};
+goog.isNumber = function(a) {
+  return "number" == typeof a;
+};
+goog.isFunction = function(a) {
+  return "function" == goog.typeOf(a);
+};
+goog.isObject = function(a) {
+  var b = typeof a;
+  return "object" == b && null != a || "function" == b;
+};
+goog.getUid = function(a) {
+  return a[goog.UID_PROPERTY_] || (a[goog.UID_PROPERTY_] = ++goog.uidCounter_);
+};
+goog.hasUid = function(a) {
+  return !!a[goog.UID_PROPERTY_];
+};
+goog.removeUid = function(a) {
+  null !== a && "removeAttribute" in a && a.removeAttribute(goog.UID_PROPERTY_);
+  try {
+    delete a[goog.UID_PROPERTY_];
+  } catch (b) {
+  }
+};
+goog.UID_PROPERTY_ = "closure_uid_" + (1E9 * Math.random() >>> 0);
+goog.uidCounter_ = 0;
+goog.getHashCode = goog.getUid;
+goog.removeHashCode = goog.removeUid;
+goog.cloneObject = function(a) {
+  var b = goog.typeOf(a);
+  if ("object" == b || "array" == b) {
+    if (a.clone) {
+      return a.clone();
+    }
+    var b = "array" == b ? [] : {}, c;
+    for (c in a) {
+      b[c] = goog.cloneObject(a[c]);
+    }
+    return b;
+  }
+  return a;
+};
+goog.bindNative_ = function(a, b, c) {
+  return a.call.apply(a.bind, arguments);
+};
+goog.bindJs_ = function(a, b, c) {
+  if (!a) {
+    throw Error();
+  }
+  if (2 < arguments.length) {
+    var d = Array.prototype.slice.call(arguments, 2);
+    return function() {
+      var c = Array.prototype.slice.call(arguments);
+      Array.prototype.unshift.apply(c, d);
+      return a.apply(b, c);
+    };
+  }
+  return function() {
+    return a.apply(b, arguments);
+  };
+};
+goog.bind = function(a, b, c) {
+  Function.prototype.bind && -1 != Function.prototype.bind.toString().indexOf("native code") ? goog.bind = goog.bindNative_ : goog.bind = goog.bindJs_;
+  return goog.bind.apply(null, arguments);
+};
+goog.partial = function(a, b) {
+  var c = Array.prototype.slice.call(arguments, 1);
+  return function() {
+    var b = c.slice();
+    b.push.apply(b, arguments);
+    return a.apply(this, b);
+  };
+};
+goog.mixin = function(a, b) {
+  for (var c in b) {
+    a[c] = b[c];
+  }
+};
+goog.now = goog.TRUSTED_SITE && Date.now || function() {
+  return +new Date;
+};
+goog.globalEval = function(a) {
+  if (goog.global.execScript) {
+    goog.global.execScript(a, "JavaScript");
+  } else {
+    if (goog.global.eval) {
+      if (null == goog.evalWorksForGlobals_) {
+        if (goog.global.eval("var _evalTest_ = 1;"), "undefined" != typeof goog.global._evalTest_) {
+          try {
+            delete goog.global._evalTest_;
+          } catch (d) {
+          }
+          goog.evalWorksForGlobals_ = !0;
+        } else {
+          goog.evalWorksForGlobals_ = !1;
+        }
+      }
+      if (goog.evalWorksForGlobals_) {
+        goog.global.eval(a);
+      } else {
+        var b = goog.global.document, c = b.createElement("SCRIPT");
+        c.type = "text/javascript";
+        c.defer = !1;
+        c.appendChild(b.createTextNode(a));
+        b.body.appendChild(c);
+        b.body.removeChild(c);
+      }
+    } else {
+      throw Error("goog.globalEval not available");
+    }
+  }
+};
+goog.evalWorksForGlobals_ = null;
+goog.getCssName = function(a, b) {
+  var c = function(a) {
+    return goog.cssNameMapping_[a] || a;
+  }, d = function(a) {
+    a = a.split("-");
+    for (var b = [], d = 0;d < a.length;d++) {
+      b.push(c(a[d]));
+    }
+    return b.join("-");
+  }, d = goog.cssNameMapping_ ? "BY_WHOLE" == goog.cssNameMappingStyle_ ? c : d : function(a) {
+    return a;
+  };
+  return b ? a + "-" + d(b) : d(a);
+};
+goog.setCssNameMapping = function(a, b) {
+  goog.cssNameMapping_ = a;
+  goog.cssNameMappingStyle_ = b;
+};
+!COMPILED && goog.global.CLOSURE_CSS_NAME_MAPPING && (goog.cssNameMapping_ = goog.global.CLOSURE_CSS_NAME_MAPPING);
+goog.getMsg = function(a, b) {
+  b && (a = a.replace(/\{\$([^}]+)}/g, function(a, d) {
+    return null != b && d in b ? b[d] : a;
+  }));
+  return a;
+};
+goog.getMsgWithFallback = function(a, b) {
+  return a;
+};
+goog.exportSymbol = function(a, b, c) {
+  goog.exportPath_(a, b, c);
+};
+goog.exportProperty = function(a, b, c) {
+  a[b] = c;
+};
+goog.inherits = function(a, b) {
+  function c() {
+  }
+  c.prototype = b.prototype;
+  a.superClass_ = b.prototype;
+  a.prototype = new c;
+  a.prototype.constructor = a;
+  a.base = function(a, c, f) {
+    for (var g = Array(arguments.length - 2), h = 2;h < arguments.length;h++) {
+      g[h - 2] = arguments[h];
+    }
+    return b.prototype[c].apply(a, g);
+  };
+};
+goog.base = function(a, b, c) {
+  var d = arguments.callee.caller;
+  if (goog.STRICT_MODE_COMPATIBLE || goog.DEBUG && !d) {
+    throw Error("arguments.caller not defined.  goog.base() cannot be used with strict mode code. See http://www.ecma-international.org/ecma-262/5.1/#sec-C");
+  }
+  if (d.superClass_) {
+    for (var e = Array(arguments.length - 1), f = 1;f < arguments.length;f++) {
+      e[f - 1] = arguments[f];
+    }
+    return d.superClass_.constructor.apply(a, e);
+  }
+  e = Array(arguments.length - 2);
+  for (f = 2;f < arguments.length;f++) {
+    e[f - 2] = arguments[f];
+  }
+  for (var f = !1, g = a.constructor;g;g = g.superClass_ && g.superClass_.constructor) {
+    if (g.prototype[b] === d) {
+      f = !0;
+    } else {
+      if (f) {
+        return g.prototype[b].apply(a, e);
+      }
+    }
+  }
+  if (a[b] === d) {
+    return a.constructor.prototype[b].apply(a, e);
+  }
+  throw Error("goog.base called from a method of one name to a method of a different name");
+};
+goog.scope = function(a) {
+  if (goog.isInModuleLoader_()) {
+    throw Error("goog.scope is not supported within a goog.module.");
+  }
+  a.call(goog.global);
+};
+COMPILED || (goog.global.COMPILED = COMPILED);
+goog.defineClass = function(a, b) {
+  var c = b.constructor, d = b.statics;
+  c && c != Object.prototype.constructor || (c = function() {
+    throw Error("cannot instantiate an interface (no constructor defined).");
+  });
+  c = goog.defineClass.createSealingConstructor_(c, a);
+  a && goog.inherits(c, a);
+  delete b.constructor;
+  delete b.statics;
+  goog.defineClass.applyProperties_(c.prototype, b);
+  null != d && (d instanceof Function ? d(c) : goog.defineClass.applyProperties_(c, d));
+  return c;
+};
+goog.defineClass.SEAL_CLASS_INSTANCES = goog.DEBUG;
+goog.defineClass.createSealingConstructor_ = function(a, b) {
+  if (!goog.defineClass.SEAL_CLASS_INSTANCES) {
+    return a;
+  }
+  var c = !goog.defineClass.isUnsealable_(b), d = function() {
+    var b = a.apply(this, arguments) || this;
+    b[goog.UID_PROPERTY_] = b[goog.UID_PROPERTY_];
+    this.constructor === d && c && Object.seal instanceof Function && Object.seal(b);
+    return b;
+  };
+  return d;
+};
+goog.defineClass.isUnsealable_ = function(a) {
+  return a && a.prototype && a.prototype[goog.UNSEALABLE_CONSTRUCTOR_PROPERTY_];
+};
+goog.defineClass.OBJECT_PROTOTYPE_FIELDS_ = "constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" ");
+goog.defineClass.applyProperties_ = function(a, b) {
+  for (var c in b) {
+    Object.prototype.hasOwnProperty.call(b, c) && (a[c] = b[c]);
+  }
+  for (var d = 0;d < goog.defineClass.OBJECT_PROTOTYPE_FIELDS_.length;d++) {
+    c = goog.defineClass.OBJECT_PROTOTYPE_FIELDS_[d], Object.prototype.hasOwnProperty.call(b, c) && (a[c] = b[c]);
+  }
+};
+goog.tagUnsealableClass = function(a) {
+  !COMPILED && goog.defineClass.SEAL_CLASS_INSTANCES && (a.prototype[goog.UNSEALABLE_CONSTRUCTOR_PROPERTY_] = !0);
+};
+goog.UNSEALABLE_CONSTRUCTOR_PROPERTY_ = "goog_defineClass_legacy_unsealable";
+var axs = {};
+axs.browserUtils = {};
+axs.browserUtils.matchSelector = function(a, b) {
+  return a.matches ? a.matches(b) : a.webkitMatchesSelector ? a.webkitMatchesSelector(b) : a.mozMatchesSelector ? a.mozMatchesSelector(b) : a.msMatchesSelector ? a.msMatchesSelector(b) : !1;
+};
+axs.constants = {};
+axs.constants.ARIA_ROLES = {alert:{namefrom:["author"], parent:["region"]}, alertdialog:{namefrom:["author"], namerequired:!0, parent:["alert", "dialog"]}, application:{namefrom:["author"], namerequired:!0, parent:["landmark"]}, article:{namefrom:["author"], parent:["document", "region"]}, banner:{namefrom:["author"], parent:["landmark"]}, button:{childpresentational:!0, namefrom:["contents", "author"], namerequired:!0, parent:["command"], properties:["aria-expanded", "aria-pressed"]}, checkbox:{namefrom:["contents", 
+"author"], namerequired:!0, parent:["input"], requiredProperties:["aria-checked"], properties:["aria-checked"]}, columnheader:{namefrom:["contents", "author"], namerequired:!0, parent:["gridcell", "sectionhead", "widget"], properties:["aria-sort"], scope:["row"]}, combobox:{mustcontain:["listbox", "textbox"], namefrom:["author"], namerequired:!0, parent:["select"], requiredProperties:["aria-expanded"], properties:["aria-expanded", "aria-autocomplete", "aria-required"]}, command:{"abstract":!0, namefrom:["author"], 
+parent:["widget"]}, complementary:{namefrom:["author"], parent:["landmark"]}, composite:{"abstract":!0, childpresentational:!1, namefrom:["author"], parent:["widget"], properties:["aria-activedescendant"]}, contentinfo:{namefrom:["author"], parent:["landmark"]}, definition:{namefrom:["author"], parent:["section"]}, dialog:{namefrom:["author"], namerequired:!0, parent:["window"]}, directory:{namefrom:["contents", "author"], parent:["list"]}, document:{namefrom:[" author"], namerequired:!0, parent:["structure"], 
+properties:["aria-expanded"]}, form:{namefrom:["author"], parent:["landmark"]}, grid:{mustcontain:["row", "rowgroup"], namefrom:["author"], namerequired:!0, parent:["composite", "region"], properties:["aria-level", "aria-multiselectable", "aria-readonly"]}, gridcell:{namefrom:["contents", "author"], namerequired:!0, parent:["section", "widget"], properties:["aria-readonly", "aria-required", "aria-selected"], scope:["row"]}, group:{namefrom:[" author"], parent:["section"], properties:["aria-activedescendant"]}, 
+heading:{namerequired:!0, parent:["sectionhead"], properties:["aria-level"]}, img:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["section"]}, input:{"abstract":!0, namefrom:["author"], parent:["widget"]}, landmark:{"abstract":!0, namefrom:["contents", "author"], namerequired:!1, parent:["region"]}, link:{namefrom:["contents", "author"], namerequired:!0, parent:["command"], properties:["aria-expanded"]}, list:{mustcontain:["group", "listitem"], namefrom:["author"], parent:["region"]}, 
+listbox:{mustcontain:["option"], namefrom:["author"], namerequired:!0, parent:["list", "select"], properties:["aria-multiselectable", "aria-required"]}, listitem:{namefrom:["contents", "author"], namerequired:!0, parent:["section"], properties:["aria-level", "aria-posinset", "aria-setsize"], scope:["list"]}, log:{namefrom:[" author"], namerequired:!0, parent:["region"]}, main:{namefrom:["author"], parent:["landmark"]}, marquee:{namerequired:!0, parent:["section"]}, math:{childpresentational:!0, namefrom:["author"], 
+parent:["section"]}, menu:{mustcontain:["group", "menuitemradio", "menuitem", "menuitemcheckbox"], namefrom:["author"], namerequired:!0, parent:["list", "select"]}, menubar:{namefrom:["author"], parent:["menu"]}, menuitem:{namefrom:["contents", "author"], namerequired:!0, parent:["command"], scope:["menu", "menubar"]}, menuitemcheckbox:{namefrom:["contents", "author"], namerequired:!0, parent:["checkbox", "menuitem"], scope:["menu", "menubar"]}, menuitemradio:{namefrom:["contents", "author"], namerequired:!0, 
+parent:["menuitemcheckbox", "radio"], scope:["menu", "menubar"]}, navigation:{namefrom:["author"], parent:["landmark"]}, note:{namefrom:["author"], parent:["section"]}, option:{namefrom:["contents", "author"], namerequired:!0, parent:["input"], properties:["aria-checked", "aria-posinset", "aria-selected", "aria-setsize"]}, presentation:{parent:["structure"]}, progressbar:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["range"]}, radio:{namefrom:["contents", "author"], namerequired:!0, 
+parent:["checkbox", "option"]}, radiogroup:{mustcontain:["radio"], namefrom:["author"], namerequired:!0, parent:["select"], properties:["aria-required"]}, range:{"abstract":!0, namefrom:["author"], parent:["widget"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-valuetext"]}, region:{namefrom:[" author"], parent:["section"]}, roletype:{"abstract":!0, properties:"aria-atomic aria-busy aria-controls aria-describedby aria-disabled aria-dropeffect aria-flowto aria-grabbed aria-haspopup aria-hidden aria-invalid aria-label aria-labelledby aria-live aria-owns aria-relevant".split(" ")}, 
+row:{mustcontain:["columnheader", "gridcell", "rowheader"], namefrom:["contents", "author"], parent:["group", "widget"], properties:["aria-level", "aria-selected"], scope:["grid", "rowgroup", "treegrid"]}, rowgroup:{mustcontain:["row"], namefrom:["contents", "author"], parent:["group"], scope:["grid"]}, rowheader:{namefrom:["contents", "author"], namerequired:!0, parent:["gridcell", "sectionhead", "widget"], properties:["aria-sort"], scope:["row"]}, search:{namefrom:["author"], parent:["landmark"]}, 
+section:{"abstract":!0, namefrom:["contents", "author"], parent:["structure"], properties:["aria-expanded"]}, sectionhead:{"abstract":!0, namefrom:["contents", "author"], parent:["structure"], properties:["aria-expanded"]}, select:{"abstract":!0, namefrom:["author"], parent:["composite", "group", "input"]}, separator:{childpresentational:!0, namefrom:["author"], parent:["structure"], properties:["aria-expanded", "aria-orientation"]}, scrollbar:{childpresentational:!0, namefrom:["author"], namerequired:!1, 
+parent:["input", "range"], requiredProperties:["aria-controls", "aria-orientation", "aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-controls", "aria-orientation", "aria-valuemax", "aria-valuemin", "aria-valuenow"]}, slider:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["input", "range"], requiredProperties:["aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-orientation"]}, spinbutton:{namefrom:["author"], 
+namerequired:!0, parent:["input", "range"], requiredProperties:["aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-required"]}, status:{parent:["region"]}, structure:{"abstract":!0, parent:["roletype"]}, tab:{namefrom:["contents", "author"], parent:["sectionhead", "widget"], properties:["aria-selected"], scope:["tablist"]}, tablist:{mustcontain:["tab"], namefrom:["author"], parent:["composite", "directory"], properties:["aria-level"]}, 
+tabpanel:{namefrom:["author"], namerequired:!0, parent:["region"]}, textbox:{namefrom:["author"], namerequired:!0, parent:["input"], properties:["aria-activedescendant", "aria-autocomplete", "aria-multiline", "aria-readonly", "aria-required"]}, timer:{namefrom:["author"], namerequired:!0, parent:["status"]}, toolbar:{namefrom:["author"], parent:["group"]}, tooltip:{namerequired:!0, parent:["section"]}, tree:{mustcontain:["group", "treeitem"], namefrom:["author"], namerequired:!0, parent:["select"], 
+properties:["aria-multiselectable", "aria-required"]}, treegrid:{mustcontain:["row"], namefrom:["author"], namerequired:!0, parent:["grid", "tree"]}, treeitem:{namefrom:["contents", "author"], namerequired:!0, parent:["listitem", "option"], scope:["group", "tree"]}, widget:{"abstract":!0, parent:["roletype"]}, window:{"abstract":!0, namefrom:[" author"], parent:["roletype"], properties:["aria-expanded"]}};
+axs.constants.WIDGET_ROLES = {};
+axs.constants.addAllParentRolesToSet_ = function(a, b) {
+  if (a.parent) {
+    for (var c = a.parent, d = 0;d < c.length;d++) {
+      var e = c[d];
+      b[e] = !0;
+      axs.constants.addAllParentRolesToSet_(axs.constants.ARIA_ROLES[e], b);
+    }
+  }
+};
+axs.constants.addAllPropertiesToSet_ = function(a, b, c) {
+  var d = a[b];
+  if (d) {
+    for (var e = 0;e < d.length;e++) {
+      c[d[e]] = !0;
+    }
+  }
+  if (a.parent) {
+    for (a = a.parent, d = 0;d < a.length;d++) {
+      axs.constants.addAllPropertiesToSet_(axs.constants.ARIA_ROLES[a[d]], b, c);
+    }
+  }
+};
+for (var roleName in axs.constants.ARIA_ROLES) {
+  var role = axs.constants.ARIA_ROLES[roleName], propertiesSet = {};
+  axs.constants.addAllPropertiesToSet_(role, "properties", propertiesSet);
+  role.propertiesSet = propertiesSet;
+  var requiredPropertiesSet = {};
+  axs.constants.addAllPropertiesToSet_(role, "requiredProperties", requiredPropertiesSet);
+  role.requiredPropertiesSet = requiredPropertiesSet;
+  var parentRolesSet = {};
+  axs.constants.addAllParentRolesToSet_(role, parentRolesSet);
+  role.allParentRolesSet = parentRolesSet;
+  "widget" in parentRolesSet && (axs.constants.WIDGET_ROLES[roleName] = role);
+}
+axs.constants.ARIA_PROPERTIES = {activedescendant:{type:"property", valueType:"idref"}, atomic:{defaultValue:"false", type:"property", valueType:"boolean"}, autocomplete:{defaultValue:"none", type:"property", valueType:"token", values:["inline", "list", "both", "none"]}, busy:{defaultValue:"false", type:"state", valueType:"boolean"}, checked:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "mixed", "undefined"]}, controls:{type:"property", valueType:"idref_list"}, 
+describedby:{type:"property", valueType:"idref_list"}, disabled:{defaultValue:"false", type:"state", valueType:"boolean"}, dropeffect:{defaultValue:"none", type:"property", valueType:"token_list", values:"copy move link execute popup none".split(" ")}, expanded:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "undefined"]}, flowto:{type:"property", valueType:"idref_list"}, grabbed:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", 
+"undefined"]}, haspopup:{defaultValue:"false", type:"property", valueType:"boolean"}, hidden:{defaultValue:"false", type:"state", valueType:"boolean"}, invalid:{defaultValue:"false", type:"state", valueType:"token", values:["grammar", "false", "spelling", "true"]}, label:{type:"property", valueType:"string"}, labelledby:{type:"property", valueType:"idref_list"}, level:{type:"property", valueType:"integer"}, live:{defaultValue:"off", type:"property", valueType:"token", values:["off", "polite", "assertive"]}, 
+multiline:{defaultValue:"false", type:"property", valueType:"boolean"}, multiselectable:{defaultValue:"false", type:"property", valueType:"boolean"}, orientation:{defaultValue:"vertical", type:"property", valueType:"token", values:["horizontal", "vertical"]}, owns:{type:"property", valueType:"idref_list"}, posinset:{type:"property", valueType:"integer"}, pressed:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "mixed", "undefined"]}, readonly:{defaultValue:"false", 
+type:"property", valueType:"boolean"}, relevant:{defaultValue:"additions text", type:"property", valueType:"token_list", values:["additions", "removals", "text", "all"]}, required:{defaultValue:"false", type:"property", valueType:"boolean"}, selected:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "undefined"]}, setsize:{type:"property", valueType:"integer"}, sort:{defaultValue:"none", type:"property", valueType:"token", values:["ascending", "descending", "none", 
+"other"]}, valuemax:{type:"property", valueType:"decimal"}, valuemin:{type:"property", valueType:"decimal"}, valuenow:{type:"property", valueType:"decimal"}, valuetext:{type:"property", valueType:"string"}};
+(function() {
+  for (var a in axs.constants.ARIA_PROPERTIES) {
+    var b = axs.constants.ARIA_PROPERTIES[a];
+    if (b.values) {
+      for (var c = {}, d = 0;d < b.values.length;d++) {
+        c[b.values[d]] = !0;
+      }
+      b.valuesSet = c;
+    }
+  }
+})();
+axs.constants.GLOBAL_PROPERTIES = axs.constants.ARIA_ROLES.roletype.propertiesSet;
+axs.constants.NO_ROLE_NAME = " ";
+axs.constants.WIDGET_ROLE_TO_NAME = {alert:"aria_role_alert", alertdialog:"aria_role_alertdialog", button:"aria_role_button", checkbox:"aria_role_checkbox", columnheader:"aria_role_columnheader", combobox:"aria_role_combobox", dialog:"aria_role_dialog", grid:"aria_role_grid", gridcell:"aria_role_gridcell", link:"aria_role_link", listbox:"aria_role_listbox", log:"aria_role_log", marquee:"aria_role_marquee", menu:"aria_role_menu", menubar:"aria_role_menubar", menuitem:"aria_role_menuitem", menuitemcheckbox:"aria_role_menuitemcheckbox", 
+menuitemradio:"aria_role_menuitemradio", option:axs.constants.NO_ROLE_NAME, progressbar:"aria_role_progressbar", radio:"aria_role_radio", radiogroup:"aria_role_radiogroup", rowheader:"aria_role_rowheader", scrollbar:"aria_role_scrollbar", slider:"aria_role_slider", spinbutton:"aria_role_spinbutton", status:"aria_role_status", tab:"aria_role_tab", tabpanel:"aria_role_tabpanel", textbox:"aria_role_textbox", timer:"aria_role_timer", toolbar:"aria_role_toolbar", tooltip:"aria_role_tooltip", treeitem:"aria_role_treeitem"};
+axs.constants.STRUCTURE_ROLE_TO_NAME = {article:"aria_role_article", application:"aria_role_application", banner:"aria_role_banner", columnheader:"aria_role_columnheader", complementary:"aria_role_complementary", contentinfo:"aria_role_contentinfo", definition:"aria_role_definition", directory:"aria_role_directory", document:"aria_role_document", form:"aria_role_form", group:"aria_role_group", heading:"aria_role_heading", img:"aria_role_img", list:"aria_role_list", listitem:"aria_role_listitem", 
+main:"aria_role_main", math:"aria_role_math", navigation:"aria_role_navigation", note:"aria_role_note", region:"aria_role_region", rowheader:"aria_role_rowheader", search:"aria_role_search", separator:"aria_role_separator"};
+axs.constants.ATTRIBUTE_VALUE_TO_STATUS = [{name:"aria-autocomplete", values:{inline:"aria_autocomplete_inline", list:"aria_autocomplete_list", both:"aria_autocomplete_both"}}, {name:"aria-checked", values:{"true":"aria_checked_true", "false":"aria_checked_false", mixed:"aria_checked_mixed"}}, {name:"aria-disabled", values:{"true":"aria_disabled_true"}}, {name:"aria-expanded", values:{"true":"aria_expanded_true", "false":"aria_expanded_false"}}, {name:"aria-invalid", values:{"true":"aria_invalid_true", 
+grammar:"aria_invalid_grammar", spelling:"aria_invalid_spelling"}}, {name:"aria-multiline", values:{"true":"aria_multiline_true"}}, {name:"aria-multiselectable", values:{"true":"aria_multiselectable_true"}}, {name:"aria-pressed", values:{"true":"aria_pressed_true", "false":"aria_pressed_false", mixed:"aria_pressed_mixed"}}, {name:"aria-readonly", values:{"true":"aria_readonly_true"}}, {name:"aria-required", values:{"true":"aria_required_true"}}, {name:"aria-selected", values:{"true":"aria_selected_true", 
+"false":"aria_selected_false"}}];
+axs.constants.INPUT_TYPE_TO_INFORMATION_TABLE_MSG = {button:"input_type_button", checkbox:"input_type_checkbox", color:"input_type_color", datetime:"input_type_datetime", "datetime-local":"input_type_datetime_local", date:"input_type_date", email:"input_type_email", file:"input_type_file", image:"input_type_image", month:"input_type_month", number:"input_type_number", password:"input_type_password", radio:"input_type_radio", range:"input_type_range", reset:"input_type_reset", search:"input_type_search", 
+submit:"input_type_submit", tel:"input_type_tel", text:"input_type_text", url:"input_type_url", week:"input_type_week"};
+axs.constants.TAG_TO_INFORMATION_TABLE_VERBOSE_MSG = {A:"tag_link", BUTTON:"tag_button", H1:"tag_h1", H2:"tag_h2", H3:"tag_h3", H4:"tag_h4", H5:"tag_h5", H6:"tag_h6", LI:"tag_li", OL:"tag_ol", SELECT:"tag_select", TEXTAREA:"tag_textarea", UL:"tag_ul", SECTION:"tag_section", NAV:"tag_nav", ARTICLE:"tag_article", ASIDE:"tag_aside", HGROUP:"tag_hgroup", HEADER:"tag_header", FOOTER:"tag_footer", TIME:"tag_time", MARK:"tag_mark"};
+axs.constants.TAG_TO_INFORMATION_TABLE_BRIEF_MSG = {BUTTON:"tag_button", SELECT:"tag_select", TEXTAREA:"tag_textarea"};
+axs.constants.MIXED_VALUES = {"true":!0, "false":!0, mixed:!0};
+axs.constants.Severity = {INFO:"Info", WARNING:"Warning", SEVERE:"Severe"};
+axs.constants.AuditResult = {PASS:"PASS", FAIL:"FAIL", NA:"NA"};
+axs.constants.InlineElements = {TT:!0, I:!0, B:!0, BIG:!0, SMALL:!0, EM:!0, STRONG:!0, DFN:!0, CODE:!0, SAMP:!0, KBD:!0, VAR:!0, CITE:!0, ABBR:!0, ACRONYM:!0, A:!0, IMG:!0, OBJECT:!0, BR:!0, SCRIPT:!0, MAP:!0, Q:!0, SUB:!0, SUP:!0, SPAN:!0, BDO:!0, INPUT:!0, SELECT:!0, TEXTAREA:!0, LABEL:!0, BUTTON:!0};
+axs.constants.NATIVELY_DISABLEABLE = {BUTTON:!0, INPUT:!0, SELECT:!0, TEXTAREA:!0, FIELDSET:!0, OPTGROUP:!0, OPTION:!0};
+axs.constants.ARIA_TO_HTML_ATTRIBUTE = {"aria-checked":"checked", "aria-disabled":"disabled", "aria-hidden":"hidden", "aria-expanded":"open", "aria-valuemax":"max", "aria-valuemin":"min", "aria-readonly":"readonly", "aria-required":"required", "aria-selected":"selected", "aria-valuenow":"value"};
+axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO = {A:[{role:"link", allowed:"button checkbox menuitem menuitemcheckbox menuitemradio tab treeitem".split(" "), selector:"a[href]"}], ADDRESS:[{role:"", allowed:["contentinfo", "presentation"]}], AREA:[{role:"link", selector:"area[href]"}], ARTICLE:[{role:"article", allowed:["presentation", "article", "document", "application", "main"]}], ASIDE:[{role:"complementary", allowed:["note", "complementary", "search", "presentation"]}], AUDIO:[{role:"", allowed:["application", 
+"presentation"]}], BASE:[{role:"", reserved:!0}], BODY:[{role:"document", allowed:["presentation"]}], BUTTON:[{role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'button:not([aria-pressed]):not([type="menu"])'}, {role:"button", allowed:["button"], selector:"button[aria-pressed]"}, {role:"button", attributes:{"aria-haspopup":!0}, allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'button[type="menu"]'}], CAPTION:[{role:"", 
+allowed:["presentation"]}], COL:[{role:"", reserved:!0}], COLGROUP:[{role:"", reserved:!0}], DATALIST:[{role:"listbox", attributes:{"aria-multiselectable":!1}, allowed:["presentation"]}], DEL:[{role:"", allowed:["*"]}], DD:[{role:"", allowed:["presentation"]}], DT:[{role:"", allowed:["presentation"]}], DETAILS:[{role:"group", allowed:["group", "presentation"]}], DIALOG:[{role:"dialog", allowed:"dialog alert alertdialog application log marquee status".split(" "), selector:"dialog[open]"}, {role:"dialog", 
+attributes:{"aria-hidden":!0}, allowed:"dialog alert alertdialog application log marquee status".split(" "), selector:"dialog:not([open])"}], DIV:[{role:"", allowed:["*"]}], DL:[{role:"list", allowed:["presentation"]}], EMBED:[{role:"", allowed:["application", "document", "img", "presentation"]}], FIGURE:[{role:"", allowed:["*"]}], FOOTER:[{role:"", allowed:["contentinfo", "presentation"]}], FORM:[{role:"form", allowed:["presentation"]}], P:[{role:"", allowed:["*"]}], PRE:[{role:"", allowed:["*"]}], 
+BLOCKQUOTE:[{role:"", allowed:["*"]}], H1:[{role:"heading"}], H2:[{role:"heading"}], H3:[{role:"heading"}], H4:[{role:"heading"}], H5:[{role:"heading"}], H6:[{role:"heading"}], HEAD:[{role:"", reserved:!0}], HEADER:[{role:"", allowed:["banner", "presentation"]}], HR:[{role:"separator", allowed:["presentation"]}], HTML:[{role:"", reserved:!0}], IFRAME:[{role:"", allowed:["application", "document", "img", "presentation"], selector:"iframe:not([seamless])"}, {role:"", allowed:["application", "document", 
+"img", "presentation", "group"], selector:"iframe[seamless]"}], IMG:[{role:"presentation", reserved:!0, selector:'img[alt=""]'}, {role:"img", allowed:["*"], selector:'img[alt]:not([alt=""])'}], INPUT:[{role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'input[type="button"]:not([aria-pressed])'}, {role:"button", allowed:["button"], selector:'input[type="button"][aria-pressed]'}, {role:"checkbox", allowed:["checkbox"], selector:'input[type="checkbox"]'}, 
+{role:"", selector:'input[type="color"]'}, {role:"", selector:'input[type="date"]'}, {role:"", selector:'input[type="datetime"]'}, {role:"textbox", selector:'input[type="email"]:not([list])'}, {role:"", selector:'input[type="file"]'}, {role:"", reserved:!0, selector:'input[type="hidden"]'}, {role:"button", allowed:["button"], selector:'input[type="image"][aria-pressed]'}, {role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'input[type="image"]:not([aria-pressed])'}, 
+{role:"", selector:'input[type="month"]'}, {role:"", selector:'input[type="number"]'}, {role:"textbox", selector:'input[type="password"]'}, {role:"radio", allowed:["menuitemradio"], selector:'input[type="radio"]'}, {role:"slider", selector:'input[type="range"]'}, {role:"button", selector:'input[type="reset"]'}, {role:"combobox", selector:'input[type="search"][list]'}, {role:"textbox", selector:'input[type="search"]:not([list])'}, {role:"button", selector:'input[type="submit"]'}, {role:"combobox", 
+selector:'input[type="tel"][list]'}, {role:"textbox", selector:'input[type="tel"]:not([list])'}, {role:"combobox", selector:'input[type="text"][list]'}, {role:"textbox", selector:'input[type="text"]:not([list])'}, {role:"textbox", selector:"input:not([type])"}, {role:"", selector:'input[type="time"]'}, {role:"combobox", selector:'input[type="url"][list]'}, {role:"textbox", selector:'input[type="url"]:not([list])'}, {role:"", selector:'input[type="week"]'}], INS:[{role:"", allowed:["*"]}], KEYGEN:[{role:""}], 
+LABEL:[{role:"", allowed:["presentation"]}], LI:[{role:"listitem", allowed:"menuitem menuitemcheckbox menuitemradio option tab treeitem presentation".split(" "), selector:'ol:not([role="presentation"])>li, ul:not([role="presentation"])>li'}, {role:"listitem", allowed:"listitem menuitem menuitemcheckbox menuitemradio option tab treeitem presentation".split(" "), selector:'ol[role="presentation"]>li, ul[role="presentation"]>li'}], LINK:[{role:"link", reserved:!0, selector:"link[href]"}], MAIN:[{role:"", 
+allowed:["main", "presentation"]}], MAP:[{role:"", reserved:!0}], MATH:[{role:"", allowed:["presentation"]}], MENU:[{role:"toolbar", selector:'menu[type="toolbar"]'}], MENUITEM:[{role:"menuitem", selector:'menuitem[type="command"]'}, {role:"menuitemcheckbox", selector:'menuitem[type="checkbox"]'}, {role:"menuitemradio", selector:'menuitem[type="radio"]'}], META:[{role:"", reserved:!0}], METER:[{role:"progressbar", allowed:["presentation"]}], NAV:[{role:"navigation", allowed:["navigation", "presentation"]}], 
+NOSCRIPT:[{role:"", reserved:!0}], OBJECT:[{role:"", allowed:["application", "document", "img", "presentation"]}], OL:[{role:"list", allowed:"directory group listbox menu menubar tablist toolbar tree presentation".split(" ")}], OPTGROUP:[{role:"", allowed:["presentation"]}], OPTION:[{role:"option"}], OUTPUT:[{role:"status", allowed:["*"]}], PARAM:[{role:"", reserved:!0}], PICTURE:[{role:"", reserved:!0}], PROGRESS:[{role:"progressbar", allowed:["presentation"]}], SCRIPT:[{role:"", reserved:!0}], 
+SECTION:[{role:"region", allowed:"alert alertdialog application contentinfo dialog document log marquee search status presentation".split(" ")}], SELECT:[{role:"listbox"}], SOURCE:[{role:"", reserved:!0}], SPAN:[{role:"", allowed:["*"]}], STYLE:[{role:"", reserved:!0}], SVG:[{role:"", allowed:["application", "document", "img", "presentation"]}], SUMMARY:[{role:"", allowed:["presentation"]}], TABLE:[{role:"", allowed:["*"]}], TEMPLATE:[{role:"", reserved:!0}], TEXTAREA:[{role:"textbox"}], TBODY:[{role:"rowgroup", 
+allowed:["*"]}], THEAD:[{role:"rowgroup", allowed:["*"]}], TFOOT:[{role:"rowgroup", allowed:["*"]}], TITLE:[{role:"", reserved:!0}], TD:[{role:"", allowed:["*"]}], TH:[{role:"", allowed:["*"]}], TR:[{role:"", allowed:["*"]}], TRACK:[{role:"", reserved:!0}], UL:[{role:"list", allowed:"directory group listbox menu menubar tablist toolbar tree presentation".split(" ")}], VIDEO:[{role:"", allowed:["application", "presentation"]}]};
+axs.color = {};
+axs.color.Color = function(a, b, c, d) {
+  this.red = a;
+  this.green = b;
+  this.blue = c;
+  this.alpha = d;
+};
+axs.color.YCbCr = function(a) {
+  this.luma = this.z = a[0];
+  this.Cb = this.x = a[1];
+  this.Cr = this.y = a[2];
+};
+axs.color.YCbCr.prototype = {multiply:function(a) {
+  return new axs.color.YCbCr([this.luma * a, this.Cb * a, this.Cr * a]);
+}, add:function(a) {
+  return new axs.color.YCbCr([this.luma + a.luma, this.Cb + a.Cb, this.Cr + a.Cr]);
+}, subtract:function(a) {
+  return new axs.color.YCbCr([this.luma - a.luma, this.Cb - a.Cb, this.Cr - a.Cr]);
+}};
+axs.color.calculateContrastRatio = function(a, b) {
+  1 > a.alpha && (a = axs.color.flattenColors(a, b));
+  var c = axs.color.calculateLuminance(a), d = axs.color.calculateLuminance(b);
+  return (Math.max(c, d) + .05) / (Math.min(c, d) + .05);
+};
+axs.color.calculateLuminance = function(a) {
+  return axs.color.toYCbCr(a).luma;
+};
+axs.color.luminanceRatio = function(a, b) {
+  return (Math.max(a, b) + .05) / (Math.min(a, b) + .05);
+};
+axs.color.parseColor = function(a) {
+  if ("transparent" === a) {
+    return new axs.color.Color(0, 0, 0, 0);
+  }
+  var b = a.match(/^rgb\((\d+), (\d+), (\d+)\)$/);
+  if (b) {
+    a = parseInt(b[1], 10);
+    var c = parseInt(b[2], 10), d = parseInt(b[3], 10);
+    return new axs.color.Color(a, c, d, 1);
+  }
+  return (b = a.match(/^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/)) ? (a = parseInt(b[1], 10), c = parseInt(b[2], 10), d = parseInt(b[3], 10), b = parseFloat(b[4]), new axs.color.Color(a, c, d, b)) : null;
+};
+axs.color.colorChannelToString = function(a) {
+  a = Math.round(a);
+  return 15 >= a ? "0" + a.toString(16) : a.toString(16);
+};
+axs.color.colorToString = function(a) {
+  return 1 == a.alpha ? "#" + axs.color.colorChannelToString(a.red) + axs.color.colorChannelToString(a.green) + axs.color.colorChannelToString(a.blue) : "rgba(" + [a.red, a.green, a.blue, a.alpha].join() + ")";
+};
+axs.color.luminanceFromContrastRatio = function(a, b, c) {
+  return c ? (a + .05) * b - .05 : (a + .05) / b - .05;
+};
+axs.color.translateColor = function(a, b) {
+  for (var c = b > a.luma ? axs.color.WHITE_YCC : axs.color.BLACK_YCC, d = c == axs.color.WHITE_YCC ? axs.color.YCC_CUBE_FACES_WHITE : axs.color.YCC_CUBE_FACES_BLACK, e = new axs.color.YCbCr([0, a.Cb, a.Cr]), f = new axs.color.YCbCr([1, a.Cb, a.Cr]), f = {a:e, b:f}, e = null, g = 0;g < d.length && !(e = axs.color.findIntersection(f, d[g]), 0 <= e.z && 1 >= e.z);g++) {
+  }
+  if (!e) {
+    throw "Couldn't find intersection with YCbCr color cube for Cb=" + a.Cb + ", Cr=" + a.Cr + ".";
+  }
+  if (e.x != a.x || e.y != a.y) {
+    throw "Intersection has wrong Cb/Cr values.";
+  }
+  if (Math.abs(c.luma - e.luma) < Math.abs(c.luma - b)) {
+    return c = [b, a.Cb, a.Cr], axs.color.fromYCbCrArray(c);
+  }
+  c = (b - e.luma) / (c.luma - e.luma);
+  c = [b, e.Cb - e.Cb * c, e.Cr - e.Cr * c];
+  return axs.color.fromYCbCrArray(c);
+};
+axs.color.suggestColors = function(a, b, c) {
+  var d = {}, e = axs.color.calculateLuminance(a), f = axs.color.calculateLuminance(b), g = f > e, h = axs.color.toYCbCr(b), k = axs.color.toYCbCr(a), m;
+  for (m in c) {
+    var l = c[m], n = axs.color.luminanceFromContrastRatio(e, l + .02, g);
+    if (1 >= n && 0 <= n) {
+      var p = axs.color.translateColor(h, n), l = axs.color.calculateContrastRatio(p, a), n = {};
+      n.fg = axs.color.colorToString(p);
+      n.bg = axs.color.colorToString(a);
+      n.contrast = l.toFixed(2);
+      d[m] = n;
+    } else {
+      l = axs.color.luminanceFromContrastRatio(f, l + .02, !g), 1 >= l && 0 <= l && (p = axs.color.translateColor(k, l), l = axs.color.calculateContrastRatio(b, p), n = {}, n.bg = axs.color.colorToString(p), n.fg = axs.color.colorToString(b), n.contrast = l.toFixed(2), d[m] = n);
+    }
+  }
+  return d;
+};
+axs.color.flattenColors = function(a, b) {
+  var c = a.alpha;
+  return new axs.color.Color((1 - c) * b.red + c * a.red, (1 - c) * b.green + c * a.green, (1 - c) * b.blue + c * a.blue, a.alpha + b.alpha * (1 - a.alpha));
+};
+axs.color.multiplyMatrixVector = function(a, b) {
+  var c = b[0], d = b[1], e = b[2];
+  return [a[0][0] * c + a[0][1] * d + a[0][2] * e, a[1][0] * c + a[1][1] * d + a[1][2] * e, a[2][0] * c + a[2][1] * d + a[2][2] * e];
+};
+axs.color.toYCbCr = function(a) {
+  var b = a.red / 255, c = a.green / 255;
+  a = a.blue / 255;
+  return new axs.color.YCbCr(axs.color.multiplyMatrixVector(axs.color.YCC_MATRIX, [.03928 >= b ? b / 12.92 : Math.pow((b + .055) / 1.055, 2.4), .03928 >= c ? c / 12.92 : Math.pow((c + .055) / 1.055, 2.4), .03928 >= a ? a / 12.92 : Math.pow((a + .055) / 1.055, 2.4)]));
+};
+axs.color.fromYCbCr = function(a) {
+  return axs.color.fromYCbCrArray([a.luma, a.Cb, a.Cr]);
+};
+axs.color.fromYCbCrArray = function(a) {
+  var b = axs.color.multiplyMatrixVector(axs.color.INVERTED_YCC_MATRIX, a);
+  a = b[0];
+  var c = b[1], b = b[2];
+  return new axs.color.Color(Math.min(Math.max(Math.round(255 * (.00303949 >= a ? 12.92 * a : 1.055 * Math.pow(a, 1 / 2.4) - .055)), 0), 255), Math.min(Math.max(Math.round(255 * (.00303949 >= c ? 12.92 * c : 1.055 * Math.pow(c, 1 / 2.4) - .055)), 0), 255), Math.min(Math.max(Math.round(255 * (.00303949 >= b ? 12.92 * b : 1.055 * Math.pow(b, 1 / 2.4) - .055)), 0), 255), 1);
+};
+axs.color.RGBToYCbCrMatrix = function(a, b) {
+  return [[a, 1 - a - b, b], [-a / (2 - 2 * b), (a + b - 1) / (2 - 2 * b), (1 - b) / (2 - 2 * b)], [(1 - a) / (2 - 2 * a), (a + b - 1) / (2 - 2 * a), -b / (2 - 2 * a)]];
+};
+axs.color.invert3x3Matrix = function(a) {
+  var b = a[0][0], c = a[0][1], d = a[0][2], e = a[1][0], f = a[1][1], g = a[1][2], h = a[2][0], k = a[2][1];
+  a = a[2][2];
+  return axs.color.scalarMultiplyMatrix([[f * a - g * k, d * k - c * a, c * g - d * f], [g * h - e * a, b * a - d * h, d * e - b * g], [e * k - f * h, h * c - b * k, b * f - c * e]], 1 / (b * (f * a - g * k) - c * (a * e - g * h) + d * (e * k - f * h)));
+};
+axs.color.findIntersection = function(a, b) {
+  var c = [a.a.x - b.p0.x, a.a.y - b.p0.y, a.a.z - b.p0.z], d = axs.color.invert3x3Matrix([[a.a.x - a.b.x, b.p1.x - b.p0.x, b.p2.x - b.p0.x], [a.a.y - a.b.y, b.p1.y - b.p0.y, b.p2.y - b.p0.y], [a.a.z - a.b.z, b.p1.z - b.p0.z, b.p2.z - b.p0.z]]), c = axs.color.multiplyMatrixVector(d, c)[0];
+  return a.a.add(a.b.subtract(a.a).multiply(c));
+};
+axs.color.scalarMultiplyMatrix = function(a, b) {
+  for (var c = [], d = 0;3 > d;d++) {
+    c[d] = axs.color.scalarMultiplyVector(a[d], b);
+  }
+  return c;
+};
+axs.color.scalarMultiplyVector = function(a, b) {
+  for (var c = [], d = 0;d < a.length;d++) {
+    c[d] = a[d] * b;
+  }
+  return c;
+};
+axs.color.kR = .2126;
+axs.color.kB = .0722;
+axs.color.YCC_MATRIX = axs.color.RGBToYCbCrMatrix(axs.color.kR, axs.color.kB);
+axs.color.INVERTED_YCC_MATRIX = axs.color.invert3x3Matrix(axs.color.YCC_MATRIX);
+axs.color.BLACK = new axs.color.Color(0, 0, 0, 1);
+axs.color.BLACK_YCC = axs.color.toYCbCr(axs.color.BLACK);
+axs.color.WHITE = new axs.color.Color(255, 255, 255, 1);
+axs.color.WHITE_YCC = axs.color.toYCbCr(axs.color.WHITE);
+axs.color.RED = new axs.color.Color(255, 0, 0, 1);
+axs.color.RED_YCC = axs.color.toYCbCr(axs.color.RED);
+axs.color.GREEN = new axs.color.Color(0, 255, 0, 1);
+axs.color.GREEN_YCC = axs.color.toYCbCr(axs.color.GREEN);
+axs.color.BLUE = new axs.color.Color(0, 0, 255, 1);
+axs.color.BLUE_YCC = axs.color.toYCbCr(axs.color.BLUE);
+axs.color.CYAN = new axs.color.Color(0, 255, 255, 1);
+axs.color.CYAN_YCC = axs.color.toYCbCr(axs.color.CYAN);
+axs.color.MAGENTA = new axs.color.Color(255, 0, 255, 1);
+axs.color.MAGENTA_YCC = axs.color.toYCbCr(axs.color.MAGENTA);
+axs.color.YELLOW = new axs.color.Color(255, 255, 0, 1);
+axs.color.YELLOW_YCC = axs.color.toYCbCr(axs.color.YELLOW);
+axs.color.YCC_CUBE_FACES_BLACK = [{p0:axs.color.BLACK_YCC, p1:axs.color.RED_YCC, p2:axs.color.GREEN_YCC}, {p0:axs.color.BLACK_YCC, p1:axs.color.GREEN_YCC, p2:axs.color.BLUE_YCC}, {p0:axs.color.BLACK_YCC, p1:axs.color.BLUE_YCC, p2:axs.color.RED_YCC}];
+axs.color.YCC_CUBE_FACES_WHITE = [{p0:axs.color.WHITE_YCC, p1:axs.color.CYAN_YCC, p2:axs.color.MAGENTA_YCC}, {p0:axs.color.WHITE_YCC, p1:axs.color.MAGENTA_YCC, p2:axs.color.YELLOW_YCC}, {p0:axs.color.WHITE_YCC, p1:axs.color.YELLOW_YCC, p2:axs.color.CYAN_YCC}];
+axs.dom = {};
+axs.dom.parentElement = function(a) {
+  if (!a) {
+    return null;
+  }
+  a = axs.dom.composedParentNode(a);
+  if (!a) {
+    return null;
+  }
+  switch(a.nodeType) {
+    case Node.ELEMENT_NODE:
+      return a;
+    default:
+      return axs.dom.parentElement(a);
+  }
+};
+axs.dom.shadowHost = function(a) {
+  return "host" in a ? a.host : null;
+};
+axs.dom.composedParentNode = function(a) {
+  if (!a) {
+    return null;
+  }
+  if (a.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+    return axs.dom.shadowHost(a);
+  }
+  var b = a.parentNode;
+  if (!b) {
+    return null;
+  }
+  if (b.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+    return axs.dom.shadowHost(b);
+  }
+  if (!b.shadowRoot) {
+    return b;
+  }
+  a = a.getDestinationInsertionPoints();
+  return 0 < a.length ? axs.dom.composedParentNode(a[a.length - 1]) : null;
+};
+axs.dom.asElement = function(a) {
+  switch(a.nodeType) {
+    case Node.COMMENT_NODE:
+      break;
+    case Node.ELEMENT_NODE:
+      if ("script" == a.localName || "template" == a.localName) {
+        break;
+      }
+      return a;
+    case Node.DOCUMENT_FRAGMENT_NODE:
+      return a.host;
+    case Node.TEXT_NODE:
+      return axs.dom.parentElement(a);
+    default:
+      console.warn("Unhandled node type: ", a.nodeType);
+  }
+  return null;
+};
+axs.dom.composedTreeSearch = function(a, b, c, d, e) {
+  if (a === b) {
+    return !0;
+  }
+  if (a.nodeType == Node.ELEMENT_NODE) {
+    var f = a
+  }
+  var g = !1;
+  d = Object.create(d);
+  if (f) {
+    var h = f.localName;
+    d.collectIdRefs && (d.idrefs = axs.utils.getReferencedIds(f));
+    if (!d.disabled || "legend" === h && axs.browserUtils.matchSelector(f, "fieldset>legend:first-of-type")) {
+      d.disabled = axs.utils.isElementDisabled(f, !0);
+    }
+    d.hidden || (d.hidden = axs.utils.isElementHidden(f));
+    if (c.preorder && !c.preorder(f, d)) {
+      return g;
+    }
+    var k = f.shadowRoot || f.webkitShadowRoot;
+    if (k) {
+      return d.level++, g = axs.dom.composedTreeSearch(k, b, c, d, k), f && c.postorder && !g && c.postorder(f, d), g;
+    }
+    if ("content" == h) {
+      a = f.getDistributedNodes();
+      for (h = 0;h < a.length && !g;h++) {
+        g = axs.dom.composedTreeSearch(a[h], b, c, d, e);
+      }
+      c.postorder && !g && c.postorder.call(null, f, d);
+      return g;
+    }
+  }
+  for (a = a.firstChild;null != a && !g;) {
+    g = axs.dom.composedTreeSearch(a, b, c, d, e), a = a.nextSibling;
+  }
+  f && c.postorder && !g && c.postorder.call(null, f, d);
+  return g;
+};
+axs.utils = {};
+axs.utils.FOCUSABLE_ELEMENTS_SELECTOR = "input:not([type=hidden]):not([disabled]),select:not([disabled]),textarea:not([disabled]),button:not([disabled]),a[href],iframe,[tabindex]";
+axs.utils.LABELABLE_ELEMENTS_SELECTOR = "button,input:not([type=hidden]),keygen,meter,output,progress,select,textarea";
+axs.utils.elementIsTransparent = function(a) {
+  return "0" == a.style.opacity;
+};
+axs.utils.elementHasZeroArea = function(a) {
+  a = a.getBoundingClientRect();
+  var b = a.top - a.bottom;
+  return a.right - a.left && b ? !1 : !0;
+};
+axs.utils.elementIsOutsideScrollArea = function(a) {
+  for (var b = axs.dom.parentElement(a), c = a.ownerDocument.defaultView;b != c.document.body;) {
+    if (axs.utils.isClippedBy(a, b)) {
+      return !0;
+    }
+    if (axs.utils.canScrollTo(a, b) && !axs.utils.elementIsOutsideScrollArea(b)) {
+      return !1;
+    }
+    b = axs.dom.parentElement(b);
+  }
+  return !axs.utils.canScrollTo(a, c.document.body);
+};
+axs.utils.canScrollTo = function(a, b) {
+  var c = a.getBoundingClientRect(), d = b.getBoundingClientRect();
+  if (b == b.ownerDocument.body) {
+    var e = d.top, f = d.left
+  } else {
+    e = d.top - b.scrollTop, f = d.left - b.scrollLeft;
+  }
+  var g = e + b.scrollHeight, h = f + b.scrollWidth;
+  if (c.right < f || c.bottom < e || c.left > h || c.top > g) {
+    return !1;
+  }
+  e = a.ownerDocument.defaultView;
+  f = e.getComputedStyle(b);
+  return c.left > d.right || c.top > d.bottom ? "scroll" == f.overflow || "auto" == f.overflow || b instanceof e.HTMLBodyElement : !0;
+};
+axs.utils.isClippedBy = function(a, b) {
+  var c = a.getBoundingClientRect(), d = b.getBoundingClientRect(), e = d.top - b.scrollTop, f = d.left - b.scrollLeft, g = a.ownerDocument.defaultView.getComputedStyle(b);
+  return (c.right < d.left || c.bottom < d.top || c.left > d.right || c.top > d.bottom) && "hidden" == g.overflow ? !0 : c.right < f || c.bottom < e ? "visible" != g.overflow : !1;
+};
+axs.utils.isAncestor = function(a, b) {
+  if (null == b) {
+    return !1;
+  }
+  if (b === a) {
+    return !0;
+  }
+  var c = axs.dom.composedParentNode(b);
+  return axs.utils.isAncestor(a, c);
+};
+axs.utils.overlappingElements = function(a) {
+  if (axs.utils.elementHasZeroArea(a)) {
+    return null;
+  }
+  for (var b = [], c = a.getClientRects(), d = 0;d < c.length;d++) {
+    var e = c[d], e = document.elementFromPoint((e.left + e.right) / 2, (e.top + e.bottom) / 2);
+    if (null != e && e != a && !axs.utils.isAncestor(e, a) && !axs.utils.isAncestor(a, e)) {
+      var f = window.getComputedStyle(e, null);
+      f && (f = axs.utils.getBgColor(f, e)) && 0 < f.alpha && 0 > b.indexOf(e) && b.push(e);
+    }
+  }
+  return b;
+};
+axs.utils.elementIsHtmlControl = function(a) {
+  var b = a.ownerDocument.defaultView;
+  return a instanceof b.HTMLButtonElement || a instanceof b.HTMLInputElement || a instanceof b.HTMLSelectElement || a instanceof b.HTMLTextAreaElement ? !0 : !1;
+};
+axs.utils.elementIsAriaWidget = function(a) {
+  return a.hasAttribute("role") && (a = a.getAttribute("role")) && (a = axs.constants.ARIA_ROLES[a]) && "widget" in a.allParentRolesSet ? !0 : !1;
+};
+axs.utils.elementIsVisible = function(a) {
+  return axs.utils.elementIsTransparent(a) || axs.utils.elementHasZeroArea(a) || axs.utils.elementIsOutsideScrollArea(a) || axs.utils.overlappingElements(a).length ? !1 : !0;
+};
+axs.utils.isLargeFont = function(a) {
+  var b = a.fontSize;
+  a = "bold" == a.fontWeight;
+  var c = b.match(/(\d+)px/);
+  if (c) {
+    b = parseInt(c[1], 10);
+    if (c = window.getComputedStyle(document.body, null).fontSize.match(/(\d+)px/)) {
+      var d = parseInt(c[1], 10), c = 1.2 * d, d = 1.5 * d
+    } else {
+      c = 19.2, d = 24;
+    }
+    return a && b >= c || b >= d;
+  }
+  if (c = b.match(/(\d+)em/)) {
+    return b = parseInt(c[1], 10), a && 1.2 <= b || 1.5 <= b ? !0 : !1;
+  }
+  if (c = b.match(/(\d+)%/)) {
+    return b = parseInt(c[1], 10), a && 120 <= b || 150 <= b ? !0 : !1;
+  }
+  if (c = b.match(/(\d+)pt/)) {
+    if (b = parseInt(c[1], 10), a && 14 <= b || 18 <= b) {
+      return !0;
+    }
+  }
+  return !1;
+};
+axs.utils.getBgColor = function(a, b) {
+  var c = axs.color.parseColor(a.backgroundColor);
+  if (!c) {
+    return null;
+  }
+  1 > a.opacity && (c.alpha *= a.opacity);
+  if (1 > c.alpha) {
+    var d = axs.utils.getParentBgColor(b);
+    if (null == d) {
+      return null;
+    }
+    c = axs.color.flattenColors(c, d);
+  }
+  return c;
+};
+axs.utils.getParentBgColor = function(a) {
+  var b = a;
+  a = [];
+  for (var c = null;b = axs.dom.parentElement(b);) {
+    var d = window.getComputedStyle(b, null);
+    if (d) {
+      var e = axs.color.parseColor(d.backgroundColor);
+      if (e && (1 > d.opacity && (e.alpha *= d.opacity), 0 != e.alpha && (a.push(e), 1 == e.alpha))) {
+        c = !0;
+        break;
+      }
+    }
+  }
+  c || a.push(new axs.color.Color(255, 255, 255, 1));
+  for (b = a.pop();a.length;) {
+    c = a.pop(), b = axs.color.flattenColors(c, b);
+  }
+  return b;
+};
+axs.utils.getFgColor = function(a, b, c) {
+  var d = axs.color.parseColor(a.color);
+  if (!d) {
+    return null;
+  }
+  1 > d.alpha && (d = axs.color.flattenColors(d, c));
+  1 > a.opacity && (b = axs.utils.getParentBgColor(b), d.alpha *= a.opacity, d = axs.color.flattenColors(d, b));
+  return d;
+};
+axs.utils.getContrastRatioForElement = function(a) {
+  var b = window.getComputedStyle(a, null);
+  return axs.utils.getContrastRatioForElementWithComputedStyle(b, a);
+};
+axs.utils.getContrastRatioForElementWithComputedStyle = function(a, b) {
+  if (axs.utils.isElementHidden(b)) {
+    return null;
+  }
+  var c = axs.utils.getBgColor(a, b);
+  if (!c) {
+    return null;
+  }
+  var d = axs.utils.getFgColor(a, b, c);
+  return d ? axs.color.calculateContrastRatio(d, c) : null;
+};
+axs.utils.isNativeTextElement = function(a) {
+  var b = a.tagName.toLowerCase();
+  a = a.type ? a.type.toLowerCase() : "";
+  if ("textarea" == b) {
+    return !0;
+  }
+  if ("input" != b) {
+    return !1;
+  }
+  switch(a) {
+    case "email":
+    ;
+    case "number":
+    ;
+    case "password":
+    ;
+    case "search":
+    ;
+    case "text":
+    ;
+    case "tel":
+    ;
+    case "url":
+    ;
+    case "":
+      return !0;
+    default:
+      return !1;
+  }
+};
+axs.utils.isLowContrast = function(a, b, c) {
+  a = Math.round(10 * a) / 10;
+  return c ? 4.5 > a || !axs.utils.isLargeFont(b) && 7 > a : 3 > a || !axs.utils.isLargeFont(b) && 4.5 > a;
+};
+axs.utils.hasLabel = function(a) {
+  var b = a.tagName.toLowerCase(), c = a.type ? a.type.toLowerCase() : "";
+  if (a.hasAttribute("aria-label") || a.hasAttribute("title") || "img" == b && a.hasAttribute("alt") || "input" == b && "image" == c && a.hasAttribute("alt") || "input" == b && ("submit" == c || "reset" == c) || a.hasAttribute("aria-labelledby") || a.hasAttribute("id") && 0 < document.querySelectorAll('label[for="' + a.id + '"]').length) {
+    return !0;
+  }
+  for (b = axs.dom.parentElement(a);b;) {
+    if ("label" == b.tagName.toLowerCase() && b.control == a) {
+      return !0;
+    }
+    b = axs.dom.parentElement(b);
+  }
+  return !1;
+};
+axs.utils.isNativelyDisableable = function(a) {
+  return a.tagName.toUpperCase() in axs.constants.NATIVELY_DISABLEABLE;
+};
+axs.utils.isElementDisabled = function(a, b) {
+  if (axs.browserUtils.matchSelector(a, b ? "[aria-disabled=true]" : "[aria-disabled=true], [aria-disabled=true] *")) {
+    return !0;
+  }
+  if (!axs.utils.isNativelyDisableable(a) || axs.browserUtils.matchSelector(a, "fieldset>legend:first-of-type *")) {
+    return !1;
+  }
+  for (var c = a;null !== c;c = axs.dom.parentElement(c)) {
+    if (c.hasAttribute("disabled")) {
+      return !0;
+    }
+    if (b) {
+      break;
+    }
+  }
+  return !1;
+};
+axs.utils.isElementHidden = function(a) {
+  if (!(a instanceof a.ownerDocument.defaultView.HTMLElement)) {
+    return !1;
+  }
+  if (a.hasAttribute("chromevoxignoreariahidden")) {
+    var b = !0
+  }
+  var c = window.getComputedStyle(a, null);
+  return "none" == c.display || "hidden" == c.visibility ? !0 : a.hasAttribute("aria-hidden") && "true" == a.getAttribute("aria-hidden").toLowerCase() ? !b : !1;
+};
+axs.utils.isElementOrAncestorHidden = function(a) {
+  return axs.utils.isElementHidden(a) ? !0 : axs.dom.parentElement(a) ? axs.utils.isElementOrAncestorHidden(axs.dom.parentElement(a)) : !1;
+};
+axs.utils.isInlineElement = function(a) {
+  a = a.tagName.toUpperCase();
+  return axs.constants.InlineElements[a];
+};
+axs.utils.getRoles = function(a, b) {
+  if (!a || a.nodeType !== Node.ELEMENT_NODE || !a.hasAttribute("role") && !b) {
+    return null;
+  }
+  var c = a.getAttribute("role");
+  !c && b && (c = axs.properties.getImplicitRole(a));
+  if (!c) {
+    return null;
+  }
+  for (var c = c.split(" "), d = {roles:[], valid:!1}, e = 0;e < c.length;e++) {
+    var f = c[e], g = axs.constants.ARIA_ROLES[f], f = {name:f};
+    g && !g["abstract"] ? (f.details = g, d.applied || (d.applied = f), f.valid = d.valid = !0) : f.valid = !1;
+    d.roles.push(f);
+  }
+  return d;
+};
+axs.utils.getAriaPropertyValue = function(a, b, c) {
+  var d = a.replace(/^aria-/, ""), e = axs.constants.ARIA_PROPERTIES[d], d = {name:a, rawValue:b};
+  if (!e) {
+    return d.valid = !1, d.reason = '"' + a + '" is not a valid ARIA property', d;
+  }
+  e = e.valueType;
+  if (!e) {
+    return d.valid = !1, d.reason = '"' + a + '" is not a valid ARIA property', d;
+  }
+  switch(e) {
+    case "idref":
+      a = axs.utils.isValidIDRefValue(b, c), d.valid = a.valid, d.reason = a.reason, d.idref = a.idref;
+    case "idref_list":
+      a = b.split(/\s+/);
+      d.valid = !0;
+      for (b = 0;b < a.length;b++) {
+        e = axs.utils.isValidIDRefValue(a[b], c), e.valid || (d.valid = !1), d.values ? d.values.push(e) : d.values = [e];
+      }
+      return d;
+    case "integer":
+      c = axs.utils.isValidNumber(b);
+      if (!c.valid) {
+        return d.valid = !1, d.reason = c.reason, d;
+      }
+      Math.floor(c.value) !== c.value ? (d.valid = !1, d.reason = "" + b + " is not a whole integer") : (d.valid = !0, d.value = c.value);
+      return d;
+    case "decimal":
+    ;
+    case "number":
+      c = axs.utils.isValidNumber(b);
+      d.valid = c.valid;
+      if (!c.valid) {
+        return d.reason = c.reason, d;
+      }
+      d.value = c.value;
+      return d;
+    case "string":
+      return d.valid = !0, d.value = b, d;
+    case "token":
+      return c = axs.utils.isValidTokenValue(a, b.toLowerCase()), c.valid ? (d.valid = !0, d.value = c.value) : (d.valid = !1, d.value = b, d.reason = c.reason), d;
+    case "token_list":
+      e = b.split(/\s+/);
+      d.valid = !0;
+      for (b = 0;b < e.length;b++) {
+        c = axs.utils.isValidTokenValue(a, e[b].toLowerCase()), c.valid || (d.valid = !1, d.reason ? (d.reason = [d.reason], d.reason.push(c.reason)) : (d.reason = c.reason, d.possibleValues = c.possibleValues)), d.values ? d.values.push(c.value) : d.values = [c.value];
+      }
+      return d;
+    case "tristate":
+      return c = axs.utils.isPossibleValue(b.toLowerCase(), axs.constants.MIXED_VALUES, a), c.valid ? (d.valid = !0, d.value = c.value) : (d.valid = !1, d.value = b, d.reason = c.reason), d;
+    case "boolean":
+      return c = axs.utils.isValidBoolean(b), c.valid ? (d.valid = !0, d.value = c.value) : (d.valid = !1, d.value = b, d.reason = c.reason), d;
+  }
+  d.valid = !1;
+  d.reason = "Not a valid ARIA property";
+  return d;
+};
+axs.utils.isValidTokenValue = function(a, b) {
+  var c = a.replace(/^aria-/, "");
+  return axs.utils.isPossibleValue(b, axs.constants.ARIA_PROPERTIES[c].valuesSet, a);
+};
+axs.utils.isPossibleValue = function(a, b, c) {
+  return b[a] ? {valid:!0, value:a} : {valid:!1, value:a, reason:'"' + a + '" is not a valid value for ' + c, possibleValues:Object.keys(b)};
+};
+axs.utils.isValidBoolean = function(a) {
+  try {
+    var b = JSON.parse(a);
+  } catch (c) {
+    b = "";
+  }
+  return "boolean" != typeof b ? {valid:!1, value:a, reason:'"' + a + '" is not a true/false value'} : {valid:!0, value:b};
+};
+axs.utils.isValidIDRefValue = function(a, b) {
+  return 0 == a.length ? {valid:!0, idref:a} : b.ownerDocument.getElementById(a) ? {valid:!0, idref:a} : {valid:!1, idref:a, reason:'No element with ID "' + a + '"'};
+};
+axs.utils.isValidNumber = function(a) {
+  var b = {valid:!1, value:a, reason:'"' + a + '" is not a number'};
+  if (!a) {
+    return b;
+  }
+  if (/^0x/i.test(a)) {
+    return b.reason = '"' + a + '" is not a decimal number', b;
+  }
+  a *= 1;
+  return isFinite(a) ? {valid:!0, value:a} : b;
+};
+axs.utils.isElementImplicitlyFocusable = function(a) {
+  var b = a.ownerDocument.defaultView;
+  return a instanceof b.HTMLAnchorElement || a instanceof b.HTMLAreaElement ? a.hasAttribute("href") : a instanceof b.HTMLInputElement || a instanceof b.HTMLSelectElement || a instanceof b.HTMLTextAreaElement || a instanceof b.HTMLButtonElement || a instanceof b.HTMLIFrameElement ? !a.disabled : !1;
+};
+axs.utils.values = function(a) {
+  var b = [], c;
+  for (c in a) {
+    a.hasOwnProperty(c) && "function" != typeof a[c] && b.push(a[c]);
+  }
+  return b;
+};
+axs.utils.namedValues = function(a) {
+  var b = {}, c;
+  for (c in a) {
+    a.hasOwnProperty(c) && "function" != typeof a[c] && (b[c] = a[c]);
+  }
+  return b;
+};
+function escapeId(a) {
+  return a.replace(/[^a-zA-Z0-9_-]/g, function(a) {
+    return "\\" + a;
+  });
+}
+axs.utils.getQuerySelectorText = function(a) {
+  if (null == a || "HTML" == a.tagName) {
+    return "html";
+  }
+  if ("BODY" == a.tagName) {
+    return "body";
+  }
+  if (a.hasAttribute) {
+    if (a.id) {
+      return "#" + escapeId(a.id);
+    }
+    if (a.className) {
+      for (var b = "", c = 0;c < a.classList.length;c++) {
+        b += "." + a.classList[c];
+      }
+      var d = 0;
+      if (a.parentNode) {
+        for (c = 0;c < a.parentNode.children.length;c++) {
+          var e = a.parentNode.children[c];
+          axs.browserUtils.matchSelector(e, b) && d++;
+          if (e === a) {
+            break;
+          }
+        }
+      } else {
+        d = 1;
+      }
+      if (1 == d) {
+        return axs.utils.getQuerySelectorText(a.parentNode) + " > " + b;
+      }
+    }
+    if (a.parentNode) {
+      b = a.parentNode.children;
+      d = 1;
+      for (c = 0;b[c] !== a;) {
+        b[c].tagName == a.tagName && d++, c++;
+      }
+      c = "";
+      "BODY" != a.parentNode.tagName && (c = axs.utils.getQuerySelectorText(a.parentNode) + " > ");
+      return 1 == d ? c + a.tagName : c + a.tagName + ":nth-of-type(" + d + ")";
+    }
+  } else {
+    if (a.selectorText) {
+      return a.selectorText;
+    }
+  }
+  return "";
+};
+axs.utils.getAriaIdReferrers = function(a, b) {
+  var c = function(a) {
+    var b = axs.constants.ARIA_PROPERTIES[a];
+    if (b) {
+      if ("idref" === b.valueType) {
+        return "[aria-" + a + "='" + d + "']";
+      }
+      if ("idref_list" === b.valueType) {
+        return "[aria-" + a + "~='" + d + "']";
+      }
+    }
+    return "";
+  };
+  if (!a) {
+    return null;
+  }
+  var d = a.id;
+  if (!d) {
+    return null;
+  }
+  d = d.replace(/'/g, "\\'");
+  if (b) {
+    var e = b.replace(/^aria-/, ""), f = c(e);
+    if (f) {
+      return a.ownerDocument.querySelectorAll(f);
+    }
+  } else {
+    var g = [];
+    for (e in axs.constants.ARIA_PROPERTIES) {
+      (f = c(e)) && g.push(f);
+    }
+    return a.ownerDocument.querySelectorAll(g.join(","));
+  }
+  return null;
+};
+axs.utils.getHtmlIdReferrers = function(a) {
+  if (!a) {
+    return null;
+  }
+  var b = a.id;
+  if (!b) {
+    return null;
+  }
+  var b = b.replace(/'/g, "\\'"), c = "[contextmenu='{id}'] [itemref~='{id}'] button[form='{id}'] button[menu='{id}'] fieldset[form='{id}'] input[form='{id}'] input[list='{id}'] keygen[form='{id}'] label[for='{id}'] label[form='{id}'] menuitem[command='{id}'] object[form='{id}'] output[for~='{id}'] output[form='{id}'] select[form='{id}'] td[headers~='{id}'] textarea[form='{id}'] tr[headers~='{id}']".split(" ").map(function(a) {
+    return a.replace("{id}", b);
+  });
+  return a.ownerDocument.querySelectorAll(c.join(","));
+};
+axs.utils.getReferencedIds = function(a) {
+  for (var b = [], c = function(a) {
+    a && (0 < a.indexOf(" ") ? b = b.concat(f.value.split(" ")) : b.push(a));
+  }, d = 0;d < a.attributes.length;d++) {
+    var e = a.tagName.toLowerCase(), f = a.attributes[d];
+    if (f.specified) {
+      var g = f.name, h = g.match(/aria-(.+)/);
+      if (h) {
+        e = axs.constants.ARIA_PROPERTIES[h[1]], !e || "idref" !== e.valueType && "idref_list" !== e.valueType || c(f.value);
+      } else {
+        switch(g) {
+          case "contextmenu":
+          ;
+          case "itemref":
+            c(f.value);
+            break;
+          case "form":
+            "button" != e && "fieldset" != e && "input" != e && "keygen" != e && "label" != e && "object" != e && "output" != e && "select" != e && "textarea" != e || c(f.value);
+            break;
+          case "for":
+            "label" != e && "output" != e || c(f.value);
+            break;
+          case "menu":
+            "button" == e && c(f.value);
+            break;
+          case "list":
+            "input" == e && c(f.value);
+            break;
+          case "command":
+            "menuitem" == e && c(f.value);
+            break;
+          case "headers":
+            "td" != e && "tr" != e || c(f.value);
+        }
+      }
+    }
+  }
+  return b;
+};
+axs.utils.getIdReferrers = function(a) {
+  var b = [], c = axs.utils.getHtmlIdReferrers(a);
+  c && (b = b.concat(Array.prototype.slice.call(c)));
+  (c = axs.utils.getAriaIdReferrers(a)) && (b = b.concat(Array.prototype.slice.call(c)));
+  return b;
+};
+axs.utils.getIdReferents = function(a, b) {
+  var c = [], d = a.replace(/^aria-/, ""), d = axs.constants.ARIA_PROPERTIES[d];
+  if (!d || !b.hasAttribute(a)) {
+    return c;
+  }
+  d = d.valueType;
+  if ("idref_list" === d || "idref" === d) {
+    for (var d = b.ownerDocument, e = b.getAttribute(a), e = e.split(/\s+/), f = 0, g = e.length;f < g;f++) {
+      var h = d.getElementById(e[f]);
+      h && (c[c.length] = h);
+    }
+  }
+  return c;
+};
+axs.utils.getAriaPropertiesByValueType = function(a) {
+  var b = {}, c;
+  for (c in axs.constants.ARIA_PROPERTIES) {
+    var d = axs.constants.ARIA_PROPERTIES[c];
+    d && 0 <= a.indexOf(d.valueType) && (b[c] = d);
+  }
+  return b;
+};
+axs.utils.getSelectorForAriaProperties = function(a) {
+  a = Object.keys(a).map(function(a) {
+    return "[aria-" + a + "]";
+  });
+  a.sort();
+  return a.join(",");
+};
+axs.utils.findDescendantsWithRole = function(a, b) {
+  if (!a || !b) {
+    return [];
+  }
+  var c = axs.properties.getSelectorForRole(b);
+  if (c && (c = a.querySelectorAll(c))) {
+    c = Array.prototype.map.call(c, function(a) {
+      return a;
+    });
+  } else {
+    return [];
+  }
+  return c;
+};
+axs.properties = {};
+axs.properties.TEXT_CONTENT_XPATH = './/text()[normalize-space(.)!=""]/parent::*[name()!="script"]';
+axs.properties.getFocusProperties = function(a) {
+  var b = {}, c = a.getAttribute("tabindex");
+  void 0 != c ? b.tabindex = {value:c, valid:!0} : axs.utils.isElementImplicitlyFocusable(a) && (b.implicitlyFocusable = {value:!0, valid:!0});
+  if (0 == Object.keys(b).length) {
+    return null;
+  }
+  var d = axs.utils.elementIsTransparent(a), e = axs.utils.elementHasZeroArea(a), f = axs.utils.elementIsOutsideScrollArea(a), g = axs.utils.overlappingElements(a);
+  if (d || e || f || 0 < g.length) {
+    var c = axs.utils.isElementOrAncestorHidden(a), h = {value:!1, valid:c};
+    d && (h.transparent = !0);
+    e && (h.zeroArea = !0);
+    f && (h.outsideScrollArea = !0);
+    g && 0 < g.length && (h.overlappingElements = g);
+    d = {value:c, valid:c};
+    c && (d.reason = axs.properties.getHiddenReason(a));
+    h.hidden = d;
+    b.visible = h;
+  } else {
+    b.visible = {value:!0, valid:!0};
+  }
+  return b;
+};
+axs.properties.getHiddenReason = function(a) {
+  if (!(a && a instanceof a.ownerDocument.defaultView.HTMLElement)) {
+    return null;
+  }
+  if (a.hasAttribute("chromevoxignoreariahidden")) {
+    var b = !0
+  }
+  var c = window.getComputedStyle(a, null);
+  return "none" == c.display ? {property:"display: none", on:a} : "hidden" == c.visibility ? {property:"visibility: hidden", on:a} : a.hasAttribute("aria-hidden") && "true" == a.getAttribute("aria-hidden").toLowerCase() && !b ? {property:"aria-hidden", on:a} : axs.properties.getHiddenReason(axs.dom.parentElement(a));
+};
+axs.properties.getColorProperties = function(a) {
+  var b = {};
+  (a = axs.properties.getContrastRatioProperties(a)) && (b.contrastRatio = a);
+  return 0 == Object.keys(b).length ? null : b;
+};
+axs.properties.hasDirectTextDescendant = function(a) {
+  function b() {
+    for (var b = c.evaluate(axs.properties.TEXT_CONTENT_XPATH, a, null, XPathResult.ANY_TYPE, null), e = b.iterateNext();null != e;e = b.iterateNext()) {
+      if (e === a) {
+        return !0;
+      }
+    }
+    return !1;
+  }
+  var c;
+  c = a.nodeType == Node.DOCUMENT_NODE ? a : a.ownerDocument;
+  return c.evaluate ? b() : function() {
+    for (var b = c.createTreeWalker(a, NodeFilter.SHOW_TEXT, null, !1);b.nextNode();) {
+      var e = b.currentNode, f = e.parentNode.tagName.toLowerCase();
+      if (e.nodeValue.trim() && "script" !== f && a !== e) {
+        return !0;
+      }
+    }
+    return !1;
+  }();
+};
+axs.properties.getContrastRatioProperties = function(a) {
+  if (!axs.properties.hasDirectTextDescendant(a)) {
+    return null;
+  }
+  var b = {}, c = window.getComputedStyle(a, null), d = axs.utils.getBgColor(c, a);
+  if (!d) {
+    return null;
+  }
+  b.backgroundColor = axs.color.colorToString(d);
+  var e = axs.utils.getFgColor(c, a, d);
+  b.foregroundColor = axs.color.colorToString(e);
+  a = axs.utils.getContrastRatioForElementWithComputedStyle(c, a);
+  if (!a) {
+    return null;
+  }
+  b.value = a.toFixed(2);
+  axs.utils.isLowContrast(a, c) && (b.alert = !0);
+  var f = axs.utils.isLargeFont(c) ? 3 : 4.5, c = axs.utils.isLargeFont(c) ? 4.5 : 7, g = {};
+  f > a && (g.AA = f);
+  c > a && (g.AAA = c);
+  if (!Object.keys(g).length) {
+    return b;
+  }
+  (d = axs.color.suggestColors(d, e, g)) && Object.keys(d).length && (b.suggestedColors = d);
+  return b;
+};
+axs.properties.findTextAlternatives = function(a, b, c, d) {
+  var e = c || !1;
+  c = axs.dom.asElement(a);
+  if (!c || !d && axs.utils.isElementOrAncestorHidden(c)) {
+    return null;
+  }
+  if (a.nodeType == Node.TEXT_NODE) {
+    return c = {type:"text"}, c.text = a.textContent, c.lastWord = axs.properties.getLastWord(c.text), b.content = c, a.textContent;
+  }
+  a = null;
+  e || (a = axs.properties.getTextFromAriaLabelledby(c, b));
+  if (c.hasAttribute("aria-label")) {
+    var f = {type:"text"};
+    f.text = c.getAttribute("aria-label");
+    f.lastWord = axs.properties.getLastWord(f.text);
+    a ? f.unused = !0 : e && axs.utils.elementIsHtmlControl(c) || (a = f.text);
+    b.ariaLabel = f;
+  }
+  c.hasAttribute("role") && "presentation" == c.getAttribute("role") || (a = axs.properties.getTextFromHostLanguageAttributes(c, b, a, e));
+  e && axs.utils.elementIsHtmlControl(c) && (f = c.ownerDocument.defaultView, c instanceof f.HTMLInputElement && ("text" == c.type && c.value && 0 < c.value.length && (b.controlValue = {text:c.value}), "range" == c.type && (b.controlValue = {text:c.value})), c instanceof f.HTMLSelectElement && (b.controlValue = {text:c.value}), b.controlValue && (f = b.controlValue, a ? f.unused = !0 : a = f.text));
+  if (e && axs.utils.elementIsAriaWidget(c)) {
+    e = c.getAttribute("role");
+    "textbox" == e && c.textContent && 0 < c.textContent.length && (b.controlValue = {text:c.textContent});
+    if ("slider" == e || "spinbutton" == e) {
+      c.hasAttribute("aria-valuetext") ? b.controlValue = {text:c.getAttribute("aria-valuetext")} : c.hasAttribute("aria-valuenow") && (b.controlValue = {value:c.getAttribute("aria-valuenow"), text:"" + c.getAttribute("aria-valuenow")});
+    }
+    if ("menu" == e) {
+      for (var g = c.querySelectorAll("[role=menuitemcheckbox], [role=menuitemradio]"), f = [], h = 0;h < g.length;h++) {
+        "true" == g[h].getAttribute("aria-checked") && f.push(g[h]);
+      }
+      if (0 < f.length) {
+        g = "";
+        for (h = 0;h < f.length;h++) {
+          g += axs.properties.findTextAlternatives(f[h], {}, !0), h < f.length - 1 && (g += ", ");
+        }
+        b.controlValue = {text:g};
+      }
+    }
+    if ("combobox" == e || "select" == e) {
+      b.controlValue = {text:"TODO"};
+    }
+    b.controlValue && (f = b.controlValue, a ? f.unused = !0 : a = f.text);
+  }
+  f = !0;
+  c.hasAttribute("role") && (e = c.getAttribute("role"), (e = axs.constants.ARIA_ROLES[e]) && (!e.namefrom || 0 > e.namefrom.indexOf("contents")) && (f = !1));
+  (d = axs.properties.getTextFromDescendantContent(c, d)) && f && (e = {type:"text"}, e.text = d, e.lastWord = axs.properties.getLastWord(e.text), a ? e.unused = !0 : a = d, b.content = e);
+  c.hasAttribute("title") && (d = {type:"string", valid:!0}, d.text = c.getAttribute("title"), d.lastWord = axs.properties.getLastWord(d.lastWord), a ? d.unused = !0 : a = d.text, b.title = d);
+  return 0 == Object.keys(b).length && null == a ? null : a;
+};
+axs.properties.getTextFromDescendantContent = function(a, b) {
+  for (var c = a.childNodes, d = [], e = 0;e < c.length;e++) {
+    var f = axs.properties.findTextAlternatives(c[e], {}, !0, b);
+    f && d.push(f.trim());
+  }
+  if (d.length) {
+    c = "";
+    for (e = 0;e < d.length;e++) {
+      c = [c, d[e]].join(" ").trim();
+    }
+    return c;
+  }
+  return null;
+};
+axs.properties.getTextFromAriaLabelledby = function(a, b) {
+  var c = null;
+  if (!a.hasAttribute("aria-labelledby")) {
+    return c;
+  }
+  for (var d = a.getAttribute("aria-labelledby").split(/\s+/), e = {valid:!0}, f = [], g = [], h = 0;h < d.length;h++) {
+    var k = {type:"element"}, m = d[h];
+    k.value = m;
+    var l = document.getElementById(m);
+    l ? (k.valid = !0, k.text = axs.properties.findTextAlternatives(l, {}, !0, !0), k.lastWord = axs.properties.getLastWord(k.text), f.push(k.text), k.element = l) : (k.valid = !1, e.valid = !1, k.errorMessage = {messageKey:"noElementWithId", args:[m]});
+    g.push(k);
+  }
+  0 < g.length && (g[g.length - 1].last = !0, e.values = g, e.text = f.join(" "), e.lastWord = axs.properties.getLastWord(e.text), c = e.text, b.ariaLabelledby = e);
+  return c;
+};
+axs.properties.getTextFromHostLanguageAttributes = function(a, b, c, d) {
+  if (axs.browserUtils.matchSelector(a, "img") && a.hasAttribute("alt")) {
+    var e = {type:"string", valid:!0};
+    e.text = a.getAttribute("alt");
+    c ? e.unused = !0 : c = e.text;
+    b.alt = e;
+  }
+  if (axs.browserUtils.matchSelector(a, 'input:not([type="hidden"]):not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), video:not([disabled])') && !d) {
+    if (a.hasAttribute("id")) {
+      d = document.querySelectorAll('label[for="' + a.id + '"]');
+      for (var e = {}, f = [], g = [], h = 0;h < d.length;h++) {
+        var k = {type:"element"}, m = d[h], l = axs.properties.findTextAlternatives(m, {}, !0);
+        l && 0 < l.trim().length && (k.text = l.trim(), g.push(l.trim()));
+        k.element = m;
+        f.push(k);
+      }
+      0 < f.length && (f[f.length - 1].last = !0, e.values = f, e.text = g.join(" "), e.lastWord = axs.properties.getLastWord(e.text), c ? e.unused = !0 : c = e.text, b.labelFor = e);
+    }
+    d = axs.dom.parentElement(a);
+    for (e = {};d;) {
+      if ("label" == d.tagName.toLowerCase() && (f = d, f.control == a)) {
+        e.type = "element";
+        e.text = axs.properties.findTextAlternatives(f, {}, !0);
+        e.lastWord = axs.properties.getLastWord(e.text);
+        e.element = f;
+        break;
+      }
+      d = axs.dom.parentElement(d);
+    }
+    e.text && (c ? e.unused = !0 : c = e.text, b.labelWrapped = e);
+    axs.browserUtils.matchSelector(a, 'input[type="image"]') && a.hasAttribute("alt") && (e = {type:"string", valid:!0}, e.text = a.getAttribute("alt"), c ? e.unused = !0 : c = e.text, b.alt = e);
+    Object.keys(b).length || (b.noLabel = !0);
+  }
+  return c;
+};
+axs.properties.getLastWord = function(a) {
+  if (!a) {
+    return null;
+  }
+  var b = a.lastIndexOf(" ") + 1, c = a.length - 10;
+  return a.substring(b > c ? b : c);
+};
+axs.properties.getTextProperties = function(a) {
+  var b = {}, c = axs.properties.findTextAlternatives(a, b, !1, !0);
+  if (0 == Object.keys(b).length && ((a = axs.dom.asElement(a)) && axs.browserUtils.matchSelector(a, "img") && (b.alt = {valid:!1, errorMessage:"No alt value provided"}, a = a.src, "string" == typeof a && (c = a.split("/").pop(), b.filename = {text:c})), !c)) {
+    return null;
+  }
+  b.hasProperties = !!Object.keys(b).length;
+  b.computedText = c;
+  b.lastWord = axs.properties.getLastWord(c);
+  return b;
+};
+axs.properties.getAriaProperties = function(a) {
+  var b = {}, c = axs.properties.getGlobalAriaProperties(a), d;
+  for (d in axs.constants.ARIA_PROPERTIES) {
+    var e = "aria-" + d;
+    if (a.hasAttribute(e)) {
+      var f = a.getAttribute(e);
+      c[e] = axs.utils.getAriaPropertyValue(e, f, a);
+    }
+  }
+  0 < Object.keys(c).length && (b.properties = axs.utils.values(c));
+  f = axs.utils.getRoles(a);
+  if (!f) {
+    return Object.keys(b).length ? b : null;
+  }
+  b.roles = f;
+  if (!f.valid || !f.roles) {
+    return b;
+  }
+  for (var e = f.roles, g = 0;g < e.length;g++) {
+    var h = e[g];
+    if (h.details && h.details.propertiesSet) {
+      for (d in h.details.propertiesSet) {
+        d in c || (a.hasAttribute(d) ? (f = a.getAttribute(d), c[d] = axs.utils.getAriaPropertyValue(d, f, a), "values" in c[d] && (f = c[d].values, f[f.length - 1].isLast = !0)) : h.details.requiredPropertiesSet[d] && (c[d] = {name:d, valid:!1, reason:"Required property not set"}));
+      }
+    }
+  }
+  0 < Object.keys(c).length && (b.properties = axs.utils.values(c));
+  return 0 < Object.keys(b).length ? b : null;
+};
+axs.properties.getGlobalAriaProperties = function(a) {
+  var b = {}, c;
+  for (c in axs.constants.GLOBAL_PROPERTIES) {
+    if (a.hasAttribute(c)) {
+      var d = a.getAttribute(c);
+      b[c] = axs.utils.getAriaPropertyValue(c, d, a);
+    }
+  }
+  return b;
+};
+axs.properties.getVideoProperties = function(a) {
+  if (!axs.browserUtils.matchSelector(a, "video")) {
+    return null;
+  }
+  var b = {};
+  b.captionTracks = axs.properties.getTrackElements(a, "captions");
+  b.descriptionTracks = axs.properties.getTrackElements(a, "descriptions");
+  b.chapterTracks = axs.properties.getTrackElements(a, "chapters");
+  return b;
+};
+axs.properties.getTrackElements = function(a, b) {
+  var c = a.querySelectorAll("track[kind=" + b + "]"), d = {};
+  if (!c.length) {
+    return d.valid = !1, d.reason = {messageKey:"noTracksProvided", args:[[b]]}, d;
+  }
+  d.valid = !0;
+  for (var e = [], f = 0;f < c.length;f++) {
+    var g = {}, h = c[f].getAttribute("src"), k = c[f].getAttribute("srcLang"), m = c[f].getAttribute("label");
+    h ? (g.valid = !0, g.src = h) : (g.valid = !1, g.reason = {messageKey:"noSrcProvided"});
+    h = "";
+    m && (h += m, k && (h += " "));
+    k && (h += "(" + k + ")");
+    "" == h && (h = "[[object Object]]");
+    g.name = h;
+    e.push(g);
+  }
+  d.values = e;
+  return d;
+};
+axs.properties.getAllProperties = function(a) {
+  var b = axs.dom.asElement(a);
+  if (!b) {
+    return {};
+  }
+  var c = {};
+  c.ariaProperties = axs.properties.getAriaProperties(b);
+  c.colorProperties = axs.properties.getColorProperties(b);
+  c.focusProperties = axs.properties.getFocusProperties(b);
+  c.textProperties = axs.properties.getTextProperties(a);
+  c.videoProperties = axs.properties.getVideoProperties(b);
+  return c;
+};
+(function() {
+  function a(a) {
+    if (!a) {
+      return null;
+    }
+    var c = a.tagName;
+    if (!c) {
+      return null;
+    }
+    c = c.toUpperCase();
+    c = axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO[c];
+    if (!c || !c.length) {
+      return null;
+    }
+    for (var d = null, e = 0, f = c.length;e < f;e++) {
+      var g = c[e];
+      if (g.selector) {
+        if (axs.browserUtils.matchSelector(a, g.selector)) {
+          return g;
+        }
+      } else {
+        d = g;
+      }
+    }
+    return d;
+  }
+  axs.properties.getImplicitRole = function(b) {
+    return (b = a(b)) ? b.role : "";
+  };
+  axs.properties.canTakeAriaAttributes = function(b) {
+    return (b = a(b)) ? !b.reserved : !0;
+  };
+})();
+axs.properties.getNativelySupportedAttributes = function(a) {
+  var b = [];
+  if (!a) {
+    return b;
+  }
+  a = a.cloneNode(!1);
+  for (var c = Object.keys(axs.constants.ARIA_TO_HTML_ATTRIBUTE), d = 0;d < c.length;d++) {
+    var e = c[d];
+    axs.constants.ARIA_TO_HTML_ATTRIBUTE[e] in a && (b[b.length] = e);
+  }
+  return b;
+};
+(function() {
+  var a = {};
+  axs.properties.getSelectorForRole = function(b) {
+    if (!b) {
+      return "";
+    }
+    if (a[b] && a.hasOwnProperty(b)) {
+      return a[b];
+    }
+    var c = ['[role="' + b + '"]'];
+    Object.keys(axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO).forEach(function(a) {
+      var e = axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO[a];
+      if (e && e.length) {
+        for (var f = 0;f < e.length;f++) {
+          var g = e[f];
+          if (g.role === b) {
+            if (g.selector) {
+              c[c.length] = g.selector;
+            } else {
+              c[c.length] = a;
+              break;
+            }
+          }
+        }
+      }
+    });
+    return a[b] = c.join(",");
+  };
+})();
+axs.AuditRule = function(a) {
+  for (var b = a.opt_requires || {}, c = !0, d = [], e = 0;e < axs.AuditRule.requiredFields.length;e++) {
+    var f = axs.AuditRule.requiredFields[e];
+    f in a || (c = !1, d.push(f));
+  }
+  if (!c) {
+    throw "Invalid spec; the following fields were not specified: " + d.join(", ") + "\n" + JSON.stringify(a);
+  }
+  this.name = a.name;
+  this.severity = a.severity;
+  this.relevantElementMatcher_ = a.relevantElementMatcher;
+  this.isRelevant_ = a.isRelevant || function(a, b) {
+    return !0;
+  };
+  this.test_ = a.test;
+  this.code = a.code;
+  this.heading = a.heading || "";
+  this.url = a.url || "";
+  this.requiresConsoleAPI = !!b.consoleAPI;
+  this.relevantElements = [];
+  this.relatedElements = [];
+  this.collectIdRefs = b.idRefs || !1;
+};
+axs.AuditRule.requiredFields = "name severity relevantElementMatcher test code heading".split(" ");
+axs.AuditRule.NOT_APPLICABLE = {result:axs.constants.AuditResult.NA};
+axs.AuditRule.prototype.addElement = function(a, b) {
+  a.push(b);
+};
+axs.AuditRule.prototype.collectMatchingElement = function(a, b) {
+  return this.relevantElementMatcher_(a, b) && b.inScope ? (this.relevantElements.push({element:a, flags:b}), !0) : !1;
+};
+axs.AuditRule.prototype.canRun = function(a) {
+  return this.disabled || !a.withConsoleApi && this.requiresConsoleAPI ? !1 : !0;
+};
+axs.AuditRule.Result = function(a, b) {
+  var c = axs.utils.namedValues(b);
+  c.severity = a.getSeverity(b.name) || c.severity;
+  this.rule = c;
+  this.maxResults = a.maxResults;
+  this.update(axs.constants.AuditResult.NA);
+};
+axs.AuditRule.Result.prototype.update = function(a, b) {
+  if (a === axs.constants.AuditResult.FAIL) {
+    var c = this.elements || (this.elements = []);
+    this.result = a;
+    this.maxResults && this.elements.length >= this.maxResults ? this.resultsTruncated = !0 : b && c.push(b);
+  } else {
+    a === axs.constants.AuditResult.PASS ? (this.elements || (this.elements = []), this.result !== axs.constants.AuditResult.FAIL && (this.result = a)) : this.result || (this.result = a);
+  }
+};
+axs.AuditRule.prototype.run = function(a) {
+  try {
+    for (var b = this._options || {}, c = new axs.AuditRule.Result(a, this), d;d = this.relevantElements.shift();) {
+      var e = d.element, f = d.flags;
+      this.isRelevant_(e, f) && (this.test_(e, f, b.config) ? c.update(axs.constants.AuditResult.FAIL, e) : c.update(axs.constants.AuditResult.PASS, e));
+    }
+    return c;
+  } finally {
+    this.relatedElements.length = 0;
+  }
+};
+axs.AuditRules = {};
+(function() {
+  var a = {}, b = {};
+  axs.AuditRules.specs = {};
+  axs.AuditRules.addRule = function(c) {
+    var d = new axs.AuditRule(c);
+    if (d.code in b) {
+      throw Error('Can not add audit rule with same code: "' + d.code + '"');
+    }
+    if (d.name in a) {
+      throw Error('Can not add audit rule with same name: "' + d.name + '"');
+    }
+    a[d.name] = b[d.code] = d;
+    axs.AuditRules.specs[c.name] = c;
+  };
+  axs.AuditRules.getRule = function(c) {
+    return a[c] || b[c] || null;
+  };
+  axs.AuditRules.getRules = function(b) {
+    var d = Object.keys(a);
+    return b ? d : d.map(function(a) {
+      return this.getRule(a);
+    }, axs.AuditRules);
+  };
+  axs.AuditRules.getActiveRules = function(a) {
+    var b;
+    b = a.auditRulesToRun && 0 < a.auditRulesToRun.length ? a.auditRulesToRun : axs.AuditRules.getRules(!0);
+    if (a.auditRulesToIgnore) {
+      for (var e = 0;e < a.auditRulesToIgnore.length;e++) {
+        var f = a.auditRulesToIgnore[e];
+        0 > b.indexOf(f) || b.splice(b.indexOf(f), 1);
+      }
+    }
+    return b.map(axs.AuditRules.getRule);
+  };
+})();
+axs.AuditResults = function() {
+  this.errors_ = [];
+  this.warnings_ = [];
+};
+goog.exportSymbol("axs.AuditResults", axs.AuditResults);
+axs.AuditResults.prototype.addError = function(a) {
+  "" != a && this.errors_.push(a);
+};
+goog.exportProperty(axs.AuditResults.prototype, "addError", axs.AuditResults.prototype.addError);
+axs.AuditResults.prototype.addWarning = function(a) {
+  "" != a && this.warnings_.push(a);
+};
+goog.exportProperty(axs.AuditResults.prototype, "addWarning", axs.AuditResults.prototype.addWarning);
+axs.AuditResults.prototype.numErrors = function() {
+  return this.errors_.length;
+};
+goog.exportProperty(axs.AuditResults.prototype, "numErrors", axs.AuditResults.prototype.numErrors);
+axs.AuditResults.prototype.numWarnings = function() {
+  return this.warnings_.length;
+};
+goog.exportProperty(axs.AuditResults.prototype, "numWarnings", axs.AuditResults.prototype.numWarnings);
+axs.AuditResults.prototype.getErrors = function() {
+  return this.errors_;
+};
+goog.exportProperty(axs.AuditResults.prototype, "getErrors", axs.AuditResults.prototype.getErrors);
+axs.AuditResults.prototype.getWarnings = function() {
+  return this.warnings_;
+};
+goog.exportProperty(axs.AuditResults.prototype, "getWarnings", axs.AuditResults.prototype.getWarnings);
+axs.AuditResults.prototype.toString = function() {
+  for (var a = "", b = 0;b < this.errors_.length;b++) {
+    0 == b && (a += "\nErrors:\n");
+    var c = this.errors_[b], a = a + (c + "\n\n");
+  }
+  for (b = 0;b < this.warnings_.length;b++) {
+    0 == b && (a += "\nWarnings:\n"), c = this.warnings_[b], a += c + "\n\n";
+  }
+  return a;
+};
+goog.exportProperty(axs.AuditResults.prototype, "toString", axs.AuditResults.prototype.toString);
+axs.Audit = {};
+axs.AuditConfiguration = function(a) {
+  null == a && (a = {});
+  this.rules_ = {};
+  this.maxResults = this.auditRulesToIgnore = this.auditRulesToRun = this.scope = null;
+  this.withConsoleApi = !1;
+  this.showUnsupportedRulesWarning = this.walkDom = !0;
+  for (var b in this) {
+    this.hasOwnProperty(b) && b in a && (this[b] = a[b]);
+  }
+  goog.exportProperty(this, "scope", this.scope);
+  goog.exportProperty(this, "auditRulesToRun", this.auditRulesToRun);
+  goog.exportProperty(this, "auditRulesToIgnore", this.auditRulesToIgnore);
+  goog.exportProperty(this, "withConsoleApi", this.withConsoleApi);
+  goog.exportProperty(this, "walkDom", this.walkDom);
+  goog.exportProperty(this, "showUnsupportedRulesWarning", this.showUnsupportedRulesWarning);
+};
+goog.exportSymbol("axs.AuditConfiguration", axs.AuditConfiguration);
+axs.AuditConfiguration.prototype = {ignoreSelectors:function(a, b) {
+  a in this.rules_ || (this.rules_[a] = {});
+  "ignore" in this.rules_[a] || (this.rules_[a].ignore = []);
+  Array.prototype.push.call(this.rules_[a].ignore, b);
+}, getIgnoreSelectors:function(a) {
+  return a in this.rules_ && "ignore" in this.rules_[a] ? this.rules_[a].ignore : [];
+}, setSeverity:function(a, b) {
+  a in this.rules_ || (this.rules_[a] = {});
+  this.rules_[a].severity = b;
+}, getSeverity:function(a) {
+  return a in this.rules_ && "severity" in this.rules_[a] ? this.rules_[a].severity : null;
+}, setRuleConfig:function(a, b) {
+  a in this.rules_ || (this.rules_[a] = {});
+  this.rules_[a].config = b;
+}, getRuleConfig:function(a) {
+  return a in this.rules_ && "config" in this.rules_[a] ? this.rules_[a].config : null;
+}};
+goog.exportProperty(axs.AuditConfiguration.prototype, "ignoreSelectors", axs.AuditConfiguration.prototype.ignoreSelectors);
+goog.exportProperty(axs.AuditConfiguration.prototype, "getIgnoreSelectors", axs.AuditConfiguration.prototype.getIgnoreSelectors);
+axs.Audit.unsupportedRulesWarningShown = !1;
+axs.Audit.getRulesCannotRun = function(a) {
+  return a.withConsoleApi ? [] : axs.AuditRules.getRules().filter(function(a) {
+    return a.requiresConsoleAPI;
+  }).map(function(a) {
+    return a.code;
+  });
+};
+axs.Audit.run = function(a) {
+  a = a || new axs.AuditConfiguration;
+  if (!axs.Audit.unsupportedRulesWarningShown && a.showUnsupportedRulesWarning) {
+    var b = axs.Audit.getRulesCannotRun(a);
+    0 < b.length && (console.warn("Some rules cannot be checked using the axs.Audit.run() method call. Use the Chrome plugin to check these rules: " + b.join(", ")), console.warn("To remove this message, pass an AuditConfiguration object to axs.Audit.run() and set configuration.showUnsupportedRulesWarning = false."));
+    axs.Audit.unsupportedRulesWarningShown = !0;
+  }
+  b = axs.AuditRules.getActiveRules(a);
+  a.collectIdRefs = b.some(function(a) {
+    return a.collectIdRefs;
+  });
+  a.scope || (a.scope = document.documentElement);
+  axs.Audit.collectMatchingElements(a, b);
+  for (var c = [], d = 0;d < b.length;d++) {
+    var e = b[d];
+    e.canRun(a) && c.push(e.run(a));
+  }
+  return c;
+};
+goog.exportSymbol("axs.Audit.run", axs.Audit.run);
+(function() {
+  function a(a, c) {
+    var d = a.getIgnoreSelectors(c.name);
+    if (0 < d.length || a.scope) {
+      this.ignoreSelectors = d;
+    }
+    if (d = a.getRuleConfig(c.name)) {
+      this.config = d;
+    }
+  }
+  axs.Audit.collectMatchingElements = function(b, c) {
+    axs.dom.composedTreeSearch(b.walkDom ? document.documentElement : b.scope, null, {preorder:function(d, e) {
+      e.inScope || (e.inScope = d === b.scope);
+      for (var f = 0;f < c.length;f++) {
+        var g = c[f];
+        g.canRun(b) && (g._options = new a(b, g), e.ignoring[g.name] || (e.ignoring[g.name] = g._options.shouldIgnore(d)) || g.collectMatchingElement(d, e));
+      }
+      return !0;
+    }}, {walkDom:b.walkDom, collectIdRefs:b.collectIdRefs, level:0, ignoring:{}, disabled:!1, hidden:!1});
+  };
+  a.prototype.shouldIgnore = function(a) {
+    var c = this.ignoreSelectors;
+    if (c) {
+      for (var d = 0;d < c.length;d++) {
+        if (axs.browserUtils.matchSelector(a, c[d])) {
+          return !0;
+        }
+      }
+    }
+    return !1;
+  };
+})();
+axs.Audit.auditResults = function(a) {
+  for (var b = new axs.AuditResults, c = 0;c < a.length;c++) {
+    var d = a[c];
+    d.result == axs.constants.AuditResult.FAIL && (d.rule.severity == axs.constants.Severity.SEVERE ? b.addError(axs.Audit.accessibilityErrorMessage(d)) : b.addWarning(axs.Audit.accessibilityErrorMessage(d)));
+  }
+  return b;
+};
+goog.exportSymbol("axs.Audit.auditResults", axs.Audit.auditResults);
+axs.Audit.createReport = function(a, b) {
+  var c;
+  c = "*** Begin accessibility audit results ***\nAn accessibility audit found " + axs.Audit.auditResults(a).toString();
+  b && (c = c + "\nFor more information, please see " + b);
+  return c + "\n*** End accessibility audit results ***";
+};
+goog.exportSymbol("axs.Audit.createReport", axs.Audit.createReport);
+axs.Audit.accessibilityErrorMessage = function(a) {
+  for (var b = a.rule.severity == axs.constants.Severity.SEVERE ? "Error: " : "Warning: ", b = b + (a.rule.code + " (" + a.rule.heading + ") failed on the following " + (1 == a.elements.length ? "element" : "elements")), b = 1 == a.elements.length ? b + ":" : b + (" (1 - " + Math.min(5, a.elements.length) + " of " + a.elements.length + "):"), c = Math.min(a.elements.length, 5), d = 0;d < c;d++) {
+    var e = a.elements[d], b = b + "\n";
+    try {
+      b += axs.utils.getQuerySelectorText(e);
+    } catch (f) {
+      b += " tagName:" + e.tagName, b += " id:" + e.id;
+    }
+  }
+  "" != a.rule.url && (b += "\nSee " + a.rule.url + " for more information.");
+  return b;
+};
+goog.exportSymbol("axs.Audit.accessibilityErrorMessage", axs.Audit.accessibilityErrorMessage);
+axs.AuditRules.addRule({name:"ariaOnReservedElement", heading:"This element does not support ARIA roles, states and properties", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_12", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return !axs.properties.canTakeAriaAttributes(a);
+}, test:function(a) {
+  return null !== axs.properties.getAriaProperties(a);
+}, code:"AX_ARIA_12"});
+axs.AuditRules.addRule({name:"ariaOwnsDescendant", heading:"aria-owns should not be used if ownership is implicit in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_06", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[aria-owns]");
+}, test:function(a) {
+  return axs.utils.getIdReferents("aria-owns", a).some(function(b) {
+    return a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_CONTAINED_BY;
+  });
+}, code:"AX_ARIA_06"});
+axs.AuditRules.addRule({name:"ariaRoleNotScoped", heading:"Elements with ARIA roles must be in the correct scope", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_09", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[role]");
+}, test:function(a) {
+  var b = axs.utils.getRoles(a);
+  if (!b || !b.applied) {
+    return !1;
+  }
+  b = b.applied.details.scope;
+  if (!b || 0 === b.length) {
+    return !1;
+  }
+  for (var c = a;c = axs.dom.parentElement(c);) {
+    var d = axs.utils.getRoles(c, !0);
+    if (d && d.applied && 0 <= b.indexOf(d.applied.name)) {
+      return !1;
+    }
+  }
+  if (a = axs.utils.getAriaIdReferrers(a, "aria-owns")) {
+    for (c = 0;c < a.length;c++) {
+      if ((d = axs.utils.getRoles(a[c], !0)) && d.applied && 0 <= b.indexOf(d.applied.name)) {
+        return !1;
+      }
+    }
+  }
+  return !0;
+}, code:"AX_ARIA_09"});
+axs.AuditRules.addRule({name:"audioWithoutControls", heading:"Audio elements should have controls", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_audio_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "audio[autoplay]");
+}, test:function(a) {
+  return !a.querySelectorAll("[controls]").length && 3 < a.duration;
+}, code:"AX_AUDIO_01"});
+(function() {
+  var a = /^aria\-/;
+  axs.AuditRules.addRule({name:"badAriaAttribute", heading:"This element has an invalid ARIA attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_11", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(b) {
+    b = b.attributes;
+    for (var c = 0, d = b.length;c < d;c++) {
+      if (a.test(b[c].name)) {
+        return !0;
+      }
+    }
+    return !1;
+  }, test:function(b) {
+    b = b.attributes;
+    for (var c = 0, d = b.length;c < d;c++) {
+      var e = b[c].name;
+      if (a.test(e) && (e = e.replace(a, ""), !axs.constants.ARIA_PROPERTIES.hasOwnProperty(e))) {
+        return !0;
+      }
+    }
+    return !1;
+  }, code:"AX_ARIA_11"});
+})();
+axs.AuditRules.addRule({name:"badAriaAttributeValue", heading:"ARIA state and property values must be valid", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_04", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  var b = axs.utils.getSelectorForAriaProperties(axs.constants.ARIA_PROPERTIES);
+  return axs.browserUtils.matchSelector(a, b);
+}, test:function(a) {
+  for (var b in axs.constants.ARIA_PROPERTIES) {
+    var c = "aria-" + b;
+    if (a.hasAttribute(c)) {
+      var d = a.getAttribute(c);
+      if (!axs.utils.getAriaPropertyValue(c, d, a).valid) {
+        return !0;
+      }
+    }
+  }
+  return !1;
+}, code:"AX_ARIA_04"});
+axs.AuditRules.addRule({name:"badAriaRole", heading:"Elements with ARIA roles must use a valid, non-abstract ARIA role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[role]");
+}, test:function(a) {
+  return !axs.utils.getRoles(a).valid;
+}, code:"AX_ARIA_01"});
+axs.AuditRules.addRule({name:"controlsWithoutLabel", heading:"Controls and media elements should have labels", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  if (!axs.browserUtils.matchSelector(a, 'input:not([type="hidden"]):not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), video:not([disabled])') || "presentation" == a.getAttribute("role")) {
+    return !1;
+  }
+  if (0 <= a.tabIndex) {
+    return !0;
+  }
+  for (a = axs.dom.parentElement(a);null != a;a = axs.dom.parentElement(a)) {
+    if (axs.utils.elementIsAriaWidget(a)) {
+      return !1;
+    }
+  }
+  return !0;
+}, test:function(a, b) {
+  if (b.hidden || "input" == a.tagName.toLowerCase() && "button" == a.type && a.value.length || "button" == a.tagName.toLowerCase() && a.textContent.replace(/^\s+|\s+$/g, "").length || axs.utils.hasLabel(a)) {
+    return !1;
+  }
+  var c = axs.properties.findTextAlternatives(a, {});
+  return null === c || "" === c.trim() ? !0 : !1;
+}, code:"AX_TEXT_01", ruleName:"Controls and media elements should have labels"});
+axs.AuditRules.addRule({name:"duplicateId", heading:"Any ID referred to via an IDREF must be unique in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_02", severity:axs.constants.Severity.SEVERE, opt_requires:{idRefs:!0}, relevantElementMatcher:function(a, b) {
+  b.idrefs.length && !b.hidden && this.relatedElements.push({element:a, flags:b});
+  return a.hasAttribute("id") ? !0 : !1;
+}, isRelevant:function(a, b) {
+  var c = a.id, d = b.level;
+  return this.relatedElements.some(function(a) {
+    var b = a.flags.idrefs;
+    return a.flags.level === d && 0 <= b.indexOf(c);
+  });
+}, test:function(a) {
+  var b = "[id='" + a.id.replace(/'/g, "\\'") + "']";
+  return 1 < a.ownerDocument.querySelectorAll(b).length;
+}, code:"AX_HTML_02"});
+axs.AuditRules.addRule({name:"focusableElementNotVisibleAndNotAriaHidden", heading:"These elements are focusable but either invisible or obscured by another element", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  if (!axs.browserUtils.matchSelector(a, axs.utils.FOCUSABLE_ELEMENTS_SELECTOR)) {
+    return !1;
+  }
+  if (0 <= a.tabIndex) {
+    return !0;
+  }
+  for (var b = axs.dom.parentElement(a);null != b;b = axs.dom.parentElement(b)) {
+    if (axs.utils.elementIsAriaWidget(b)) {
+      return !1;
+    }
+  }
+  a = axs.properties.findTextAlternatives(a, {});
+  return null === a || "" === a.trim() ? !1 : !0;
+}, test:function(a, b) {
+  if (b.hidden) {
+    return !1;
+  }
+  a.focus();
+  return !axs.utils.elementIsVisible(a);
+}, code:"AX_FOCUS_01"});
+axs.AuditRules.addRule({name:"humanLangMissing", heading:"The web page should have the content's human language indicated in the markup", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return a instanceof a.ownerDocument.defaultView.HTMLHtmlElement;
+}, test:function(a) {
+  return a.lang ? !1 : !0;
+}, code:"AX_HTML_01"});
+axs.AuditRules.addRule({name:"imagesWithoutAltText", heading:"Images should have a text alternative or presentational role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_02", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
+  return axs.browserUtils.matchSelector(a, "img") && !b.hidden;
+}, test:function(a) {
+  if (a.hasAttribute("alt") && "" == a.alt || "presentation" == a.getAttribute("role")) {
+    return !1;
+  }
+  var b = {};
+  axs.properties.findTextAlternatives(a, b);
+  return 0 == Object.keys(b).length ? !0 : !1;
+}, code:"AX_TEXT_02"});
+axs.AuditRules.addRule({name:"linkWithUnclearPurpose", heading:"The purpose of each link should be clear from the link text", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_04", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
+  return axs.browserUtils.matchSelector(a, "a[href]") && !b.hidden;
+}, test:function(a, b, c) {
+  c = c || {};
+  var d = c.blacklistPhrases || [], e = /\s+/;
+  for (b = 0;b < d.length;b++) {
+    var f = "^\\s*" + d[b].trim().replace(e, "\\s*") + "s*[^a-z]$";
+    if ((new RegExp(f, "i")).test(a.textContent)) {
+      return !0;
+    }
+  }
+  c = c.stopwords || "click tap go here learn more this page link about".split(" ");
+  a = axs.properties.findTextAlternatives(a, {});
+  if (null === a || "" === a.trim()) {
+    return !0;
+  }
+  a = a.replace(/[^a-zA-Z ]/g, "");
+  for (b = 0;b < c.length;b++) {
+    if (a = a.replace(new RegExp("\\b" + c[b] + "\\b", "ig"), ""), "" == a.trim()) {
+      return !0;
+    }
+  }
+  return !1;
+}, code:"AX_TEXT_04"});
+axs.AuditRules.addRule({name:"lowContrastElements", heading:"Text elements should have a reasonable contrast ratio", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_color_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
+  return !b.disabled && axs.properties.hasDirectTextDescendant(a);
+}, test:function(a) {
+  var b = window.getComputedStyle(a, null);
+  return (a = axs.utils.getContrastRatioForElementWithComputedStyle(b, a)) && axs.utils.isLowContrast(a, b);
+}, code:"AX_COLOR_01"});
+axs.AuditRules.addRule({name:"mainRoleOnInappropriateElement", heading:"role=main should only appear on significant elements", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_05", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[role~=main]");
+}, test:function(a) {
+  if (axs.utils.isInlineElement(a)) {
+    return !0;
+  }
+  a = axs.properties.getTextFromDescendantContent(a);
+  return !a || 50 > a.length ? !0 : !1;
+}, code:"AX_ARIA_05"});
+axs.AuditRules.addRule({name:"elementsWithMeaningfulBackgroundImage", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
+  return !b.hidden;
+}, heading:"Meaningful images should not be used in element backgrounds", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_image_01", test:function(a) {
+  if (a.textContent && 0 < a.textContent.length) {
+    return !1;
+  }
+  a = window.getComputedStyle(a, null);
+  var b = a.backgroundImage;
+  if (!b || "undefined" === b || "none" === b || 0 != b.indexOf("url")) {
+    return !1;
+  }
+  b = parseInt(a.width, 10);
+  a = parseInt(a.height, 10);
+  return 150 > b && 150 > a;
+}, code:"AX_IMAGE_01"});
+axs.AuditRules.addRule({name:"multipleAriaOwners", heading:"An element's ID must not be present in more that one aria-owns attribute at any time", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_07", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[aria-owns]");
+}, test:function(a) {
+  return axs.utils.getIdReferents("aria-owns", a).some(function(a) {
+    return 1 < axs.utils.getAriaIdReferrers(a, "aria-owns").length;
+  });
+}, code:"AX_ARIA_07"});
+axs.AuditRules.addRule({name:"multipleLabelableElementsPerLabel", heading:"A label element may not have labelable descendants other than its labeled control.", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_text_03--labels-should-only-contain-one-labelable-element", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "label");
+}, test:function(a) {
+  if (1 < a.querySelectorAll(axs.utils.LABELABLE_ELEMENTS_SELECTOR).length) {
+    return !0;
+  }
+}, code:"AX_TEXT_03"});
+axs.AuditRules.addRule({name:"nonExistentRelatedElement", heading:"Attributes which refer to other elements by ID should refer to elements which exist in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_03", severity:axs.constants.Severity.SEVERE, opt_requires:{idRefs:!0}, relevantElementMatcher:function(a, b) {
+  return 0 < b.idrefs.length;
+}, test:function(a, b) {
+  return b.idrefs.some(function(a) {
+    return !document.getElementById(a);
+  });
+}, code:"AX_HTML_03"});
+axs.AuditRules.addRule({name:"pageWithoutTitle", heading:"The web page should have a title that describes topic or purpose", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_title_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return "html" == a.tagName.toLowerCase();
+}, test:function(a) {
+  a = a.querySelector("head");
+  return a ? (a = a.querySelector("title")) ? !a.textContent : !0 : !0;
+}, code:"AX_TITLE_01"});
+axs.AuditRules.addRule({name:"requiredAriaAttributeMissing", heading:"Elements with ARIA roles must have all required attributes for that role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_03", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[role]");
+}, test:function(a) {
+  var b = axs.utils.getRoles(a);
+  if (!b.valid) {
+    return !1;
+  }
+  for (var c = 0;c < b.roles.length;c++) {
+    var d = b.roles[c].details.requiredPropertiesSet, e;
+    for (e in d) {
+      if (d = e.replace(/^aria-/, ""), !("defaultValue" in axs.constants.ARIA_PROPERTIES[d] || a.hasAttribute(e)) && 0 > axs.properties.getNativelySupportedAttributes(a).indexOf(e)) {
+        return !0;
+      }
+    }
+  }
+}, code:"AX_ARIA_03"});
+(function() {
+  function a(a) {
+    a = axs.utils.getRoles(a);
+    if (!a || !a.applied) {
+      return [];
+    }
+    a = a.applied;
+    return a.valid ? a.details.mustcontain || [] : [];
+  }
+  axs.AuditRules.addRule({name:"requiredOwnedAriaRoleMissing", heading:"Elements with ARIA roles must ensure required owned elements are present", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_08", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(b) {
+    return axs.browserUtils.matchSelector(b, "[role]") ? 0 < a(b).length : !1;
+  }, test:function(b) {
+    if ("true" === b.getAttribute("aria-busy")) {
+      return !1;
+    }
+    for (var c = a(b), d = c.length - 1;0 <= d;d--) {
+      var e = axs.utils.findDescendantsWithRole(b, c[d]);
+      if (e && e.length) {
+        return !1;
+      }
+    }
+    b = axs.utils.getIdReferents("aria-owns", b);
+    for (d = b.length - 1;0 <= d;d--) {
+      if ((e = axs.utils.getRoles(b[d], !0)) && e.applied) {
+        for (var e = e.applied, f = c.length - 1;0 <= f;f--) {
+          if (e.name === c[f]) {
+            return !1;
+          }
+        }
+      }
+    }
+    return !0;
+  }, code:"AX_ARIA_08"});
+})();
+axs.AuditRules.addRule({name:"roleTooltipRequiresDescribedby", heading:"Elements with role=tooltip should have a corresponding element with aria-describedby", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_02", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a, b) {
+  return axs.browserUtils.matchSelector(a, "[role=tooltip]") && !b.hidden;
+}, test:function(a) {
+  a = axs.utils.getAriaIdReferrers(a, "aria-describedby");
+  return !a || 0 === a.length;
+}, code:"AX_TOOLTIP_01"});
+axs.AuditRules.addRule({name:"tabIndexGreaterThanZero", heading:"Avoid positive integer values for tabIndex", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_03", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[tabindex]");
+}, test:function(a) {
+  if (0 < a.tabIndex) {
+    return !0;
+  }
+}, code:"AX_FOCUS_03"});
+(function() {
+  function a(a) {
+    if (0 == a.childElementCount) {
+      return !0;
+    }
+    if (a.hasAttribute("role") && "presentation" != a.getAttribute("role")) {
+      return !1;
+    }
+    if ("presentation" == a.getAttribute("role")) {
+      a = a.querySelectorAll("*");
+      for (var c = 0;c < a.length;c++) {
+        if ("TR" != a[c].tagName && "TD" != a[c].tagName) {
+          return !1;
+        }
+      }
+      return !0;
+    }
+    return !1;
+  }
+  axs.AuditRules.addRule({name:"tableHasAppropriateHeaders", heading:"Tables should have appropriate headers", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_table_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(b) {
+    return axs.browserUtils.matchSelector(b, "table") && !a(b) && 0 < b.querySelectorAll("tr").length;
+  }, test:function(a) {
+    a = a.querySelectorAll("tr");
+    var c;
+    a: {
+      c = a[0].children;
+      for (var d = 0;d < c.length;d++) {
+        if ("TH" != c[d].tagName) {
+          c = !0;
+          break a;
+        }
+      }
+      c = !1;
+    }
+    if (c) {
+      a: {
+        for (c = 0;c < a.length;c++) {
+          if ("TH" != a[c].children[0].tagName) {
+            c = !0;
+            break a;
+          }
+        }
+        c = !1;
+      }
+    }
+    if (c) {
+      a: {
+        c = a[0].children;
+        for (d = 1;d < c.length;d++) {
+          if ("TH" != c[d].tagName) {
+            c = !0;
+            break a;
+          }
+        }
+        for (d = 1;d < a.length;d++) {
+          if ("TH" != a[d].children[0].tagName) {
+            c = !0;
+            break a;
+          }
+        }
+        c = !1;
+      }
+    }
+    return c;
+  }, code:"AX_TABLE_01"});
+})();
+(function() {
+  axs.AuditRules.addRule({name:"uncontrolledTabpanel", heading:"A tabpanel should be related to a tab via aria-controls or aria-labelledby", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_13", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+    return axs.browserUtils.matchSelector(a, '[role="tabpanel"]');
+  }, test:function(a) {
+    var b;
+    b = document.querySelectorAll('[role="tab"][aria-controls="' + a.id + '"]');
+    (b = a.id && 1 === b.length) || (a.hasAttribute("aria-labelledby") ? (a = document.querySelectorAll("#" + a.getAttribute("aria-labelledby")), b = 1 === a.length && "tab" === a[0].getAttribute("role")) : b = !1);
+    return !b;
+  }, code:"AX_ARIA_13"});
+})();
+axs.AuditRules.addRule({name:"unfocusableElementsWithOnClick", heading:"Elements with onclick handlers must be focusable", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_02", severity:axs.constants.Severity.WARNING, opt_requires:{consoleAPI:!0}, relevantElementMatcher:function(a, b) {
+  return a instanceof a.ownerDocument.defaultView.HTMLBodyElement || b.hidden ? !1 : "click" in getEventListeners(a) ? !0 : !1;
+}, test:function(a) {
+  return !a.hasAttribute("tabindex") && !axs.utils.isElementImplicitlyFocusable(a) && !a.disabled;
+}, code:"AX_FOCUS_02"});
+(function() {
+  var a = /^aria\-/, b = axs.utils.getSelectorForAriaProperties(axs.constants.ARIA_PROPERTIES);
+  axs.AuditRules.addRule({name:"unsupportedAriaAttribute", heading:"This element has an unsupported ARIA attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_10", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+    return axs.browserUtils.matchSelector(a, b);
+  }, test:function(b) {
+    var d = axs.utils.getRoles(b, !0), d = d && d.applied ? d.applied.details.propertiesSet : axs.constants.GLOBAL_PROPERTIES;
+    b = b.attributes;
+    for (var e = 0, f = b.length;e < f;e++) {
+      var g = b[e].name;
+      if (a.test(g)) {
+        var h = g.replace(a, "");
+        if (axs.constants.ARIA_PROPERTIES.hasOwnProperty(h) && !(g in d)) {
+          return !0;
+        }
+      }
+    }
+    return !1;
+  }, code:"AX_ARIA_10"});
+})();
+axs.AuditRules.addRule({name:"videoWithoutCaptions", heading:"Video elements should use <track> elements to provide captions", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_video_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "video");
+}, test:function(a) {
+  return !a.querySelectorAll("track[kind=captions]").length;
+}, code:"AX_VIDEO_01"});
+
+  return axs;
+});
+
+// Define AMD module if possible, export globals otherwise.
+if (typeof define !== 'undefined' && define.amd) {
+  define([], fn);
+} else {
+  var axs = fn.call(this);
+}
+
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
new file mode 100644
index 000000000..4aa792510
--- /dev/null
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -0,0 +1,2188 @@
+"use strict";
+
+window._qutebrowser.caret = (function() {
+    const funcs = {};
+
+    var Cursor = function(node, index, text) {
+        this.node = node;
+        this.index = index;
+        this.text = text;
+    };
+
+    /**
+     * @return {Cursor} A new cursor pointing to the same location.
+     */
+    Cursor.prototype.clone = function() {
+        return new Cursor(this.node, this.index, this.text);
+    };
+
+    /**
+     * Modify this cursor to point to the location that another cursor points to.
+     * @param {Cursor} otherCursor The cursor to copy from.
+     */
+    Cursor.prototype.copyFrom = function(otherCursor) {
+        this.node = otherCursor.node;
+        this.index = otherCursor.index;
+        this.text = otherCursor.text;
+    };
+
+    var TraverseUtil = function() {};
+
+    TraverseUtil.getNodeText = function(node) {
+        if (node.constructor == Text) {
+            return node.data;
+        } else {
+            return '';
+        }
+    };
+
+    /**
+     * Return true if a node should be treated as a leaf node, because
+     * its children are properties of the object that shouldn't be traversed.
+     *
+     * TODO(dmazzoni): replace this with a predicate that detects nodes with
+     * ARIA roles and other objects that have their own description.
+     * For now we just detect a couple of common cases.
+     *
+     * @param {Node} node A DOM node.
+     * @return {boolean} True if the node should be treated as a leaf node.
+     */
+    TraverseUtil.treatAsLeafNode = function(node) {
+        return node.childNodes.length == 0 ||
+            node.nodeName == 'SELECT' ||
+            node.nodeName == 'OBJECT';
+    };
+
+    /**
+     * Return true only if a single character is whitespace.
+     * From https://developer.mozilla.org/en/Whitespace_in_the_DOM,
+     * whitespace is defined as one of the characters
+     *  "\t" TAB \u0009
+     *  "\n" LF  \u000A
+     *  "\r" CR  \u000D
+     *  " "  SPC \u0020.
+     *
+     * @param {string} c A string containing a single character.
+     * @return {boolean} True if the character is whitespace, otherwise false.
+     */
+    TraverseUtil.isWhitespace = function(c) {
+        return (c == ' ' || c == '\n' || c == '\r' || c == '\t');
+    };
+
+    /**
+     * Set the selection to the range between the given start and end cursors.
+     * @param {Cursor} start The desired start of the selection.
+     * @param {Cursor} end The desired end of the selection.
+     * @return {Selection} the selection object.
+     */
+    TraverseUtil.setSelection = function(start, end) {
+        var sel = window.getSelection();
+        sel.removeAllRanges();
+        var range = document.createRange();
+        range.setStart(start.node, start.index);
+        range.setEnd(end.node, end.index);
+        sel.addRange(range);
+
+        return sel;
+    };
+
+    /**
+     * Use the computed CSS style to figure out if this DOM node is currently
+     * visible.
+     * @param {Node} node A HTML DOM node.
+     * @return {boolean} Whether or not the html node is visible.
+     */
+    TraverseUtil.isVisible = function(node) {
+        if (!node.style)
+            return true;
+        var style = window.getComputedStyle(/** @type {Element} */(node), null);
+        return (!!style && style.display != 'none' && style.visibility != 'hidden');
+    };
+
+    /**
+     * Use the class name to figure out if this DOM node should be traversed.
+     * @param {Node} node A HTML DOM node.
+     * @return {boolean} Whether or not the html node should be traversed.
+     */
+    TraverseUtil.isSkipped = function(node) {
+        if (node.constructor == Text)
+            node = node.parentElement;
+        if (node.className == 'CaretBrowsing_Caret' ||
+            node.className == 'CaretBrowsing_AnimateCaret') {
+            return true;
+        }
+        return false;
+    };
+
+    /**
+     * Moves the cursor forwards until it has crossed exactly one character.
+     * @param {Cursor} cursor The cursor location where the search should start.
+     *     On exit, the cursor will be immediately to the right of the
+     *     character returned.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The character found, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.forwardsChar = function(cursor, nodesCrossed) {
+        while (true) {
+            // Move down until we get to a leaf node.
+            var childNode = null;
+            if (!TraverseUtil.treatAsLeafNode(cursor.node)) {
+                for (var i = cursor.index; i < cursor.node.childNodes.length; i++) {
+                    var node = cursor.node.childNodes[i];
+                    if (TraverseUtil.isSkipped(node)) {
+                        nodesCrossed.push(node);
+                        continue;
+                    }
+                    if (TraverseUtil.isVisible(node)) {
+                        childNode = node;
+                        break;
+                    }
+                }
+            }
+            if (childNode) {
+                cursor.node = childNode;
+                cursor.index = 0;
+                cursor.text = TraverseUtil.getNodeText(cursor.node);
+                if (cursor.node.constructor != Text) {
+                    nodesCrossed.push(cursor.node);
+                }
+                continue;
+            }
+
+            // Return the next character from this leaf node.
+            if (cursor.index < cursor.text.length)
+                return cursor.text[cursor.index++];
+
+            // Move to the next sibling, going up the tree as necessary.
+            while (cursor.node != null) {
+                // Try to move to the next sibling.
+                var siblingNode = null;
+                for (var node = cursor.node.nextSibling;
+                    node != null;
+                    node = node.nextSibling) {
+                    if (TraverseUtil.isSkipped(node)) {
+                        nodesCrossed.push(node);
+                        continue;
+                    }
+                    if (TraverseUtil.isVisible(node)) {
+                        siblingNode = node;
+                        break;
+                    }
+                }
+                if (siblingNode) {
+                    cursor.node = siblingNode;
+                    cursor.text = TraverseUtil.getNodeText(siblingNode);
+                    cursor.index = 0;
+
+                    if (cursor.node.constructor != Text) {
+                        nodesCrossed.push(cursor.node);
+                    }
+
+                    break;
+                }
+
+                // Otherwise, move to the parent.
+                if (cursor.node.parentNode &&
+                    cursor.node.parentNode.constructor != HTMLBodyElement) {
+                    cursor.node = cursor.node.parentNode;
+                    cursor.text = null;
+                    cursor.index = 0;
+                } else {
+                    return null;
+                }
+            }
+        }
+    };
+
+    /**
+     * Moves the cursor backwards until it has crossed exactly one character.
+     * @param {Cursor} cursor The cursor location where the search should start.
+     *     On exit, the cursor will be immediately to the left of the
+     *     character returned.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The previous character, or null if the top of the
+     *     document has been reached.
+     */
+    TraverseUtil.backwardsChar = function(cursor, nodesCrossed) {
+        while (true) {
+            // Move down until we get to a leaf node.
+            var childNode = null;
+            if (!TraverseUtil.treatAsLeafNode(cursor.node)) {
+                for (var i = cursor.index - 1; i >= 0; i--) {
+                    var node = cursor.node.childNodes[i];
+                    if (TraverseUtil.isSkipped(node)) {
+                        nodesCrossed.push(node);
+                        continue;
+                    }
+                    if (TraverseUtil.isVisible(node)) {
+                        childNode = node;
+                        break;
+                    }
+                }
+            }
+            if (childNode) {
+                cursor.node = childNode;
+                cursor.text = TraverseUtil.getNodeText(cursor.node);
+                if (cursor.text.length)
+                    cursor.index = cursor.text.length;
+                else
+                    cursor.index = cursor.node.childNodes.length;
+                if (cursor.node.constructor != Text)
+                    nodesCrossed.push(cursor.node);
+                continue;
+            }
+
+            // Return the previous character from this leaf node.
+            if (cursor.text.length > 0 && cursor.index > 0) {
+                return cursor.text[--cursor.index];
+            }
+
+            // Move to the previous sibling, going up the tree as necessary.
+            while (true) {
+                // Try to move to the previous sibling.
+                var siblingNode = null;
+                for (var node = cursor.node.previousSibling;
+                    node != null;
+                    node = node.previousSibling) {
+                    if (TraverseUtil.isSkipped(node)) {
+                        nodesCrossed.push(node);
+                        continue;
+                    }
+                    if (TraverseUtil.isVisible(node)) {
+                        siblingNode = node;
+                        break;
+                    }
+                }
+                if (siblingNode) {
+                    cursor.node = siblingNode;
+                    cursor.text = TraverseUtil.getNodeText(siblingNode);
+                    if (cursor.text.length)
+                        cursor.index = cursor.text.length;
+                    else
+                        cursor.index = cursor.node.childNodes.length;
+                    if (cursor.node.constructor != Text)
+                        nodesCrossed.push(cursor.node);
+                    break;
+                }
+
+                // Otherwise, move to the parent.
+                if (cursor.node.parentNode &&
+                    cursor.node.parentNode.constructor != HTMLBodyElement) {
+                    cursor.node = cursor.node.parentNode;
+                    cursor.text = null;
+                    cursor.index = 0;
+                } else {
+                    return null;
+                }
+            }
+        }
+    };
+
+    /**
+     * Finds the next character, starting from endCursor.  Upon exit, startCursor
+     * and endCursor will surround the next character. If skipWhitespace is
+     * true, will skip until a real character is found. Otherwise, it will
+     * attempt to select all of the whitespace between the initial position
+     * of endCursor and the next non-whitespace character.
+     * @param {Cursor} startCursor On exit, points to the position before
+     *     the char.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     char.  On exit, will point to the position past the char.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {boolean} skipWhitespace If true, will keep scanning until a
+     *     non-whitespace character is found.
+     * @return {?string} The next char, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getNextChar = function(
+        startCursor, endCursor, nodesCrossed, skipWhitespace) {
+
+        // Save the starting position and get the first character.
+        startCursor.copyFrom(endCursor);
+        var c = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
+        if (c == null)
+        return null;
+
+        // Keep track of whether the first character was whitespace.
+        var initialWhitespace = TraverseUtil.isWhitespace(c);
+
+        // Keep scanning until we find a non-whitespace or non-skipped character.
+        while ((TraverseUtil.isWhitespace(c)) ||
+            (TraverseUtil.isSkipped(endCursor.node))) {
+            c = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
+            if (c == null)
+            return null;
+        }
+        if (skipWhitespace || !initialWhitespace) {
+            // If skipWhitepace is true, or if the first character we encountered
+            // was not whitespace, return that non-whitespace character.
+            startCursor.copyFrom(endCursor);
+            startCursor.index--;
+            return c;
+        }
+        else {
+            for (var i = 0; i < nodesCrossed.length; i++) {
+                if (TraverseUtil.isSkipped(nodesCrossed[i])) {
+                    // We need to make sure that startCursor and endCursor aren't
+                    // surrounding a skippable node.
+                    endCursor.index--;
+                    startCursor.copyFrom(endCursor);
+                    startCursor.index--;
+                    return ' ';
+                }
+            }
+            // Otherwise, return all of the whitespace before that last character.
+            endCursor.index--;
+            return ' ';
+        }
+    };
+
+    /**
+     * Finds the previous character, starting from startCursor.  Upon exit,
+     * startCursor and endCursor will surround the previous character.
+     * If skipWhitespace is true, will skip until a real character is found.
+     * Otherwise, it will attempt to select all of the whitespace between
+     * the initial position of endCursor and the next non-whitespace character.
+     * @param {Cursor} startCursor The position to start searching for the
+     *     char. On exit, will point to the position before the char.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     char. On exit, will point to the position past the char.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {boolean} skipWhitespace If true, will keep scanning until a
+     *     non-whitespace character is found.
+     * @return {?string} The previous char, or null if the top of the
+     *     document has been reached.
+     */
+    TraverseUtil.getPreviousChar = function(
+        startCursor, endCursor, nodesCrossed, skipWhitespace) {
+
+        // Save the starting position and get the first character.
+        endCursor.copyFrom(startCursor);
+        var c = TraverseUtil.backwardsChar(startCursor, nodesCrossed);
+        if (c == null)
+        return null;
+
+        // Keep track of whether the first character was whitespace.
+        var initialWhitespace = TraverseUtil.isWhitespace(c);
+
+        // Keep scanning until we find a non-whitespace or non-skipped character.
+        while ((TraverseUtil.isWhitespace(c)) ||
+            (TraverseUtil.isSkipped(startCursor.node))) {
+            c = TraverseUtil.backwardsChar(startCursor, nodesCrossed);
+            if (c == null)
+            return null;
+        }
+        if (skipWhitespace || !initialWhitespace) {
+            // If skipWhitepace is true, or if the first character we encountered
+            // was not whitespace, return that non-whitespace character.
+            endCursor.copyFrom(startCursor);
+            endCursor.index++;
+            return c;
+        } else {
+            for (var i = 0; i < nodesCrossed.length; i++) {
+                if (TraverseUtil.isSkipped(nodesCrossed[i])) {
+                    startCursor.index++;
+                    endCursor.copyFrom(startCursor);
+                    endCursor.index++;
+                    return ' ';
+                }
+            }
+            // Otherwise, return all of the whitespace before that last character.
+            startCursor.index++;
+            return ' ';
+        }
+    };
+
+    /**
+     * Finds the next word, starting from endCursor.  Upon exit, startCursor
+     * and endCursor will surround the next word.  A word is defined to be
+     * a string of 1 or more non-whitespace characters in the same DOM node.
+     * @param {Cursor} startCursor On exit, will point to the beginning of the
+     *     word returned.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     word.  On exit, will point to the end of the word returned.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The next word, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getNextWord = function(startCursor, endCursor,
+        nodesCrossed) {
+
+        // Find the first non-whitespace or non-skipped character.
+        var cursor = endCursor.clone();
+        var c = TraverseUtil.forwardsChar(cursor, nodesCrossed);
+        if (c == null)
+        return null;
+        while ((TraverseUtil.isWhitespace(c)) ||
+            (TraverseUtil.isSkipped(cursor.node))) {
+            c = TraverseUtil.forwardsChar(cursor, nodesCrossed);
+            if (c == null)
+            return null;
+        }
+
+        // Set startCursor to the position immediately before the first
+        // character in our word. It's safe to decrement |index| because
+        // forwardsChar guarantees that the cursor will be immediately to the
+        // right of the returned character on exit.
+        startCursor.copyFrom(cursor);
+        startCursor.index--;
+
+        // Keep building up our word until we reach a whitespace character or
+        // would cross a tag.  Don't actually return any tags crossed, because this
+        // word goes up until the tag boundary but not past it.
+        endCursor.copyFrom(cursor);
+        var word = c;
+        var newNodesCrossed = [];
+        c = TraverseUtil.forwardsChar(cursor, newNodesCrossed);
+        if (c == null) {
+            return word;
+        }
+        while (!TraverseUtil.isWhitespace(c) &&
+            newNodesCrossed.length == 0) {
+            word += c;
+            endCursor.copyFrom(cursor);
+            c = TraverseUtil.forwardsChar(cursor, newNodesCrossed);
+            if (c == null) {
+                return word;
+            }
+        }
+        return word;
+    };
+
+    /**
+     * Finds the previous word, starting from startCursor.  Upon exit, startCursor
+     * and endCursor will surround the previous word.  A word is defined to be
+     * a string of 1 or more non-whitespace characters in the same DOM node.
+     * @param {Cursor} startCursor The position to start searching for the
+     *     previous word.  On exit, will point to the beginning of the
+     *     word returned.
+     * @param {Cursor} endCursor On exit, will point to the end of the
+     *     word returned.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The previous word, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getPreviousWord = function(startCursor, endCursor,
+        nodesCrossed) {
+        // Find the first non-whitespace or non-skipped character.
+        var cursor = startCursor.clone();
+        var c = TraverseUtil.backwardsChar(cursor, nodesCrossed);
+        if (c == null)
+        return null;
+        while ((TraverseUtil.isWhitespace(c) ||
+            (TraverseUtil.isSkipped(cursor.node)))) {
+            c = TraverseUtil.backwardsChar(cursor, nodesCrossed);
+            if (c == null)
+            return null;
+        }
+
+        // Set endCursor to the position immediately after the first
+        // character we've found (the last character of the word, since we're
+        // searching backwards).
+        endCursor.copyFrom(cursor);
+        endCursor.index++;
+
+        // Keep building up our word until we reach a whitespace character or
+        // would cross a tag.  Don't actually return any tags crossed, because this
+        // word goes up until the tag boundary but not past it.
+        startCursor.copyFrom(cursor);
+        var word = c;
+        var newNodesCrossed = [];
+        c = TraverseUtil.backwardsChar(cursor, newNodesCrossed);
+        if (c == null)
+        return word;
+        while (!TraverseUtil.isWhitespace(c) &&
+            newNodesCrossed.length == 0) {
+            word = c + word;
+            startCursor.copyFrom(cursor);
+            c = TraverseUtil.backwardsChar(cursor, newNodesCrossed);
+            if (c == null)
+            return word;
+        }
+
+        return word;
+    };
+
+    /**
+     * Finds the next sentence, starting from endCursor.  Upon exit,
+     * startCursor and endCursor will surround the next sentence.
+     *
+     * @param {Cursor} startCursor On exit, marks the beginning of the sentence.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     sentence.  On exit, will point to the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {Object} breakTags Associative array of tags that should break
+     *     the sentence.
+     * @return {?string} The next sentence, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getNextSentence = function(
+        startCursor, endCursor, nodesCrossed, breakTags) {
+        return TraverseUtil.getNextString(
+            startCursor, endCursor, nodesCrossed,
+            function(str, word, nodes) {
+                if (str.substr(-1) == '.')
+                    return true;
+                for (var i = 0; i < nodes.length; i++) {
+                    if (TraverseUtil.isSkipped(nodes[i])) {
+                        return true;
+                    }
+                    var style = window.getComputedStyle(nodes[i], null);
+                    if (style && (style.display != 'inline' ||
+                        breakTags[nodes[i].tagName])) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+    };
+
+    /**
+     * Finds the previous sentence, starting from startCursor.  Upon exit,
+     * startCursor and endCursor will surround the previous sentence.
+     *
+     * @param {Cursor} startCursor The position to start searching for the next
+     *     sentence.  On exit, will point to the start of the returned string.
+     * @param {Cursor} endCursor On exit, the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {Object} breakTags Associative array of tags that should break
+     *     the sentence.
+     * @return {?string} The previous sentence, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getPreviousSentence = function(
+        startCursor, endCursor, nodesCrossed, breakTags) {
+        return TraverseUtil.getPreviousString(
+            startCursor, endCursor, nodesCrossed,
+            function(str, word, nodes) {
+                if (word.substr(-1) == '.')
+                    return true;
+                for (var i = 0; i < nodes.length; i++) {
+                    if (TraverseUtil.isSkipped(nodes[i])) {
+                        return true;
+                    }
+                    var style = window.getComputedStyle(nodes[i], null);
+                    if (style && (style.display != 'inline' ||
+                        breakTags[nodes[i].tagName])) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+    };
+
+    /**
+     * Finds the next line, starting from endCursor.  Upon exit,
+     * startCursor and endCursor will surround the next line.
+     *
+     * @param {Cursor} startCursor On exit, marks the beginning of the line.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     line.  On exit, will point to the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {number} lineLength The maximum number of characters in a line.
+     * @param {Object} breakTags Associative array of tags that should break
+     *     the line.
+     * @return {?string} The next line, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getNextLine = function(
+        startCursor, endCursor, nodesCrossed, lineLength, breakTags) {
+        return TraverseUtil.getNextString(
+            startCursor, endCursor, nodesCrossed,
+            function(str, word, nodes) {
+                if (str.length + word.length + 1 > lineLength)
+                    return true;
+                for (var i = 0; i < nodes.length; i++) {
+                    if (TraverseUtil.isSkipped(nodes[i])) {
+                        return true;
+                    }
+                    var style = window.getComputedStyle(nodes[i], null);
+                    if (style && (style.display != 'inline' ||
+                        breakTags[nodes[i].tagName])) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+    };
+
+    /**
+     * Finds the previous line, starting from startCursor.  Upon exit,
+     * startCursor and endCursor will surround the previous line.
+     *
+     * @param {Cursor} startCursor The position to start searching for the next
+     *     line.  On exit, will point to the start of the returned string.
+     * @param {Cursor} endCursor On exit, the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {number} lineLength The maximum number of characters in a line.
+     * @param {Object} breakTags Associative array of tags that should break
+     *     the sentence.
+     *  @return {?string} The previous line, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getPreviousLine = function(
+        startCursor, endCursor, nodesCrossed, lineLength, breakTags) {
+        return TraverseUtil.getPreviousString(
+            startCursor, endCursor, nodesCrossed,
+            function(str, word, nodes) {
+                if (str.length + word.length + 1 > lineLength)
+                    return true;
+                for (var i = 0; i < nodes.length; i++) {
+                    if (TraverseUtil.isSkipped(nodes[i])) {
+                        return true;
+                    }
+                    var style = window.getComputedStyle(nodes[i], null);
+                    if (style && (style.display != 'inline' ||
+                        breakTags[nodes[i].tagName])) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+    };
+
+    /**
+     * Finds the next paragraph, starting from endCursor.  Upon exit,
+     * startCursor and endCursor will surround the next paragraph.
+     *
+     * @param {Cursor} startCursor On exit, marks the beginning of the paragraph.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     paragraph.  On exit, will point to the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The next paragraph, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getNextParagraph = function(startCursor, endCursor,
+        nodesCrossed) {
+        return TraverseUtil.getNextString(
+            startCursor, endCursor, nodesCrossed,
+            function(str, word, nodes) {
+                for (var i = 0; i < nodes.length; i++) {
+                    if (TraverseUtil.isSkipped(nodes[i])) {
+                        return true;
+                    }
+                    var style = window.getComputedStyle(nodes[i], null);
+                    if (style && style.display != 'inline') {
+                        return true;
+                    }
+                }
+                return false;
+            });
+    };
+
+    /**
+     * Finds the previous paragraph, starting from startCursor.  Upon exit,
+     * startCursor and endCursor will surround the previous paragraph.
+     *
+     * @param {Cursor} startCursor The position to start searching for the next
+     *     paragraph.  On exit, will point to the start of the returned string.
+     * @param {Cursor} endCursor On exit, the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The previous paragraph, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getPreviousParagraph = function(
+        startCursor, endCursor, nodesCrossed) {
+        return TraverseUtil.getPreviousString(
+            startCursor, endCursor, nodesCrossed,
+            function(str, word, nodes) {
+                for (var i = 0; i < nodes.length; i++) {
+                    if (TraverseUtil.isSkipped(nodes[i])) {
+                        return true;
+                    }
+                    var style = window.getComputedStyle(nodes[i], null);
+                    if (style && style.display != 'inline') {
+                        return true;
+                    }
+                }
+                return false;
+            });
+    };
+
+    /**
+     * Customizable function to return the next string of words in the DOM, based
+     * on provided functions to decide when to break one string and start
+     * the next. This can be used to get the next sentence, line, paragraph,
+     * or potentially other granularities.
+     *
+     * Finds the next contiguous string, starting from endCursor.  Upon exit,
+     * startCursor and endCursor will surround the next string.
+     *
+     * The breakBefore function takes three parameters, and
+     * should return true if the string should be broken before the proposed
+     * next word:
+     *   str The string so far.
+     *   word The next word to be added.
+     *   nodesCrossed The nodes crossed in reaching this next word.
+     *
+     * @param {Cursor} startCursor On exit, will point to the beginning of the
+     *     next string.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     string.  On exit, will point to the end of the returned string.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {function(string, string, Array<string>)} breakBefore
+     *     Function that takes the string so far, next word to be added, and
+     *     nodes crossed, and returns true if the string should be ended before
+     *     adding this word.
+     * @return {?string} The next string, or null if the bottom of the
+     *     document has been reached.
+     */
+    TraverseUtil.getNextString = function(
+        startCursor, endCursor, nodesCrossed, breakBefore) {
+        // Get the first word and set the start cursor to the start of the
+        // first word.
+        var wordStartCursor = endCursor.clone();
+        var wordEndCursor = endCursor.clone();
+        var newNodesCrossed = [];
+        var str = '';
+        var word = TraverseUtil.getNextWord(
+            wordStartCursor, wordEndCursor, newNodesCrossed);
+        if (word == null)
+        return null;
+        startCursor.copyFrom(wordStartCursor);
+
+        // Always add the first word when the string is empty, and then keep
+        // adding more words as long as breakBefore returns false
+        while (!str || !breakBefore(str, word, newNodesCrossed)) {
+            // Append this word, set the end cursor to the end of this word, and
+            // update the returned list of nodes crossed to include ones we crossed
+            // in reaching this word.
+            if (str)
+                str += ' ';
+            str += word;
+            nodesCrossed = nodesCrossed.concat(newNodesCrossed);
+            endCursor.copyFrom(wordEndCursor);
+
+            // Get the next word and go back to the top of the loop.
+            newNodesCrossed = [];
+            word = TraverseUtil.getNextWord(
+                wordStartCursor, wordEndCursor, newNodesCrossed);
+            if (word == null)
+                return str;
+        }
+
+        return str;
+    };
+
+    /**
+     * Customizable function to return the previous string of words in the DOM,
+     * based on provided functions to decide when to break one string and start
+     * the next. See getNextString, above, for more details.
+     *
+     * Finds the previous contiguous string, starting from startCursor.  Upon exit,
+     * startCursor and endCursor will surround the next string.
+     *
+     * @param {Cursor} startCursor The position to start searching for the
+     *     previous string.  On exit, will point to the beginning of the
+     *     string returned.
+     * @param {Cursor} endCursor On exit, will point to the end of the
+     *     string returned.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {function(string, string, Array<string>)} breakBefore
+     *     Function that takes the string so far, the word to be added, and
+     *     nodes crossed, and returns true if the string should be ended before
+     *     adding this word.
+     * @return {?string} The next string, or null if the top of the
+     *     document has been reached.
+     */
+    TraverseUtil.getPreviousString = function(
+        startCursor, endCursor, nodesCrossed, breakBefore) {
+        // Get the first word and set the end cursor to the end of the
+        // first word.
+        var wordStartCursor = startCursor.clone();
+        var wordEndCursor = startCursor.clone();
+        var newNodesCrossed = [];
+        var str = '';
+        var word = TraverseUtil.getPreviousWord(
+            wordStartCursor, wordEndCursor, newNodesCrossed);
+        if (word == null)
+        return null;
+        endCursor.copyFrom(wordEndCursor);
+
+        // Always add the first word when the string is empty, and then keep
+        // adding more words as long as breakBefore returns false
+        while (!str || !breakBefore(str, word, newNodesCrossed)) {
+            // Prepend this word, set the start cursor to the start of this word, and
+            // update the returned list of nodes crossed to include ones we crossed
+            // in reaching this word.
+            if (str)
+                str = ' ' + str;
+            str = word + str;
+            nodesCrossed = nodesCrossed.concat(newNodesCrossed);
+            startCursor.copyFrom(wordStartCursor);
+            v
+            // Get the previous word and go back to the top of the loop.
+            newNodesCrossed = [];
+            word = TraverseUtil.getPreviousWord(
+                wordStartCursor, wordEndCursor, newNodesCrossed);
+            if (word == null)
+                return str;
+        }
+
+        return str;
+    };
+
+
+    function isFocusable(targetNode) {
+        if (!targetNode || typeof(targetNode.tabIndex) != 'number') {
+            return false;
+        }
+
+        if (targetNode.tabIndex >= 0) {
+            return true;
+        }
+
+        if (targetNode.hasAttribute &&
+            targetNode.hasAttribute('tabindex') &&
+            targetNode.getAttribute('tabindex') == '-1') {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Determines whether or not a node is or is the descendant of another node.
+     *
+     * @param {Object} node The node to be checked.
+     * @param {Object} ancestor The node to see if it's a descendant of.
+     * @return {boolean} True if the node is ancestor or is a descendant of it.
+     */
+    function isDescendantOfNode(node, ancestor) {
+        while (node && ancestor) {
+            if (node.isSameNode(ancestor)) {
+                return true;
+            }
+            node = node.parentNode;
+        }
+        return false;
+    }
+
+
+    var CaretBrowsing = function() {};
+
+    /**
+     * Is caret browsing enabled?
+     * @type {boolean}
+     */
+    CaretBrowsing.isEnabled = false;
+
+    /**
+     * Keep it enabled even when flipped off (for the options page)?
+     * @type {boolean}
+     */
+    CaretBrowsing.forceEnabled = false;
+
+    /**
+     * What to do when the caret appears?
+     * @type {string}
+     */
+    CaretBrowsing.onEnable;
+
+    /**
+     * What to do when the caret jumps?
+     * @type {string}
+     */
+    CaretBrowsing.onJump;
+
+    /**
+     * Is this window / iframe focused? We won't show the caret if not,
+     * especially so that carets aren't shown in two iframes of the same
+     * tab.
+     * @type {boolean}
+     */
+    CaretBrowsing.isWindowFocused = false;
+
+    /**
+     * Is the caret actually visible? This is true only if isEnabled and
+     * isWindowFocused are both true.
+     * @type {boolean}
+     */
+    CaretBrowsing.isCaretVisible = false;
+
+    /**
+     * The actual caret element, an absolute-positioned flashing line.
+     * @type {Element}
+     */
+    CaretBrowsing.caretElement;
+
+    /**
+     * The x-position of the caret, in absolute pixels.
+     * @type {number}
+     */
+    CaretBrowsing.caretX = 0;
+
+    /**
+     * The y-position of the caret, in absolute pixels.
+     * @type {number}
+     */
+    CaretBrowsing.caretY = 0;
+
+    /**
+     * The width of the caret in pixels.
+     * @type {number}
+     */
+    CaretBrowsing.caretWidth = 0;
+
+    /**
+     * The height of the caret in pixels.
+     * @type {number}
+     */
+    CaretBrowsing.caretHeight = 0;
+
+    /**
+     * The foregroundc color.
+     * @type {string}
+     */
+    CaretBrowsing.caretForeground = '#000';
+
+    /**
+     * The backgroundc color.
+     * @type {string}
+     */
+    CaretBrowsing.caretBackground = '#fff';
+
+    /**
+     * Is the selection collapsed, i.e. are the start and end locations
+     * the same? If so, our blinking caret image is shown; otherwise
+     * the Chrome selection is shown.
+     * @type {boolean}
+     */
+    CaretBrowsing.isSelectionCollapsed = false;
+
+    /**
+     * The id returned by window.setInterval for our blink function, so
+     * we can cancel it when caret browsing is disabled.
+     * @type {number?}
+     */
+    CaretBrowsing.blinkFunctionId = null;
+
+    /**
+     * The desired x-coordinate to match when moving the caret up and down.
+     * To match the behavior as documented in Mozilla's caret browsing spec
+     * (http://www.mozilla.org/access/keyboard/proposal), we keep track of the
+     * initial x position when the user starts moving the caret up and down,
+     * so that the x position doesn't drift as you move throughout lines, but
+     * stays as close as possible to the initial position. This is reset when
+     * moving left or right or clicking.
+     * @type {number?}
+     */
+    CaretBrowsing.targetX = null;
+
+    /**
+     * A flag that flips on or off as the caret blinks.
+     * @type {boolean}
+     */
+    CaretBrowsing.blinkFlag = true;
+
+    /**
+     * Whether or not we're on a Mac - affects modifier keys.
+     * @type {boolean}
+     */
+    CaretBrowsing.isMac = (navigator.appVersion.indexOf("Mac") != -1);
+
+    /**
+     * Check if a node is a control that normally allows the user to interact
+     * with it using arrow keys. We won't override the arrow keys when such a
+     * control has focus, the user must press Escape to do caret browsing outside
+     * that control.
+     * @param {Node} node A node to check.
+     * @return {boolean} True if this node is a control that the user can
+     *     interact with using arrow keys.
+     */
+    CaretBrowsing.isControlThatNeedsArrowKeys = function(node) {
+        if (!node) {
+            return false;
+        }
+
+        if (node == document.body || node != document.activeElement) {
+            return false;
+        }
+
+        if (node.constructor == HTMLSelectElement) {
+            return true;
+        }
+
+        if (node.constructor == HTMLInputElement) {
+            switch (node.type) {
+                case 'email':
+                case 'number':
+                case 'password':
+                case 'search':
+                case 'text':
+                case 'tel':
+                case 'url':
+                case '':
+                    return true;  // All of these are text boxes.
+                case 'datetime':
+                case 'datetime-local':
+                case 'date':
+                case 'month':
+                case 'radio':
+                case 'range':
+                case 'week':
+                    return true;  // These are other input elements that use arrows.
+            }
+        }
+
+        // Handle focusable ARIA controls.
+        if (node.getAttribute && isFocusable(node)) {
+            var role = node.getAttribute('role');
+            switch (role) {
+                case 'combobox':
+                case 'grid':
+                case 'gridcell':
+                case 'listbox':
+                case 'menu':
+                case 'menubar':
+                case 'menuitem':
+                case 'menuitemcheckbox':
+                case 'menuitemradio':
+                case 'option':
+                case 'radiogroup':
+                case 'scrollbar':
+                case 'slider':
+                case 'spinbutton':
+                case 'tab':
+                case 'tablist':
+                case 'textbox':
+                case 'tree':
+                case 'treegrid':
+                case 'treeitem':
+                    return true;
+            }
+        }
+
+        return false;
+    };
+
+    /**
+     * If there's no initial selection, set the cursor just before the
+     * first text character in the document.
+     */
+    funcs.setInitialCursor = () => {
+        CaretBrowsing.setInitialCursor();
+    }
+
+    CaretBrowsing.setInitialCursor = function() {
+        var sel = window.getSelection();
+        if (sel.rangeCount > 0) {
+            return;
+        }
+
+        var start = new Cursor(document.body, 0, '');
+        var end = new Cursor(document.body, 0, '');
+        var nodesCrossed = [];
+        var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
+        if (result == null) {
+            return;
+        }
+        CaretBrowsing.setAndValidateSelection(start, start);
+        CaretBrowsing.toggle();
+    };
+
+    /**
+     * Try to set the window's selection to be between the given start and end
+     * cursors, and return whether or not it was successful.
+     * @param {Cursor} start The start position.
+     * @param {Cursor} end The end position.
+     * @return {boolean} True if the selection was successfully set.
+     */
+    CaretBrowsing.setAndValidateSelection = function(start, end) {
+        var sel = window.getSelection();
+        sel.setBaseAndExtent(start.node, start.index, end.node, end.index);
+
+        if (sel.rangeCount != 1) {
+            return false;
+        }
+
+        return (sel.anchorNode == start.node &&
+            sel.anchorOffset == start.index &&
+            sel.focusNode == end.node &&
+            sel.focusOffset == end.index);
+    };
+
+
+    CaretBrowsing.setFocusToNode = function(node) {
+        while (node && node != document.body) {
+            if (isFocusable(node) && node.constructor != HTMLIFrameElement) {
+                node.focus();
+                if (node.constructor == HTMLInputElement && node.select) {
+                    node.select();
+                }
+                return true;
+            }
+            node = node.parentNode;
+        }
+
+        return false;
+    };
+
+    /**
+     * Set focus to the first focusable node in the given list.
+     * select the text, otherwise it doesn't appear focused to the user.
+     * Every other control behaves normally if you just call focus() on it.
+     * @param {Array<Node>} nodeList An array of nodes to focus.
+     * @return {boolean} True if the node was focused.
+     */
+    CaretBrowsing.setFocusToFirstFocusable = function(nodeList) {
+        for (var i = 0; i < nodeList.length; i++) {
+            if (CaretBrowsing.setFocusToNode(nodeList[i])) {
+                return true;
+            }
+        }
+        return false;
+    };
+
+    /**
+     * Set the caret element's normal style, i.e. not when animating.
+     */
+    CaretBrowsing.setCaretElementNormalStyle = function() {
+        var element = CaretBrowsing.caretElement;
+        element.className = 'CaretBrowsing_Caret';
+        element.style.opacity = CaretBrowsing.isSelectionCollapsed ? '1.0' : '0.0';
+        element.style.left = CaretBrowsing.caretX + 'px';
+        element.style.top = CaretBrowsing.caretY + 'px';
+        element.style.width = CaretBrowsing.caretWidth + 'px';
+        element.style.height = CaretBrowsing.caretHeight + 'px';
+        element.style.color = CaretBrowsing.caretForeground;
+    };
+
+    /**
+     * Animate the caret element into the normal style.
+     */
+    CaretBrowsing.animateCaretElement = function() {
+        var element = CaretBrowsing.caretElement;
+        element.style.left = (CaretBrowsing.caretX - 50) + 'px';
+        element.style.top = (CaretBrowsing.caretY - 100) + 'px';
+        element.style.width = (CaretBrowsing.caretWidth + 100) + 'px';
+        element.style.height = (CaretBrowsing.caretHeight + 200) + 'px';
+        element.className = 'CaretBrowsing_AnimateCaret';
+
+        // Start the animation. The setTimeout is so that the old values will get
+        // applied first, so we can animate to the new values.
+        window.setTimeout(function() {
+            if (!CaretBrowsing.caretElement) {
+                return;
+            }
+            CaretBrowsing.setCaretElementNormalStyle();
+            element.style['transition'] = 'all 0.8s ease-in';
+            function listener() {
+                element.removeEventListener(
+                    'transitionend', listener, false);
+                element.style['transition'] = 'none';
+            }
+            element.addEventListener(
+                'transitionend', listener, false);
+        }, 0);
+    };
+
+    /**
+     * Quick flash and then show the normal caret style.
+     */
+    CaretBrowsing.flashCaretElement = function() {
+        var x = CaretBrowsing.caretX;
+        var y = CaretBrowsing.caretY;
+        var height = CaretBrowsing.caretHeight;
+
+        var vert = document.createElement('div');
+        vert.className = 'CaretBrowsing_FlashVert';
+        vert.style.left = (x - 6) + 'px';
+        vert.style.top = (y - 100) + 'px';
+        vert.style.width = '11px';
+        vert.style.height = (200) + 'px';
+        document.body.appendChild(vert);
+
+        window.setTimeout(function() {
+            document.body.removeChild(vert);
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.setCaretElementNormalStyle();
+            }
+        }, 250);
+    };
+
+    /**
+     * Create the caret element. This assumes that caretX, caretY,
+     * caretWidth, and caretHeight have all been set. The caret is
+     * animated in so the user can find it when it first appears.
+     */
+    CaretBrowsing.createCaretElement = function() {
+        var element = document.createElement('div');
+        element.className = 'CaretBrowsing_Caret';
+        document.body.appendChild(element);
+        CaretBrowsing.caretElement = element;
+
+        if (CaretBrowsing.onEnable == 'anim') {
+            CaretBrowsing.animateCaretElement();
+        } else if (CaretBrowsing.onEnable == 'flash') {
+            CaretBrowsing.flashCaretElement();
+        } else {
+            CaretBrowsing.setCaretElementNormalStyle();
+        }
+    };
+
+    /**
+     * Recreate the caret element, triggering any intro animation.
+     */
+    CaretBrowsing.recreateCaretElement = function() {
+        if (CaretBrowsing.caretElement) {
+            window.clearInterval(CaretBrowsing.blinkFunctionId);
+            CaretBrowsing.caretElement.parentElement.removeChild(
+                CaretBrowsing.caretElement);
+            CaretBrowsing.caretElement = null;
+            CaretBrowsing.updateIsCaretVisible();
+        }
+    };
+
+    /**
+     * Get the rectangle for a cursor position. This is tricky because
+     * you can't get the bounding rectangle of an empty range, so this function
+     * computes the rect by trying a range including one character earlier or
+     * later than the cursor position.
+     * @param {Cursor} cursor A single cursor position.
+     * @return {{left: number, top: number, width: number, height: number}}
+     *     The bounding rectangle of the cursor.
+     */
+    CaretBrowsing.getCursorRect = function(cursor) {
+        var node = cursor.node;
+        var index = cursor.index;
+        var rect = {
+            left: 0,
+            top: 0,
+            width: 1,
+            height: 0
+        };
+        if (node.constructor == Text) {
+            var left = index;
+            var right = index;
+            var max = node.data.length;
+            var newRange = document.createRange();
+            while (left > 0 || right < max) {
+                if (left > 0) {
+                    left--;
+                    newRange.setStart(node, left);
+                    newRange.setEnd(node, index);
+                    var rangeRect = newRange.getBoundingClientRect();
+                    if (rangeRect && rangeRect.width && rangeRect.height) {
+                        rect.left = rangeRect.right;
+                        rect.top = rangeRect.top;
+                        rect.height = rangeRect.height;
+                        break;
+                    }
+                }
+                if (right < max) {
+                    right++;
+                    newRange.setStart(node, index);
+                    newRange.setEnd(node, right);
+                    var rangeRect = newRange.getBoundingClientRect();
+                    if (rangeRect && rangeRect.width && rangeRect.height) {
+                        rect.left = rangeRect.left;
+                        rect.top = rangeRect.top;
+                        rect.height = rangeRect.height;
+                        break;
+                    }
+                }
+            }
+        } else {
+            rect.height = node.offsetHeight;
+            while (node !== null) {
+                rect.left += node.offsetLeft;
+                rect.top += node.offsetTop;
+                node = node.offsetParent;
+            }
+        }
+        rect.left += window.pageXOffset;
+        rect.top += window.pageYOffset;
+        return rect;
+    };
+
+    /**
+     * Compute the new location of the caret or selection and update
+     * the element as needed.
+     * @param {boolean} scrollToSelection If true, will also scroll the page
+     *     to the caret / selection location.
+     */
+    CaretBrowsing.updateCaretOrSelection = function(scrollToSelection) {
+        var previousX = CaretBrowsing.caretX;
+        var previousY = CaretBrowsing.caretY;
+
+        var sel = window.getSelection();
+        if (sel.rangeCount == 0) {
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.isSelectionCollapsed = false;
+                CaretBrowsing.caretElement.style.opacity = '0.0';
+            }
+            return;
+        }
+
+        var range = sel.getRangeAt(0);
+        if (!range) {
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.isSelectionCollapsed = false;
+                CaretBrowsing.caretElement.style.opacity = '0.0';
+            }
+            return;
+        }
+
+        if (CaretBrowsing.isControlThatNeedsArrowKeys(document.activeElement)) {
+            var node = document.activeElement;
+            CaretBrowsing.caretWidth = node.offsetWidth;
+            CaretBrowsing.caretHeight = node.offsetHeight;
+            CaretBrowsing.caretX = 0;
+            CaretBrowsing.caretY = 0;
+            while (node.offsetParent) {
+                CaretBrowsing.caretX += node.offsetLeft;
+                CaretBrowsing.caretY += node.offsetTop;
+                node = node.offsetParent;
+            }
+            CaretBrowsing.isSelectionCollapsed = false;
+        } else if (range.startOffset != range.endOffset ||
+            range.startContainer != range.endContainer) {
+            var rect = range.getBoundingClientRect();
+            if (!rect) {
+                return;
+            }
+            CaretBrowsing.caretX = rect.left + window.pageXOffset;
+            CaretBrowsing.caretY = rect.top + window.pageYOffset;
+            CaretBrowsing.caretWidth = rect.width;
+            CaretBrowsing.caretHeight = rect.height;
+            CaretBrowsing.isSelectionCollapsed = false;
+        } else {
+            var rect = CaretBrowsing.getCursorRect(
+                new Cursor(range.startContainer,
+                    range.startOffset,
+                    TraverseUtil.getNodeText(range.startContainer)));
+            CaretBrowsing.caretX = rect.left;
+            CaretBrowsing.caretY = rect.top;
+            CaretBrowsing.caretWidth = rect.width;
+            CaretBrowsing.caretHeight = rect.height;
+            CaretBrowsing.isSelectionCollapsed = true;
+        }
+
+        if (!CaretBrowsing.caretElement) {
+            CaretBrowsing.createCaretElement();
+        } else {
+            var element = CaretBrowsing.caretElement;
+            if (CaretBrowsing.isSelectionCollapsed) {
+                element.style.opacity = '1.0';
+                element.style.left = CaretBrowsing.caretX + 'px';
+                element.style.top = CaretBrowsing.caretY + 'px';
+                element.style.width = CaretBrowsing.caretWidth + 'px';
+                element.style.height = CaretBrowsing.caretHeight + 'px';
+            } else {
+                element.style.opacity = '0.0';
+            }
+        }
+
+        var elem = range.startContainer;
+        if (elem.constructor == Text)
+            elem = elem.parentElement;
+        var style = window.getComputedStyle(elem);
+        var bg = axs.utils.getBgColor(style, elem);
+        var fg = axs.utils.getFgColor(style, elem, bg);
+        CaretBrowsing.caretBackground = axs.color.colorToString(bg);
+        CaretBrowsing.caretForeground = axs.color.colorToString(fg);
+
+        if (scrollToSelection) {
+            // Scroll just to the "focus" position of the selection,
+            // the part the user is manipulating.
+            var rect = CaretBrowsing.getCursorRect(
+                new Cursor(sel.focusNode, sel.focusOffset,
+                    TraverseUtil.getNodeText(sel.focusNode)));
+
+            var yscroll = window.pageYOffset;
+            var pageHeight = window.innerHeight;
+            var caretY = rect.top;
+            var caretHeight = Math.min(rect.height, 30);
+            if (yscroll + pageHeight < caretY + caretHeight) {
+                window.scroll(0, (caretY + caretHeight - pageHeight + 100));
+            } else if (caretY < yscroll) {
+                window.scroll(0, (caretY - 100));
+            }
+        }
+
+        if (Math.abs(previousX - CaretBrowsing.caretX) > 500 ||
+            Math.abs(previousY - CaretBrowsing.caretY) > 100) {
+            if (CaretBrowsing.onJump == 'anim') {
+                CaretBrowsing.animateCaretElement();
+            } else if (CaretBrowsing.onJump == 'flash') {
+                CaretBrowsing.flashCaretElement();
+            }
+        }
+    };
+
+    /**
+     * Return true if the selection directionality is ambiguous, which happens
+     * if, for example, the user double-clicks in the middle of a word to select
+     * it. In that case, the selection should extend by the right edge if the
+     * user presses right, and by the left edge if the user presses left.
+     * @param {Selection} sel The selection.
+     * @return {boolean} True if the selection directionality is ambiguous.
+     */
+    CaretBrowsing.isAmbiguous = function(sel) {
+        return (sel.anchorNode != sel.baseNode ||
+            sel.anchorOffset != sel.baseOffset ||
+            sel.focusNode != sel.extentNode ||
+            sel.focusOffset != sel.extentOffset);
+    };
+
+    /**
+     * Create a Cursor from the anchor position of the selection, the
+     * part that doesn't normally move.
+     * @param {Selection} sel The selection.
+     * @return {Cursor} A cursor pointing to the selection's anchor location.
+     */
+    CaretBrowsing.makeAnchorCursor = function(sel) {
+        return new Cursor(sel.anchorNode, sel.anchorOffset,
+            TraverseUtil.getNodeText(sel.anchorNode));
+    };
+
+    /**
+     * Create a Cursor from the focus position of the selection.
+     * @param {Selection} sel The selection.
+     * @return {Cursor} A cursor pointing to the selection's focus location.
+     */
+    CaretBrowsing.makeFocusCursor = function(sel) {
+        return new Cursor(sel.focusNode, sel.focusOffset,
+            TraverseUtil.getNodeText(sel.focusNode));
+    };
+
+    /**
+     * Create a Cursor from the left boundary of the selection - the boundary
+     * closer to the start of the document.
+     * @param {Selection} sel The selection.
+     * @return {Cursor} A cursor pointing to the selection's left boundary.
+     */
+    CaretBrowsing.makeLeftCursor = function(sel) {
+        var range = sel.rangeCount == 1 ? sel.getRangeAt(0) : null;
+        if (range &&
+            range.endContainer == sel.anchorNode &&
+            range.endOffset == sel.anchorOffset) {
+            return CaretBrowsing.makeFocusCursor(sel);
+        } else {
+            return CaretBrowsing.makeAnchorCursor(sel);
+        }
+    };
+
+    /**
+     * Create a Cursor from the right boundary of the selection - the boundary
+     * closer to the end of the document.
+     * @param {Selection} sel The selection.
+     * @return {Cursor} A cursor pointing to the selection's right boundary.
+     */
+    CaretBrowsing.makeRightCursor = function(sel) {
+        var range = sel.rangeCount == 1 ? sel.getRangeAt(0) : null;
+        if (range &&
+            range.endContainer == sel.anchorNode &&
+            range.endOffset == sel.anchorOffset) {
+            return CaretBrowsing.makeAnchorCursor(sel);
+        } else {
+            return CaretBrowsing.makeFocusCursor(sel);
+        }
+    };
+
+    /**
+     * Try to set the window's selection to be between the given start and end
+     * cursors, and return whether or not it was successful.
+     * @param {Cursor} start The start position.
+     * @param {Cursor} end The end position.
+     * @return {boolean} True if the selection was successfully set.
+     */
+    CaretBrowsing.setAndValidateSelection = function(start, end) {
+        var sel = window.getSelection();
+        sel.setBaseAndExtent(start.node, start.index, end.node, end.index);
+
+        if (sel.rangeCount != 1) {
+            return false;
+        }
+
+        return (sel.anchorNode == start.node &&
+            sel.anchorOffset == start.index &&
+            sel.focusNode == end.node &&
+            sel.focusOffset == end.index);
+    };
+
+    /**
+     * Note: the built-in function by the same name is unreliable.
+     * @param {Selection} sel The selection.
+     * @return {boolean} True if the start and end positions are the same.
+     */
+    CaretBrowsing.isCollapsed = function(sel) {
+        return (sel.anchorOffset == sel.focusOffset &&
+            sel.anchorNode == sel.focusNode);
+    };
+
+    /**
+     * Determines if the modifier key is held down that should cause
+     * the cursor to move by word rather than by character.
+     * @param {Event} evt A keyboard event.
+     * @return {boolean} True if the cursor should move by word.
+     */
+    CaretBrowsing.isMoveByWordEvent = function(evt) {
+        if (CaretBrowsing.isMac) {
+            return evt.altKey;
+        } else {
+            return evt.ctrlKey;
+        }
+    };
+
+    /**
+     * Moves the cursor forwards to the next valid position.
+     * @param {Cursor} cursor The current cursor location.
+     *     On exit, the cursor will be at the next position.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The character reached, or null if the bottom of the
+     *     document has been reached.
+     */
+    CaretBrowsing.forwards = function(cursor, nodesCrossed) {
+        var previousCursor = cursor.clone();
+        var result = TraverseUtil.forwardsChar(cursor, nodesCrossed);
+
+        // Work around the fact that TraverseUtil.forwardsChar returns once per
+        // char in a block of text, rather than once per possible selection
+        // position in a block of text.
+        if (result && cursor.node != previousCursor.node && cursor.index > 0) {
+            cursor.index = 0;
+        }
+
+        return result;
+    };
+
+    /**
+     * Moves the cursor backwards to the previous valid position.
+     * @param {Cursor} cursor The current cursor location.
+     *     On exit, the cursor will be at the previous position.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The character reached, or null if the top of the
+     *     document has been reached.
+     */
+    CaretBrowsing.backwards = function(cursor, nodesCrossed) {
+        var previousCursor = cursor.clone();
+        var result = TraverseUtil.backwardsChar(cursor, nodesCrossed);
+
+        // Work around the fact that TraverseUtil.backwardsChar returns once per
+        // char in a block of text, rather than once per possible selection
+        // position in a block of text.
+        if (result &&
+            cursor.node != previousCursor.node &&
+            cursor.index < cursor.text.length) {
+            cursor.index = cursor.text.length;
+        }
+
+        return result;
+    };
+
+    /**
+     * Called when the user presses the right arrow. If there's a selection,
+     * moves the cursor to the end of the selection range. If it's a cursor,
+     * moves past one character.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
+    CaretBrowsing.moveRight = function(evt) {
+        CaretBrowsing.targetX = null;
+
+        var sel = window.getSelection();
+        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
+            var right = CaretBrowsing.makeRightCursor(sel);
+            CaretBrowsing.setAndValidateSelection(right, right);
+            return false;
+        }
+
+        var start = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeLeftCursor(sel) :
+            CaretBrowsing.makeAnchorCursor(sel);
+        var end = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeRightCursor(sel) :
+            CaretBrowsing.makeFocusCursor(sel);
+        var previousEnd = end.clone();
+        var nodesCrossed = [];
+        while (true) {
+            var result;
+            if (CaretBrowsing.isMoveByWordEvent(evt)) {
+                result = TraverseUtil.getNextWord(previousEnd, end, nodesCrossed);
+            } else {
+                previousEnd = end.clone();
+                result = CaretBrowsing.forwards(end, nodesCrossed);
+            }
+
+            if (result === null) {
+                return CaretBrowsing.moveLeft(evt);
+            }
+
+            if (CaretBrowsing.setAndValidateSelection(
+                evt.shiftKey ? start : end, end)) {
+                break;
+            }
+        }
+
+        if (!evt.shiftKey) {
+            nodesCrossed.push(end.node);
+            CaretBrowsing.setFocusToFirstFocusable(nodesCrossed);
+        }
+
+        return false;
+    };
+
+    /**
+     * Called when the user presses the left arrow. If there's a selection,
+     * moves the cursor to the start of the selection range. If it's a cursor,
+     * moves backwards past one character.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
+    CaretBrowsing.moveLeft = function(evt) {
+        CaretBrowsing.targetX = null;
+
+        var sel = window.getSelection();
+        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
+            var left = CaretBrowsing.makeLeftCursor(sel);
+            CaretBrowsing.setAndValidateSelection(left, left);
+            return false;
+        }
+
+        var start = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeLeftCursor(sel) :
+            CaretBrowsing.makeFocusCursor(sel);
+        var end = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeRightCursor(sel) :
+            CaretBrowsing.makeAnchorCursor(sel);
+        var previousStart = start.clone();
+        var nodesCrossed = [];
+        while (true) {
+            var result;
+            if (CaretBrowsing.isMoveByWordEvent(evt)) {
+                result = TraverseUtil.getPreviousWord(
+                    start, previousStart, nodesCrossed);
+            } else {
+                previousStart = start.clone();
+                result = CaretBrowsing.backwards(start, nodesCrossed);
+            }
+
+            if (result === null) {
+                break;
+            }
+
+            if (CaretBrowsing.setAndValidateSelection(
+                evt.shiftKey ? end : start, start)) {
+                break;
+            }
+        }
+
+        if (!evt.shiftKey) {
+            nodesCrossed.push(start.node);
+            CaretBrowsing.setFocusToFirstFocusable(nodesCrossed);
+        }
+
+        return false;
+    };
+
+
+    /**
+     * Called when the user presses the down arrow. If there's a selection,
+     * moves the cursor to the end of the selection range. If it's a cursor,
+     * attempts to move to the equivalent horizontal pixel position in the
+     * subsequent line of text. If this is impossible, go to the first character
+     * of the next line.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
+    CaretBrowsing.moveDown = function(evt) {
+        var sel = window.getSelection();
+        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
+            var right = CaretBrowsing.makeRightCursor(sel);
+            CaretBrowsing.setAndValidateSelection(right, right);
+            return false;
+        }
+
+        var start = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeLeftCursor(sel) :
+            CaretBrowsing.makeAnchorCursor(sel);
+        var end = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeRightCursor(sel) :
+            CaretBrowsing.makeFocusCursor(sel);
+        var endRect = CaretBrowsing.getCursorRect(end);
+        if (CaretBrowsing.targetX === null) {
+            CaretBrowsing.targetX = endRect.left;
+        }
+        var previousEnd = end.clone();
+        var leftPos = end.clone();
+        var rightPos = end.clone();
+        var bestPos = null;
+        var bestY = null;
+        var bestDelta = null;
+        var bestHeight = null;
+        var nodesCrossed = [];
+        var y = -1;
+        while (true) {
+            if (null === CaretBrowsing.forwards(rightPos, nodesCrossed)) {
+                if (CaretBrowsing.setAndValidateSelection(
+                    evt.shiftKey ? start : leftPos, leftPos)) {
+                    break;
+                } else {
+                    return CaretBrowsing.moveLeft(evt);
+                }
+                break;
+            }
+            var range = document.createRange();
+            range.setStart(leftPos.node, leftPos.index);
+            range.setEnd(rightPos.node, rightPos.index);
+            var rect = range.getBoundingClientRect();
+            if (rect && rect.width < rect.height) {
+                y = rect.top + window.pageYOffset;
+
+                // Return the best match so far if we get half a line past the best.
+                if (bestY != null && y > bestY + bestHeight / 2) {
+                    if (CaretBrowsing.setAndValidateSelection(
+                        evt.shiftKey ? start : bestPos, bestPos)) {
+                        break;
+                    } else {
+                        bestY = null;
+                    }
+                }
+
+                // Stop here if we're an entire line the wrong direction
+                // (for example, we reached the top of the next column).
+                if (y < endRect.top - endRect.height) {
+                    if (CaretBrowsing.setAndValidateSelection(
+                        evt.shiftKey ? start : leftPos, leftPos)) {
+                        break;
+                    }
+                }
+
+                // Otherwise look to see if this current position is on the
+                // next line and better than the previous best match, if any.
+                if (y >= endRect.top + endRect.height) {
+                    var deltaLeft = Math.abs(CaretBrowsing.targetX - rect.left);
+                    if ((bestDelta == null || deltaLeft < bestDelta) &&
+                        (leftPos.node != end.node || leftPos.index != end.index)) {
+                        bestPos = leftPos.clone();
+                        bestY = y;
+                        bestDelta = deltaLeft;
+                        bestHeight = rect.height;
+                    }
+                    var deltaRight = Math.abs(CaretBrowsing.targetX - rect.right);
+                    if (bestDelta == null || deltaRight < bestDelta) {
+                        bestPos = rightPos.clone();
+                        bestY = y;
+                        bestDelta = deltaRight;
+                        bestHeight = rect.height;
+                    }
+
+                    // Return the best match so far if the deltas are getting worse,
+                    // not better.
+                    if (bestDelta != null &&
+                        deltaLeft > bestDelta &&
+                        deltaRight > bestDelta) {
+                        if (CaretBrowsing.setAndValidateSelection(
+                            evt.shiftKey ? start : bestPos, bestPos)) {
+                            break;
+                        } else {
+                            bestY = null;
+                        }
+                    }
+                }
+            }
+            leftPos = rightPos.clone();
+        }
+
+        if (!evt.shiftKey) {
+            CaretBrowsing.setFocusToNode(leftPos.node);
+        }
+
+        return false;
+    };
+
+    /**
+     * Called when the user presses the up arrow. If there's a selection,
+     * moves the cursor to the start of the selection range. If it's a cursor,
+     * attempts to move to the equivalent horizontal pixel position in the
+     * previous line of text. If this is impossible, go to the last character
+     * of the previous line.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
+    CaretBrowsing.moveUp = function(evt) {
+        var sel = window.getSelection();
+        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
+            var left = CaretBrowsing.makeLeftCursor(sel);
+            CaretBrowsing.setAndValidateSelection(left, left);
+            return false;
+        }
+
+        var start = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeLeftCursor(sel) :
+            CaretBrowsing.makeFocusCursor(sel);
+        var end = CaretBrowsing.isAmbiguous(sel) ?
+            CaretBrowsing.makeRightCursor(sel) :
+            CaretBrowsing.makeAnchorCursor(sel);
+        var startRect = CaretBrowsing.getCursorRect(start);
+        if (CaretBrowsing.targetX === null) {
+            CaretBrowsing.targetX = startRect.left;
+        }
+        var previousStart = start.clone();
+        var leftPos = start.clone();
+        var rightPos = start.clone();
+        var bestPos = null;
+        var bestY = null;
+        var bestDelta = null;
+        var bestHeight = null;
+        var nodesCrossed = [];
+        var y = 999999;
+        while (true) {
+            if (null === CaretBrowsing.backwards(leftPos, nodesCrossed)) {
+                CaretBrowsing.setAndValidateSelection(
+                    evt.shiftKey ? end : rightPos, rightPos);
+                break;
+            }
+            var range = document.createRange();
+            range.setStart(leftPos.node, leftPos.index);
+            range.setEnd(rightPos.node, rightPos.index);
+            var rect = range.getBoundingClientRect();
+            if (rect && rect.width < rect.height) {
+                y = rect.top + window.pageYOffset;
+
+                // Return the best match so far if we get half a line past the best.
+                if (bestY != null && y < bestY - bestHeight / 2) {
+                    if (CaretBrowsing.setAndValidateSelection(
+                        evt.shiftKey ? end : bestPos, bestPos)) {
+                        break;
+                    } else {
+                        bestY = null;
+                    }
+                }
+
+                // Exit if we're an entire line the wrong direction
+                // (for example, we reached the bottom of the previous column.)
+                if (y > startRect.top + startRect.height) {
+                    if (CaretBrowsing.setAndValidateSelection(
+                        evt.shiftKey ? end : rightPos, rightPos)) {
+                        break;
+                    }
+                }
+
+                // Otherwise look to see if this current position is on the
+                // next line and better than the previous best match, if any.
+                if (y <= startRect.top - startRect.height) {
+                    var deltaLeft = Math.abs(CaretBrowsing.targetX - rect.left);
+                    if (bestDelta == null || deltaLeft < bestDelta) {
+                        bestPos = leftPos.clone();
+                        bestY = y;
+                        bestDelta = deltaLeft;
+                        bestHeight = rect.height;
+                    }
+                    var deltaRight = Math.abs(CaretBrowsing.targetX - rect.right);
+                    if ((bestDelta == null || deltaRight < bestDelta) &&
+                        (rightPos.node != start.node || rightPos.index != start.index)) {
+                        bestPos = rightPos.clone();
+                        bestY = y;
+                        bestDelta = deltaRight;
+                        bestHeight = rect.height;
+                    }
+
+                    // Return the best match so far if the deltas are getting worse,
+                    // not better.
+                    if (bestDelta != null &&
+                        deltaLeft > bestDelta &&
+                        deltaRight > bestDelta) {
+                        if (CaretBrowsing.setAndValidateSelection(
+                            evt.shiftKey ? end : bestPos, bestPos)) {
+                            break;
+                        } else {
+                            bestY = null;
+                        }
+                    }
+                }
+            }
+            rightPos = leftPos.clone();
+        }
+
+        if (!evt.shiftKey) {
+            CaretBrowsing.setFocusToNode(rightPos.node);
+        }
+
+        return false;
+    };
+
+    /**
+     * Set the document's selection to surround a control, so that the next
+     * arrow key they press will allow them to explore the content before
+     * or after a given control.
+     * @param {Node} control The control to escape from.
+     */
+    CaretBrowsing.escapeFromControl = function(control) {
+        control.blur();
+
+        var start = new Cursor(control, 0, '');
+        var previousStart = start.clone();
+        var end = new Cursor(control, 0, '');
+        var previousEnd = end.clone();
+
+        var nodesCrossed = [];
+        while (true) {
+            if (null === CaretBrowsing.backwards(start, nodesCrossed)) {
+                break;
+            }
+
+            var r = document.createRange();
+            r.setStart(start.node, start.index);
+            r.setEnd(previousStart.node, previousStart.index);
+            if (r.getBoundingClientRect()) {
+                break;
+            }
+            previousStart = start.clone();
+        }
+        while (true) {
+            if (null === CaretBrowsing.forwards(end, nodesCrossed)) {
+                break;
+            }
+            if (isDescendantOfNode(end.node, control)) {
+                previousEnd = end.clone();
+                continue;
+            }
+
+            var r = document.createRange();
+            r.setStart(previousEnd.node, previousEnd.index);
+            r.setEnd(end.node, end.index);
+            if (r.getBoundingClientRect()) {
+                break;
+            }
+        }
+
+        if (!isDescendantOfNode(previousStart.node, control)) {
+            start = previousStart.clone();
+        }
+
+        if (!isDescendantOfNode(previousEnd.node, control)) {
+            end = previousEnd.clone();
+        }
+
+        CaretBrowsing.setAndValidateSelection(start, end);
+
+        window.setTimeout(function() {
+            CaretBrowsing.updateCaretOrSelection(true);
+        }, 0);
+    };
+
+    /**
+     * Toggle whether caret browsing is enabled or not.
+     */
+    CaretBrowsing.toggle = function() {
+        if (CaretBrowsing.forceEnabled) {
+            CaretBrowsing.recreateCaretElement();
+            return;
+        }
+
+        CaretBrowsing.isEnabled = !CaretBrowsing.isEnabled;
+        var obj = {};
+        obj['enabled'] = CaretBrowsing.isEnabled;
+        CaretBrowsing.updateIsCaretVisible();
+    };
+
+    /**
+     * Event handler, called when a key is pressed.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
+    CaretBrowsing.onKeyDown = function(evt) {
+        if (evt.defaultPrevented) {
+            return;
+        }
+
+        if (evt.keyCode == 118) {  // F7
+            CaretBrowsing.toggle();
+        }
+
+        if (!CaretBrowsing.isEnabled) {
+            return true;
+        }
+
+        if (evt.target && CaretBrowsing.isControlThatNeedsArrowKeys(
+            /** @type (Node) */(evt.target))) {
+            if (evt.keyCode == 27) {
+                CaretBrowsing.escapeFromControl(/** @type {Node} */(evt.target));
+                evt.preventDefault();
+                evt.stopPropagation();
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        // If the current selection doesn't have a range, try to escape out of
+        // the current control. If that fails, return so we don't fail whe
+        // trying to move the cursor or selection.
+        var sel = window.getSelection();
+        if (sel.rangeCount == 0) {
+            if (document.activeElement) {
+                CaretBrowsing.escapeFromControl(document.activeElement);
+                sel = window.getSelection();
+            }
+
+            if (sel.rangeCount == 0) {
+                return true;
+            }
+        }
+
+        if (CaretBrowsing.caretElement) {
+            CaretBrowsing.caretElement.style.visibility = 'visible';
+            CaretBrowsing.blinkFlag = true;
+        }
+
+        var result = true;
+        switch (evt.keyCode) {
+            case 37:
+                result = CaretBrowsing.moveLeft(evt);
+                break;
+            case 38:
+                result = CaretBrowsing.moveUp(evt);
+                break;
+            case 39:
+                result = CaretBrowsing.moveRight(evt);
+                break;
+            case 40:
+                result = CaretBrowsing.moveDown(evt);
+                break;
+        }
+
+        if (result == false) {
+            evt.preventDefault();
+            evt.stopPropagation();
+        }
+
+        window.setTimeout(function() {
+            CaretBrowsing.updateCaretOrSelection(result == false);
+        }, 0);
+
+        return result;
+    };
+
+    /**
+     * Event handler, called when the mouse is clicked. Chrome already
+     * sets the selection when the mouse is clicked, all we need to do is
+     * update our cursor.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
+    CaretBrowsing.onClick = function(evt) {
+        if (!CaretBrowsing.isEnabled) {
+            return true;
+        }
+        window.setTimeout(function() {
+            CaretBrowsing.targetX = null;
+            CaretBrowsing.updateCaretOrSelection(false);
+        }, 0);
+        return true;
+    };
+
+    /**
+     * Called at a regular interval. Blink the cursor by changing its visibility.
+     */
+    CaretBrowsing.caretBlinkFunction = function() {
+        if (CaretBrowsing.caretElement) {
+            if (CaretBrowsing.blinkFlag) {
+                CaretBrowsing.caretElement.style.backgroundColor =
+                    CaretBrowsing.caretForeground;
+                CaretBrowsing.blinkFlag = false;
+            } else {
+                CaretBrowsing.caretElement.style.backgroundColor =
+                    CaretBrowsing.caretBackground;
+                CaretBrowsing.blinkFlag = true;
+            }
+        }
+    };
+
+    /**
+     * Update whether or not the caret is visible, based on whether caret browsing
+     * is enabled and whether this window / iframe has focus.
+     */
+    CaretBrowsing.updateIsCaretVisible = function() {
+        CaretBrowsing.isCaretVisible =
+            (CaretBrowsing.isEnabled && CaretBrowsing.isWindowFocused);
+        if (CaretBrowsing.isCaretVisible && !CaretBrowsing.caretElement) {
+            CaretBrowsing.setInitialCursor();
+            CaretBrowsing.updateCaretOrSelection(true);
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.blinkFunctionId = window.setInterval(
+                    CaretBrowsing.caretBlinkFunction, 500);
+            }
+        } else if (!CaretBrowsing.isCaretVisible &&
+            CaretBrowsing.caretElement) {
+            window.clearInterval(CaretBrowsing.blinkFunctionId);
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.isSelectionCollapsed = false;
+                CaretBrowsing.caretElement.parentElement.removeChild(
+                    CaretBrowsing.caretElement);
+                CaretBrowsing.caretElement = null;
+            }
+        }
+    };
+
+    /**
+     * Called when the prefs get updated.
+     */
+    /**
+     * Called when this window / iframe gains focus.
+     */
+    CaretBrowsing.onWindowFocus = function() {
+        CaretBrowsing.isWindowFocused = true;
+        CaretBrowsing.updateIsCaretVisible();
+    };
+
+    /**
+     * Called when this window / iframe loses focus.
+     */
+    CaretBrowsing.onWindowBlur = function() {
+        CaretBrowsing.isWindowFocused = false;
+        CaretBrowsing.updateIsCaretVisible();
+    };
+
+    /**
+     * Initializes caret browsing by adding event listeners and extension
+     * message listeners.
+     */
+    CaretBrowsing.init = function() {
+        CaretBrowsing.isWindowFocused = document.hasFocus();
+
+        document.addEventListener('keydown', CaretBrowsing.onKeyDown, false);
+        document.addEventListener('click', CaretBrowsing.onClick, false);
+        window.addEventListener('focus', CaretBrowsing.onWindowFocus, false);
+        window.addEventListener('blur', CaretBrowsing.onWindowBlur, false);
+    };
+
+    window.setTimeout(function() {
+
+        // Make sure the script only loads once.
+        if (!window['caretBrowsingLoaded']) {
+            window['caretBrowsingLoaded'] = true;
+            CaretBrowsing.init();
+
+            if (document.body.getAttribute('caretbrowsing') == 'on') {
+                CaretBrowsing.forceEnabled = true;
+                CaretBrowsing.isEnabled = true;
+                CaretBrowsing.updateIsCaretVisible();
+            }
+
+        }
+
+    }, 0);
+
+    return funcs;
+})();
diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index cd35913ad..9207ec79c 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -267,10 +267,6 @@ class ModeManager(QObject):
                  usertypes.KeyMode.yesno, usertypes.KeyMode.prompt]:
             raise cmdexc.CommandError(
                 "Mode {} can't be entered manually!".format(mode))
-        elif (m == usertypes.KeyMode.caret and
-              objects.backend == usertypes.Backend.QtWebEngine):
-            raise cmdexc.CommandError("Caret mode is not supported with "
-                                      "QtWebEngine yet.")
 
         self.enter(m, 'command')
 

From 82b1bd10ecf9c4b3d2b6d36cc143efbac6225ec2 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Mon, 20 Nov 2017 17:49:42 +0600
Subject: [PATCH 002/229] Add some movement caret actions

---
 qutebrowser/browser/webengine/webenginetab.py |  45 +++++---
 qutebrowser/javascript/webengine_caret.js     | 105 ++++++++++++++----
 2 files changed, 114 insertions(+), 36 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 3a779f480..fd23bca0b 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -179,39 +179,56 @@ class WebEngineCaret(browsertab.AbstractCaret):
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_entered(self, mode):
-        js_code = javascript.assemble('caret', 'setInitialCursor')
-        self._tab.run_js_async(js_code)
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'setInitialCursor'))
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
-        pass
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'toggle'))
 
     def move_to_next_line(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveDown'))
 
     def move_to_prev_line(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveUp'))
 
     def move_to_next_char(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveRight'))
 
     def move_to_prev_char(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveLeft'))
 
     def move_to_end_of_word(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToEndOfWord'))
 
     def move_to_next_word(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToNextWord'))
 
     def move_to_prev_word(self, count=1):
-        log.stub()
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToPreviousWord'))
 
     def move_to_start_of_line(self):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToStartOfLine'))
 
     def move_to_end_of_line(self):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToEndOfLine'))
 
     def move_to_start_of_next_block(self, count=1):
         log.stub()
@@ -232,7 +249,8 @@ class WebEngineCaret(browsertab.AbstractCaret):
         log.stub()
 
     def toggle_selection(self):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'toggleSelection'))
 
     def drop_selection(self):
         log.stub()
@@ -287,7 +305,6 @@ class WebEngineCaret(browsertab.AbstractCaret):
             self._tab.run_js_async(js_code, lambda jsret:
                                    self._follow_selected_cb(jsret, tab))
 
-
 class WebEngineScroller(browsertab.AbstractScroller):
 
     """QtWebEngine implementations related to scrolling."""
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 4aa792510..1796e73c5 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1076,7 +1076,15 @@ window._qutebrowser.caret = (function() {
      * first text character in the document.
      */
     funcs.setInitialCursor = () => {
-        CaretBrowsing.setInitialCursor();
+        if (!CaretBrowsing.initiated) {
+            CaretBrowsing.setInitialCursor();
+        } else {
+            CaretBrowsing.toggle();
+        }
+    }
+
+    funcs.toggle = () => {
+        CaretBrowsing.toggle();
     }
 
     CaretBrowsing.setInitialCursor = function() {
@@ -1094,6 +1102,8 @@ window._qutebrowser.caret = (function() {
         }
         CaretBrowsing.setAndValidateSelection(start, start);
         CaretBrowsing.toggle();
+        CaretBrowsing.initiated = true;
+        CaretBrowsing.selectionEnabled = false;
     };
 
     /**
@@ -1534,11 +1544,7 @@ window._qutebrowser.caret = (function() {
      * @return {boolean} True if the cursor should move by word.
      */
     CaretBrowsing.isMoveByWordEvent = function(evt) {
-        if (CaretBrowsing.isMac) {
-            return evt.altKey;
-        } else {
-            return evt.ctrlKey;
-        }
+        return evt.ctrlKey;
     };
 
     /**
@@ -1589,6 +1595,75 @@ window._qutebrowser.caret = (function() {
         return result;
     };
 
+    funcs.moveRight = () => {
+        var evt = Object.assign({}, document.activeElement);
+        evt.keyCode = 39;
+        CaretBrowsing.onKeyDown(evt);
+    }
+
+    funcs.moveLeft = () => {
+        var evt = Object.assign({}, document.activeElement);
+        evt.keyCode = 37;
+        CaretBrowsing.onKeyDown(evt);
+    }
+
+    funcs.moveDown = () => {
+        var evt = Object.assign({}, document.activeElement);
+        evt.keyCode = 40;
+        CaretBrowsing.onKeyDown(evt);
+    }
+
+    funcs.moveUp = () => {
+        var evt = Object.assign({}, document.activeElement);
+        evt.keyCode = 38;
+        CaretBrowsing.onKeyDown(evt);
+    }
+
+    funcs.moveToEndOfWord = () => {
+        funcs.moveToNextWord();
+        funcs.moveLeft();
+    }
+
+    funcs.moveToNextWord = () => {
+        var evt = Object.assign({}, document.activeElement);
+        evt.keyCode = 39;
+        evt.ctrlKey = true;
+        CaretBrowsing.onKeyDown(evt);
+        funcs.moveRight();
+    }
+
+    funcs.moveToPreviousWord = () => {
+        var evt = Object.assign({}, document.activeElement);
+        evt.keyCode = 37;
+        evt.ctrlKey = true;
+        CaretBrowsing.onKeyDown(evt);
+    }
+
+    funcs.moveToStartOfLine = () => {
+        CaretBrowsing.moveToLineBoundary('left');
+    }
+
+    funcs.moveToEndOfLine = () => {
+        CaretBrowsing.moveToLineBoundary('right');
+    }
+
+    CaretBrowsing.moveToLineBoundary = function(side) {
+        window
+            .getSelection()
+            .modify(
+                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
+                side, 
+                'lineboundary');
+
+        window.setTimeout(function() {
+            CaretBrowsing.updateCaretOrSelection(true);
+        }, 0);
+    };
+
+    funcs.toggleSelection = () => {
+        CaretBrowsing.selectionEnabled = !CaretBrowsing.selectionEnabled;
+    }
+
     /**
      * Called when the user presses the right arrow. If there's a selection,
      * moves the cursor to the end of the selection range. If it's a cursor,
@@ -2002,24 +2077,15 @@ window._qutebrowser.caret = (function() {
      * @return {boolean} True if the default action should be performed.
      */
     CaretBrowsing.onKeyDown = function(evt) {
-        if (evt.defaultPrevented) {
-            return;
-        }
-
-        if (evt.keyCode == 118) {  // F7
-            CaretBrowsing.toggle();
-        }
-
         if (!CaretBrowsing.isEnabled) {
             return true;
         }
 
+        evt.shiftKey = CaretBrowsing.selectionEnabled;
         if (evt.target && CaretBrowsing.isControlThatNeedsArrowKeys(
             /** @type (Node) */(evt.target))) {
             if (evt.keyCode == 27) {
                 CaretBrowsing.escapeFromControl(/** @type {Node} */(evt.target));
-                evt.preventDefault();
-                evt.stopPropagation();
                 return false;
             } else {
                 return true;
@@ -2062,11 +2128,6 @@ window._qutebrowser.caret = (function() {
                 break;
         }
 
-        if (result == false) {
-            evt.preventDefault();
-            evt.stopPropagation();
-        }
-
         window.setTimeout(function() {
             CaretBrowsing.updateCaretOrSelection(result == false);
         }, 0);
@@ -2161,7 +2222,7 @@ window._qutebrowser.caret = (function() {
     CaretBrowsing.init = function() {
         CaretBrowsing.isWindowFocused = document.hasFocus();
 
-        document.addEventListener('keydown', CaretBrowsing.onKeyDown, false);
+        // document.addEventListener('keydown', CaretBrowsing.onKeyDown, false);
         document.addEventListener('click', CaretBrowsing.onClick, false);
         window.addEventListener('focus', CaretBrowsing.onWindowFocus, false);
         window.addEventListener('blur', CaretBrowsing.onWindowBlur, false);

From 8aca37e5d515bf9d1e5c1a2a310d6ca2745e482e Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Tue, 21 Nov 2017 19:56:00 +0600
Subject: [PATCH 003/229] Implement all caret browsing methods

---
 qutebrowser/browser/webengine/webenginetab.py | 18 ++--
 qutebrowser/javascript/webengine_caret.js     | 98 ++++++++++++-------
 2 files changed, 76 insertions(+), 40 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index fd23bca0b..03cf267ea 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -231,22 +231,28 @@ class WebEngineCaret(browsertab.AbstractCaret):
                 javascript.assemble('caret', 'moveToEndOfLine'))
 
     def move_to_start_of_next_block(self, count=1):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToStartOfNextBlock'))
 
     def move_to_start_of_prev_block(self, count=1):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToStartOfPrevBlock'))
 
     def move_to_end_of_next_block(self, count=1):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToEndOfNextBlock'))
 
     def move_to_end_of_prev_block(self, count=1):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToEndOfPrevBlock'))
 
     def move_to_start_of_document(self):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToStartOfDocument'))
 
     def move_to_end_of_document(self):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'moveToEndOfDocument'))
 
     def toggle_selection(self):
         self._tab.run_js_async(
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 1796e73c5..9074e4e33 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -825,7 +825,6 @@ window._qutebrowser.caret = (function() {
             str = word + str;
             nodesCrossed = nodesCrossed.concat(newNodesCrossed);
             startCursor.copyFrom(wordStartCursor);
-            v
             // Get the previous word and go back to the top of the loop.
             newNodesCrossed = [];
             word = TraverseUtil.getPreviousWord(
@@ -1595,28 +1594,54 @@ window._qutebrowser.caret = (function() {
         return result;
     };
 
+    CaretBrowsing.move = function(direction, granularity) {
+        window
+            .getSelection()
+            .modify(
+                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
+                direction,
+                granularity);
+
+        window.setTimeout(function() {
+            CaretBrowsing.updateCaretOrSelection(true);
+        }, 0);
+    }
+
+    CaretBrowsing.moveToBlock = function(paragraph, boundary) {
+        window
+            .getSelection()
+            .modify(
+                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
+                paragraph, 
+                'paragraph');
+
+        window
+            .getSelection()
+            .modify(
+                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
+                boundary, 
+                'paragraphboundary');
+
+        window.setTimeout(function() {
+            CaretBrowsing.updateCaretOrSelection(true);
+        }, 0);
+
+    }
+
     funcs.moveRight = () => {
-        var evt = Object.assign({}, document.activeElement);
-        evt.keyCode = 39;
-        CaretBrowsing.onKeyDown(evt);
+        CaretBrowsing.move('right', 'character');
     }
 
     funcs.moveLeft = () => {
-        var evt = Object.assign({}, document.activeElement);
-        evt.keyCode = 37;
-        CaretBrowsing.onKeyDown(evt);
+        CaretBrowsing.move('left', 'character');
     }
 
     funcs.moveDown = () => {
-        var evt = Object.assign({}, document.activeElement);
-        evt.keyCode = 40;
-        CaretBrowsing.onKeyDown(evt);
+        CaretBrowsing.move('forward', 'line');
     }
 
     funcs.moveUp = () => {
-        var evt = Object.assign({}, document.activeElement);
-        evt.keyCode = 38;
-        CaretBrowsing.onKeyDown(evt);
+        CaretBrowsing.move('backward', 'line');
     }
 
     funcs.moveToEndOfWord = () => {
@@ -1625,40 +1650,45 @@ window._qutebrowser.caret = (function() {
     }
 
     funcs.moveToNextWord = () => {
-        var evt = Object.assign({}, document.activeElement);
-        evt.keyCode = 39;
-        evt.ctrlKey = true;
-        CaretBrowsing.onKeyDown(evt);
+        CaretBrowsing.move('forward', 'word');
         funcs.moveRight();
     }
 
     funcs.moveToPreviousWord = () => {
-        var evt = Object.assign({}, document.activeElement);
-        evt.keyCode = 37;
-        evt.ctrlKey = true;
-        CaretBrowsing.onKeyDown(evt);
+        CaretBrowsing.move('backward', 'word');
     }
 
     funcs.moveToStartOfLine = () => {
-        CaretBrowsing.moveToLineBoundary('left');
+        CaretBrowsing.move('left', 'lineboundary');
     }
 
     funcs.moveToEndOfLine = () => {
-        CaretBrowsing.moveToLineBoundary('right');
+        CaretBrowsing.move('right', 'lineboundary');
     }
 
-    CaretBrowsing.moveToLineBoundary = function(side) {
-        window
-            .getSelection()
-            .modify(
-                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
-                side, 
-                'lineboundary');
+    funcs.moveToStartOfNextBlock = () => {
+        CaretBrowsing.moveToBlock('forward', 'backward');
+    }
 
-        window.setTimeout(function() {
-            CaretBrowsing.updateCaretOrSelection(true);
-        }, 0);
-    };
+    funcs.moveToStartOfPrevBlock = () => {
+        CaretBrowsing.moveToBlock('backward', 'backward');
+    }
+
+    funcs.moveToEndOfNextBlock = () => {
+        CaretBrowsing.moveToBlock('forward', 'forward');
+    }
+
+    funcs.moveToEndOfPrevBlock = () => {
+        CaretBrowsing.moveToBlock('backward', 'forward');
+    }
+
+    funcs.moveToStartOfDocument = () => {
+        CaretBrowsing.move('backward', 'documentboundary');
+    }
+
+    funcs.moveToEndOfDocument = () => {
+        CaretBrowsing.move('forward', 'documentboundary');
+    }
 
     funcs.toggleSelection = () => {
         CaretBrowsing.selectionEnabled = !CaretBrowsing.selectionEnabled;

From e7a66d92a8ff405832954306dbd93bcb290e575f Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Wed, 22 Nov 2017 19:56:05 +0600
Subject: [PATCH 004/229] Selection implentation

---
 qutebrowser/browser/browsertab.py             |  2 +-
 qutebrowser/browser/commands.py               | 33 ++++++++++-----
 qutebrowser/browser/webengine/webenginetab.py | 41 +++++++++++++------
 qutebrowser/browser/webkit/webkittab.py       |  6 +--
 qutebrowser/javascript/webengine_caret.js     |  8 ++++
 5 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 547e276db..827d11761 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -392,7 +392,7 @@ class AbstractCaret(QObject):
     def has_selection(self):
         raise NotImplementedError
 
-    def selection(self, html=False):
+    def selection(self, html=False, selection=None):
         raise NotImplementedError
 
     def follow_selected(self, *, tab=False):
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index e007de76d..e92291816 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -838,6 +838,11 @@ class CommandDispatcher:
             sel: Use the primary selection instead of the clipboard.
             keep: Stay in visual mode after yanking the selection.
         """
+        self.yank_object = {
+                'sel': sel,
+                'what': what,
+                'keep': keep
+        }
         if what == 'title':
             s = self._tabbed_browser.page_title(self._current_index())
         elif what == 'domain':
@@ -850,28 +855,36 @@ class CommandDispatcher:
             what = 'URL'  # For printing
         elif what == 'selection':
             caret = self._current_widget().caret
-            s = caret.selection()
-            if not caret.has_selection() or not s:
-                message.info("Nothing to yank")
-                return
+            caret.selection(False, self._yank_callback)
+            return
         else:  # pragma: no cover
             raise ValueError("Invalid value {!r} for `what'.".format(what))
 
-        if sel and utils.supports_selection():
+        self._yank_to_target(s)
+
+    def _yank_callback(self, s):
+        if not self._current_widget().caret.has_selection() or not s:
+            message.info("Nothing to yank")
+            return
+        self._yank_to_target(s)
+
+    def _yank_to_target(self, s):
+        if self.yank_object['sel'] and utils.supports_selection():
             target = "primary selection"
         else:
-            sel = False
+            self.yank_object['sel'] = False
             target = "clipboard"
 
-        utils.set_clipboard(s, selection=sel)
-        if what != 'selection':
-            message.info("Yanked {} to {}: {}".format(what, target, s))
+        utils.set_clipboard(s, selection=self.yank_object['sel'])
+        if self.yank_object['what'] != 'selection':
+            message.info("Yanked {} to {}: {}".format(self.yank_object['what'], target, s))
         else:
             message.info("{} {} yanked to {}".format(
                 len(s), "char" if len(s) == 1 else "chars", target))
-            if not keep:
+            if not self.yank_object['keep']:
                 modeman.leave(self._win_id, KeyMode.caret, "yank selected",
                               maybe=True)
+        self.yank_object = None
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     @cmdutils.argument('count', count=True)
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 03cf267ea..764db3024 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -231,20 +231,24 @@ class WebEngineCaret(browsertab.AbstractCaret):
                 javascript.assemble('caret', 'moveToEndOfLine'))
 
     def move_to_start_of_next_block(self, count=1):
-        self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToStartOfNextBlock'))
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToStartOfNextBlock'))
 
     def move_to_start_of_prev_block(self, count=1):
-        self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToStartOfPrevBlock'))
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToStartOfPrevBlock'))
 
     def move_to_end_of_next_block(self, count=1):
-        self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfNextBlock'))
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToEndOfNextBlock'))
 
     def move_to_end_of_prev_block(self, count=1):
-        self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfPrevBlock'))
+        for _ in range(count):
+            self._tab.run_js_async(
+                    javascript.assemble('caret', 'moveToEndOfPrevBlock'))
 
     def move_to_start_of_document(self):
         self._tab.run_js_async(
@@ -259,15 +263,28 @@ class WebEngineCaret(browsertab.AbstractCaret):
                 javascript.assemble('caret', 'toggleSelection'))
 
     def drop_selection(self):
-        log.stub()
+        self._tab.run_js_async(
+                javascript.assemble('caret', 'dropSelection'))
 
     def has_selection(self):
-        return self._widget.hasSelection()
+        if qtutils.version_check('5.10'):
+            return self._widget.hasSelection()
+        else:
+            # WORKAROUND for
+            # https://bugreports.qt.io/browse/QTBUG-53134
+            return True
 
-    def selection(self, html=False):
+    def selection(self, html=False, callback=None):
         if html:
             raise browsertab.UnsupportedOperationError
-        return self._widget.selectedText()
+        if qtutils.version_check('5.10'):
+            callback(self._widget.selectedText())
+        else:
+            # WORKAROUND for
+            # https://bugreports.qt.io/browse/QTBUG-53134
+            self._tab.run_js_async(
+                    'window.getSelection().toString()', callback)
+            self.drop_selection()
 
     def _follow_selected_cb(self, js_elem, tab=False):
         """Callback for javascript which clicks the selected element.
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 43bec3456..a1aeee698 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -335,10 +335,10 @@ class WebKitCaret(browsertab.AbstractCaret):
     def has_selection(self):
         return self._widget.hasSelection()
 
-    def selection(self, html=False):
+    def selection(self, html=False, callback=False):
         if html:
-            return self._widget.selectedHtml()
-        return self._widget.selectedText()
+            callback(self._widget.selectedHtml())
+        callback(self._widget.selectedText())
 
     def follow_selected(self, *, tab=False):
         if not self.has_selection():
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 9074e4e33..b13cfb171 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1690,6 +1690,14 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.move('forward', 'documentboundary');
     }
 
+    funcs.dropSelection = () => {
+        window.getSelection().removeAllRanges();
+    }
+
+    funcs.getSelection = () => {
+        return window.getSelection().toString();
+    }
+
     funcs.toggleSelection = () => {
         CaretBrowsing.selectionEnabled = !CaretBrowsing.selectionEnabled;
     }

From 8a64ce19c3dd7b142495e6b8bd0e8310cd91e83b Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 23 Nov 2017 20:18:43 +0600
Subject: [PATCH 005/229] Fetch selection for userscripts

---
 qutebrowser/browser/commands.py | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index e92291816..5a0108b1b 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1217,7 +1217,17 @@ class CommandDispatcher:
             cmd, args, userscript))
         if userscript:
             # ~ expansion is handled by the userscript module.
-            self._run_userscript(cmd, *args, verbose=verbose)
+            # dirty hack for async call because of:
+            # https://bugreports.qt.io/browse/QTBUG-53134
+            # until it fixed or blocked async call implemented:
+            # https://github.com/qutebrowser/qutebrowser/issues/3327
+            self.userscript_object = {
+                    'cmd': cmd,
+                    'args': args,
+                    'verbose': verbose
+            }
+            caret = self._current_widget().caret
+            caret.selection(False, self._selection_callback)
         else:
             cmd = os.path.expanduser(cmd)
             proc = guiprocess.GUIProcess(what='command', verbose=verbose,
@@ -1232,7 +1242,10 @@ class CommandDispatcher:
         """Open main startpage in current tab."""
         self.openurl(config.val.url.start_pages[0])
 
-    def _run_userscript(self, cmd, *args, verbose=False):
+    def _selection_callback(self, s):
+        self._run_userscript(s)
+
+    def _run_userscript(self, selection):
         """Run a userscript given as argument.
 
         Args:
@@ -1250,7 +1263,7 @@ class CommandDispatcher:
 
         tab = self._tabbed_browser.currentWidget()
         if tab is not None and tab.caret.has_selection():
-            env['QUTE_SELECTED_TEXT'] = tab.caret.selection()
+            env['QUTE_SELECTED_TEXT'] = selection
             try:
                 env['QUTE_SELECTED_HTML'] = tab.caret.selection(html=True)
             except browsertab.UnsupportedOperationError:
@@ -1266,10 +1279,13 @@ class CommandDispatcher:
             env['QUTE_URL'] = url.toString(QUrl.FullyEncoded)
 
         try:
-            userscripts.run_async(tab, cmd, *args, win_id=self._win_id,
-                                  env=env, verbose=verbose)
+            userscripts.run_async(tab, self.userscript_object['cmd'], 
+                    *self.userscript_object['args'], win_id=self._win_id, 
+                    env=env, verbose=self.userscript_object['verbose'])
         except userscripts.Error as e:
             raise cmdexc.CommandError(e)
+        finally:
+            self.userscript_object = None
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def quickmark_save(self):

From 72040a3bbb0e6815b2875b90be3341aee0f86e64 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 24 Nov 2017 17:32:23 +0600
Subject: [PATCH 006/229] Position caret on top element

---
 qutebrowser/javascript/webengine_caret.js | 89 +++++++++++++++++++++--
 1 file changed, 81 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index b13cfb171..5efa81a79 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1078,6 +1078,7 @@ window._qutebrowser.caret = (function() {
         if (!CaretBrowsing.initiated) {
             CaretBrowsing.setInitialCursor();
         } else {
+            positionCaret();
             CaretBrowsing.toggle();
         }
     }
@@ -1092,14 +1093,7 @@ window._qutebrowser.caret = (function() {
             return;
         }
 
-        var start = new Cursor(document.body, 0, '');
-        var end = new Cursor(document.body, 0, '');
-        var nodesCrossed = [];
-        var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
-        if (result == null) {
-            return;
-        }
-        CaretBrowsing.setAndValidateSelection(start, start);
+        positionCaret();
         CaretBrowsing.toggle();
         CaretBrowsing.initiated = true;
         CaretBrowsing.selectionEnabled = false;
@@ -2283,5 +2277,84 @@ window._qutebrowser.caret = (function() {
 
     }, 0);
 
+    function isElementInViewport(node) {  // eslint-disable-line complexity
+        let i;
+        let boundingRect = (node.getClientRects()[0] ||
+                            node.getBoundingClientRect());
+
+        if (boundingRect.width <= 1 && boundingRect.height <= 1) {
+            const rects = node.getClientRects();
+            for (i = 0; i < rects.length; i++) {
+                if (rects[i].width > rects[0].height &&
+                        rects[i].height > rects[0].height) {
+                    boundingRect = rects[i];
+                }
+            }
+        }
+        if (boundingRect === undefined) {
+            return null;
+        }
+        if (boundingRect.top > innerHeight || boundingRect.left > innerWidth) {
+            return null;
+        }
+        if (boundingRect.width <= 1 || boundingRect.height <= 1) {
+            const children = node.children;
+            let visibleChildNode = false;
+            for (i = 0; i < children.length; ++i) {
+                boundingRect = (children[i].getClientRects()[0] ||
+                                children[i].getBoundingClientRect());
+                if (boundingRect.width > 1 && boundingRect.height > 1) {
+                    visibleChildNode = true;
+                    break;
+                }
+            }
+            if (visibleChildNode === false) {
+                return null;
+            }
+        }
+        if (boundingRect.top + boundingRect.height < 10 ||
+                boundingRect.left + boundingRect.width < -10) {
+            return null;
+        }
+        const computedStyle = window.getComputedStyle(node, null);
+        if (computedStyle.visibility !== "visible" ||
+                computedStyle.display === "none" ||
+                node.hasAttribute("disabled") ||
+                parseInt(computedStyle.width, 10) === 0 ||
+                parseInt(computedStyle.height, 10) === 0) {
+            return null;
+        }
+        return boundingRect.top >= -20;
+    }
+
+    function positionCaret() {
+        const walker = document.createTreeWalker(document.body, -1);
+        let node;
+        const textNodes = [];
+        let el;
+        while ((node = walker.nextNode())) {
+            if (node.nodeType === 3 && node.nodeValue.trim() !== "") {
+                textNodes.push(node);
+            }
+        }
+        for (let i = 0; i < textNodes.length; i++) {
+            const element = textNodes[i].parentElement;
+            if (isElementInViewport(element)) {
+                el = element;
+                break;
+            }
+        }
+        if (el !== undefined) {
+            var start = new Cursor(el, 0, '');
+            var end = new Cursor(el, 0, '');
+            var nodesCrossed = [];
+            var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
+            if (result == null) {
+                return;
+            }
+            CaretBrowsing.setAndValidateSelection(start, start);
+        }
+    }
+
     return funcs;
 })();

From 70b58d1928c9c79c09ad489df6bd17b405ded38b Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Wed, 29 Nov 2017 20:07:24 +0600
Subject: [PATCH 007/229] Inject caret css on mode enter

---
 qutebrowser/javascript/webengine_caret.js | 29 +++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 5efa81a79..03b951686 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1070,12 +1070,41 @@ window._qutebrowser.caret = (function() {
         return false;
     };
 
+    function addCaretStyle() {
+        var style = '.CaretBrowsing_Caret {' +
+            '  position: absolute;' +
+            '  z-index: 2147483647;' +
+            '  min-height: 10px;' +
+            '  background-color: #000;' +
+            '}' +
+            '.CaretBrowsing_AnimateCaret {' +
+            '  position: absolute;' +
+            '  z-index: 2147483647;' +
+            '  min-height: 10px;' +
+            '}' +
+            '.CaretBrowsing_FlashVert {' +
+            '  position: absolute;' +
+            '  z-index: 2147483647;' +
+            '  background: linear-gradient(' +
+            '      270deg,' +
+            '      rgba(128, 128, 255, 0) 0%,' +
+            '      rgba(128, 128, 255, 0.3) 45%,' +
+            '      rgba(128, 128, 255, 0.8) 50%,' +
+            '      rgba(128, 128, 255, 0.3) 65%,' +
+            '      rgba(128, 128, 255, 0) 100%);' +
+            '}';
+        var node = document.createElement('style');
+        node.innerHTML = style;
+        document.body.appendChild(node);
+    }
+
     /**
      * If there's no initial selection, set the cursor just before the
      * first text character in the document.
      */
     funcs.setInitialCursor = () => {
         if (!CaretBrowsing.initiated) {
+            addCaretStyle();
             CaretBrowsing.setInitialCursor();
         } else {
             positionCaret();

From f965c0daec8e0671f5e450e18d8727182d63bad6 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Wed, 29 Nov 2017 21:01:47 +0600
Subject: [PATCH 008/229] Don't position caret if selection exists

---
 qutebrowser/javascript/webengine_caret.js | 65 ++++++++++++-----------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 03b951686..a8cc93b56 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1070,7 +1070,7 @@ window._qutebrowser.caret = (function() {
         return false;
     };
 
-    function addCaretStyle() {
+    function injectCaretStyles() {
         var style = '.CaretBrowsing_Caret {' +
             '  position: absolute;' +
             '  z-index: 2147483647;' +
@@ -1104,10 +1104,12 @@ window._qutebrowser.caret = (function() {
      */
     funcs.setInitialCursor = () => {
         if (!CaretBrowsing.initiated) {
-            addCaretStyle();
+            injectCaretStyles();
             CaretBrowsing.setInitialCursor();
         } else {
-            positionCaret();
+            if (!window.getSelection().toString()) {
+                positionCaret();
+            }
             CaretBrowsing.toggle();
         }
     }
@@ -1116,6 +1118,35 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.toggle();
     }
 
+    function positionCaret() {
+        const walker = document.createTreeWalker(document.body, -1);
+        let node;
+        const textNodes = [];
+        let el;
+        while ((node = walker.nextNode())) {
+            if (node.nodeType === 3 && node.nodeValue.trim() !== "") {
+                textNodes.push(node);
+            }
+        }
+        for (let i = 0; i < textNodes.length; i++) {
+            const element = textNodes[i].parentElement;
+            if (isElementInViewport(element)) {
+                el = element;
+                break;
+            }
+        }
+        if (el !== undefined) {
+            var start = new Cursor(el, 0, '');
+            var end = new Cursor(el, 0, '');
+            var nodesCrossed = [];
+            var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
+            if (result == null) {
+                return;
+            }
+            CaretBrowsing.setAndValidateSelection(start, start);
+        }
+    }
+
     CaretBrowsing.setInitialCursor = function() {
         var sel = window.getSelection();
         if (sel.rangeCount > 0) {
@@ -2356,34 +2387,6 @@ window._qutebrowser.caret = (function() {
         return boundingRect.top >= -20;
     }
 
-    function positionCaret() {
-        const walker = document.createTreeWalker(document.body, -1);
-        let node;
-        const textNodes = [];
-        let el;
-        while ((node = walker.nextNode())) {
-            if (node.nodeType === 3 && node.nodeValue.trim() !== "") {
-                textNodes.push(node);
-            }
-        }
-        for (let i = 0; i < textNodes.length; i++) {
-            const element = textNodes[i].parentElement;
-            if (isElementInViewport(element)) {
-                el = element;
-                break;
-            }
-        }
-        if (el !== undefined) {
-            var start = new Cursor(el, 0, '');
-            var end = new Cursor(el, 0, '');
-            var nodesCrossed = [];
-            var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
-            if (result == null) {
-                return;
-            }
-            CaretBrowsing.setAndValidateSelection(start, start);
-        }
-    }
 
     return funcs;
 })();

From c7a5dd6abbb8aec73f711be8a1d159d054719d1c Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 30 Nov 2017 18:02:50 +0600
Subject: [PATCH 009/229] Clean up javascript caret code

---
 qutebrowser/browser/webengine/webenginetab.py |    1 -
 qutebrowser/javascript/axs_testing.js         | 2643 -----------------
 qutebrowser/javascript/webengine_caret.js     | 1681 ++---------
 3 files changed, 276 insertions(+), 4049 deletions(-)
 delete mode 100644 qutebrowser/javascript/axs_testing.js

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 764db3024..243a711e0 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -589,7 +589,6 @@ class WebEngineTab(browsertab.AbstractTab):
             utils.read_file('javascript/scroll.js'),
             utils.read_file('javascript/webelem.js'),
             utils.read_file('javascript/webengine_caret.js'),
-            utils.read_file('javascript/axs_testing.js'),
         ])
         script = QWebEngineScript()
         script.setInjectionPoint(QWebEngineScript.DocumentCreation)
diff --git a/qutebrowser/javascript/axs_testing.js b/qutebrowser/javascript/axs_testing.js
deleted file mode 100644
index e6b1a3755..000000000
--- a/qutebrowser/javascript/axs_testing.js
+++ /dev/null
@@ -1,2643 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/7d778f7da58af341a47b3a6f6457c2842b24d4d8
- *
- * See project README for build steps.
- */
-
-// AUTO-GENERATED CONTENT BELOW: DO NOT EDIT! See above for details.
-
-var fn = (function() {
-  var COMPILED = !0, goog = goog || {};
-goog.global = this;
-goog.isDef = function(a) {
-  return void 0 !== a;
-};
-goog.exportPath_ = function(a, b, c) {
-  a = a.split(".");
-  c = c || goog.global;
-  a[0] in c || !c.execScript || c.execScript("var " + a[0]);
-  for (var d;a.length && (d = a.shift());) {
-    !a.length && goog.isDef(b) ? c[d] = b : c = c[d] ? c[d] : c[d] = {};
-  }
-};
-goog.define = function(a, b) {
-  var c = b;
-  COMPILED || (goog.global.CLOSURE_UNCOMPILED_DEFINES && Object.prototype.hasOwnProperty.call(goog.global.CLOSURE_UNCOMPILED_DEFINES, a) ? c = goog.global.CLOSURE_UNCOMPILED_DEFINES[a] : goog.global.CLOSURE_DEFINES && Object.prototype.hasOwnProperty.call(goog.global.CLOSURE_DEFINES, a) && (c = goog.global.CLOSURE_DEFINES[a]));
-  goog.exportPath_(a, c);
-};
-goog.DEBUG = !0;
-goog.LOCALE = "en";
-goog.TRUSTED_SITE = !0;
-goog.STRICT_MODE_COMPATIBLE = !1;
-goog.DISALLOW_TEST_ONLY_CODE = COMPILED && !goog.DEBUG;
-goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING = !1;
-goog.provide = function(a) {
-  if (goog.isInModuleLoader_()) {
-    throw Error("goog.provide can not be used within a goog.module.");
-  }
-  if (!COMPILED && goog.isProvided_(a)) {
-    throw Error('Namespace "' + a + '" already declared.');
-  }
-  goog.constructNamespace_(a);
-};
-goog.constructNamespace_ = function(a, b) {
-  if (!COMPILED) {
-    delete goog.implicitNamespaces_[a];
-    for (var c = a;(c = c.substring(0, c.lastIndexOf("."))) && !goog.getObjectByName(c);) {
-      goog.implicitNamespaces_[c] = !0;
-    }
-  }
-  goog.exportPath_(a, b);
-};
-goog.VALID_MODULE_RE_ = /^[a-zA-Z_$][a-zA-Z0-9._$]*$/;
-goog.module = function(a) {
-  if (!goog.isString(a) || !a || -1 == a.search(goog.VALID_MODULE_RE_)) {
-    throw Error("Invalid module identifier");
-  }
-  if (!goog.isInModuleLoader_()) {
-    throw Error("Module " + a + " has been loaded incorrectly.");
-  }
-  if (goog.moduleLoaderState_.moduleName) {
-    throw Error("goog.module may only be called once per module.");
-  }
-  goog.moduleLoaderState_.moduleName = a;
-  if (!COMPILED) {
-    if (goog.isProvided_(a)) {
-      throw Error('Namespace "' + a + '" already declared.');
-    }
-    delete goog.implicitNamespaces_[a];
-  }
-};
-goog.module.get = function(a) {
-  return goog.module.getInternal_(a);
-};
-goog.module.getInternal_ = function(a) {
-  if (!COMPILED) {
-    return goog.isProvided_(a) ? a in goog.loadedModules_ ? goog.loadedModules_[a] : goog.getObjectByName(a) : null;
-  }
-};
-goog.moduleLoaderState_ = null;
-goog.isInModuleLoader_ = function() {
-  return null != goog.moduleLoaderState_;
-};
-goog.module.declareLegacyNamespace = function() {
-  if (!COMPILED && !goog.isInModuleLoader_()) {
-    throw Error("goog.module.declareLegacyNamespace must be called from within a goog.module");
-  }
-  if (!COMPILED && !goog.moduleLoaderState_.moduleName) {
-    throw Error("goog.module must be called prior to goog.module.declareLegacyNamespace.");
-  }
-  goog.moduleLoaderState_.declareLegacyNamespace = !0;
-};
-goog.setTestOnly = function(a) {
-  if (goog.DISALLOW_TEST_ONLY_CODE) {
-    throw a = a || "", Error("Importing test-only code into non-debug environment" + (a ? ": " + a : "."));
-  }
-};
-goog.forwardDeclare = function(a) {
-};
-COMPILED || (goog.isProvided_ = function(a) {
-  return a in goog.loadedModules_ || !goog.implicitNamespaces_[a] && goog.isDefAndNotNull(goog.getObjectByName(a));
-}, goog.implicitNamespaces_ = {"goog.module":!0});
-goog.getObjectByName = function(a, b) {
-  for (var c = a.split("."), d = b || goog.global, e;e = c.shift();) {
-    if (goog.isDefAndNotNull(d[e])) {
-      d = d[e];
-    } else {
-      return null;
-    }
-  }
-  return d;
-};
-goog.globalize = function(a, b) {
-  var c = b || goog.global, d;
-  for (d in a) {
-    c[d] = a[d];
-  }
-};
-goog.addDependency = function(a, b, c, d) {
-  if (goog.DEPENDENCIES_ENABLED) {
-    var e;
-    a = a.replace(/\\/g, "/");
-    var f = goog.dependencies_;
-    d && "boolean" !== typeof d || (d = d ? {module:"goog"} : {});
-    for (var g = 0;e = b[g];g++) {
-      f.nameToPath[e] = a, f.loadFlags[a] = d;
-    }
-    for (d = 0;b = c[d];d++) {
-      a in f.requires || (f.requires[a] = {}), f.requires[a][b] = !0;
-    }
-  }
-};
-goog.ENABLE_DEBUG_LOADER = !0;
-goog.logToConsole_ = function(a) {
-  goog.global.console && goog.global.console.error(a);
-};
-goog.require = function(a) {
-  if (!COMPILED) {
-    goog.ENABLE_DEBUG_LOADER && goog.IS_OLD_IE_ && goog.maybeProcessDeferredDep_(a);
-    if (goog.isProvided_(a)) {
-      return goog.isInModuleLoader_() ? goog.module.getInternal_(a) : null;
-    }
-    if (goog.ENABLE_DEBUG_LOADER) {
-      var b = goog.getPathFromDeps_(a);
-      if (b) {
-        return goog.writeScripts_(b), null;
-      }
-    }
-    a = "goog.require could not find: " + a;
-    goog.logToConsole_(a);
-    throw Error(a);
-  }
-};
-goog.basePath = "";
-goog.nullFunction = function() {
-};
-goog.abstractMethod = function() {
-  throw Error("unimplemented abstract method");
-};
-goog.addSingletonGetter = function(a) {
-  a.getInstance = function() {
-    if (a.instance_) {
-      return a.instance_;
-    }
-    goog.DEBUG && (goog.instantiatedSingletons_[goog.instantiatedSingletons_.length] = a);
-    return a.instance_ = new a;
-  };
-};
-goog.instantiatedSingletons_ = [];
-goog.LOAD_MODULE_USING_EVAL = !0;
-goog.SEAL_MODULE_EXPORTS = goog.DEBUG;
-goog.loadedModules_ = {};
-goog.DEPENDENCIES_ENABLED = !COMPILED && goog.ENABLE_DEBUG_LOADER;
-goog.ALWAYS_TRANSPILE = !1;
-goog.NEVER_TRANSPILE = !1;
-goog.DEPENDENCIES_ENABLED && (goog.dependencies_ = {loadFlags:{}, nameToPath:{}, requires:{}, visited:{}, written:{}, deferred:{}}, goog.inHtmlDocument_ = function() {
-  var a = goog.global.document;
-  return null != a && "write" in a;
-}, goog.findBasePath_ = function() {
-  if (goog.isDef(goog.global.CLOSURE_BASE_PATH)) {
-    goog.basePath = goog.global.CLOSURE_BASE_PATH;
-  } else {
-    if (goog.inHtmlDocument_()) {
-      for (var a = goog.global.document.getElementsByTagName("SCRIPT"), b = a.length - 1;0 <= b;--b) {
-        var c = a[b].src, d = c.lastIndexOf("?"), d = -1 == d ? c.length : d;
-        if ("base.js" == c.substr(d - 7, 7)) {
-          goog.basePath = c.substr(0, d - 7);
-          break;
-        }
-      }
-    }
-  }
-}, goog.importScript_ = function(a, b) {
-  (goog.global.CLOSURE_IMPORT_SCRIPT || goog.writeScriptTag_)(a, b) && (goog.dependencies_.written[a] = !0);
-}, goog.IS_OLD_IE_ = !(goog.global.atob || !goog.global.document || !goog.global.document.all), goog.importProcessedScript_ = function(a, b, c) {
-  goog.importScript_("", 'goog.retrieveAndExec_("' + a + '", ' + b + ", " + c + ");");
-}, goog.queuedModules_ = [], goog.wrapModule_ = function(a, b) {
-  return goog.LOAD_MODULE_USING_EVAL && goog.isDef(goog.global.JSON) ? "goog.loadModule(" + goog.global.JSON.stringify(b + "\n//# sourceURL=" + a + "\n") + ");" : 'goog.loadModule(function(exports) {"use strict";' + b + "\n;return exports});\n//# sourceURL=" + a + "\n";
-}, goog.loadQueuedModules_ = function() {
-  var a = goog.queuedModules_.length;
-  if (0 < a) {
-    var b = goog.queuedModules_;
-    goog.queuedModules_ = [];
-    for (var c = 0;c < a;c++) {
-      goog.maybeProcessDeferredPath_(b[c]);
-    }
-  }
-}, goog.maybeProcessDeferredDep_ = function(a) {
-  goog.isDeferredModule_(a) && goog.allDepsAreAvailable_(a) && (a = goog.getPathFromDeps_(a), goog.maybeProcessDeferredPath_(goog.basePath + a));
-}, goog.isDeferredModule_ = function(a) {
-  var b = (a = goog.getPathFromDeps_(a)) && goog.dependencies_.loadFlags[a] || {};
-  return a && ("goog" == b.module || goog.needsTranspile_(b.lang)) ? goog.basePath + a in goog.dependencies_.deferred : !1;
-}, goog.allDepsAreAvailable_ = function(a) {
-  if ((a = goog.getPathFromDeps_(a)) && a in goog.dependencies_.requires) {
-    for (var b in goog.dependencies_.requires[a]) {
-      if (!goog.isProvided_(b) && !goog.isDeferredModule_(b)) {
-        return !1;
-      }
-    }
-  }
-  return !0;
-}, goog.maybeProcessDeferredPath_ = function(a) {
-  if (a in goog.dependencies_.deferred) {
-    var b = goog.dependencies_.deferred[a];
-    delete goog.dependencies_.deferred[a];
-    goog.globalEval(b);
-  }
-}, goog.loadModuleFromUrl = function(a) {
-  goog.retrieveAndExec_(a, !0, !1);
-}, goog.loadModule = function(a) {
-  var b = goog.moduleLoaderState_;
-  try {
-    goog.moduleLoaderState_ = {moduleName:void 0, declareLegacyNamespace:!1};
-    var c;
-    if (goog.isFunction(a)) {
-      c = a.call(goog.global, {});
-    } else {
-      if (goog.isString(a)) {
-        c = goog.loadModuleFromSource_.call(goog.global, a);
-      } else {
-        throw Error("Invalid module definition");
-      }
-    }
-    var d = goog.moduleLoaderState_.moduleName;
-    if (!goog.isString(d) || !d) {
-      throw Error('Invalid module name "' + d + '"');
-    }
-    goog.moduleLoaderState_.declareLegacyNamespace ? goog.constructNamespace_(d, c) : goog.SEAL_MODULE_EXPORTS && Object.seal && Object.seal(c);
-    goog.loadedModules_[d] = c;
-  } finally {
-    goog.moduleLoaderState_ = b;
-  }
-}, goog.loadModuleFromSource_ = function(a) {
-  eval(a);
-  return {};
-}, goog.writeScriptSrcNode_ = function(a) {
-  goog.global.document.write('<script type="text/javascript" src="' + a + '">\x3c/script>');
-}, goog.appendScriptSrcNode_ = function(a) {
-  var b = goog.global.document, c = b.createElement("script");
-  c.type = "text/javascript";
-  c.src = a;
-  c.defer = !1;
-  c.async = !1;
-  b.head.appendChild(c);
-}, goog.writeScriptTag_ = function(a, b) {
-  if (goog.inHtmlDocument_()) {
-    var c = goog.global.document;
-    if (!goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING && "complete" == c.readyState) {
-      if (/\bdeps.js$/.test(a)) {
-        return !1;
-      }
-      throw Error('Cannot write "' + a + '" after document load');
-    }
-    if (void 0 === b) {
-      if (goog.IS_OLD_IE_) {
-        var d = " onreadystatechange='goog.onScriptLoad_(this, " + ++goog.lastNonModuleScriptIndex_ + ")' ";
-        c.write('<script type="text/javascript" src="' + a + '"' + d + ">\x3c/script>");
-      } else {
-        goog.ENABLE_CHROME_APP_SAFE_SCRIPT_LOADING ? goog.appendScriptSrcNode_(a) : goog.writeScriptSrcNode_(a);
-      }
-    } else {
-      c.write('<script type="text/javascript">' + b + "\x3c/script>");
-    }
-    return !0;
-  }
-  return !1;
-}, goog.needsTranspile_ = function(a) {
-  if (goog.ALWAYS_TRANSPILE) {
-    return !0;
-  }
-  if (goog.NEVER_TRANSPILE) {
-    return !1;
-  }
-  if (!goog.transpiledLanguages_) {
-    goog.transpiledLanguages_ = {es5:!0, es6:!0, "es6-impl":!0};
-    try {
-      goog.transpiledLanguages_.es5 = eval("[1,].length!=1"), eval('(()=>{"use strict";let a={};const X=class{constructor(){}x(z){return new Map([...arguments]).get(z[0])==3}};return new X().x([a,3])})()') && (goog.transpiledLanguages_["es6-impl"] = !1), eval('(()=>{"use strict";class X{constructor(){if(new.target!=String)throw 1;this.x=42}}let q=Reflect.construct(X,[],String);if(q.x!=42||!(q instanceof String))throw 1;for(const a of[2,3]){if(a==2)continue;function f(z={a}){let a=0;return z.a}{function f(){return 0;}}return f()==3}})()') && 
-      (goog.transpiledLanguages_.es6 = !1);
-    } catch (b) {
-    }
-  }
-  return !!goog.transpiledLanguages_[a];
-}, goog.transpiledLanguages_ = null, goog.lastNonModuleScriptIndex_ = 0, goog.onScriptLoad_ = function(a, b) {
-  "complete" == a.readyState && goog.lastNonModuleScriptIndex_ == b && goog.loadQueuedModules_();
-  return !0;
-}, goog.writeScripts_ = function(a) {
-  function b(a) {
-    if (!(a in e.written || a in e.visited)) {
-      e.visited[a] = !0;
-      if (a in e.requires) {
-        for (var f in e.requires[a]) {
-          if (!goog.isProvided_(f)) {
-            if (f in e.nameToPath) {
-              b(e.nameToPath[f]);
-            } else {
-              throw Error("Undefined nameToPath for " + f);
-            }
-          }
-        }
-      }
-      a in d || (d[a] = !0, c.push(a));
-    }
-  }
-  var c = [], d = {}, e = goog.dependencies_;
-  b(a);
-  for (a = 0;a < c.length;a++) {
-    var f = c[a];
-    goog.dependencies_.written[f] = !0;
-  }
-  var g = goog.moduleLoaderState_;
-  goog.moduleLoaderState_ = null;
-  for (a = 0;a < c.length;a++) {
-    if (f = c[a]) {
-      var h = e.loadFlags[f] || {}, k = goog.needsTranspile_(h.lang);
-      "goog" == h.module || k ? goog.importProcessedScript_(goog.basePath + f, "goog" == h.module, k) : goog.importScript_(goog.basePath + f);
-    } else {
-      throw goog.moduleLoaderState_ = g, Error("Undefined script input");
-    }
-  }
-  goog.moduleLoaderState_ = g;
-}, goog.getPathFromDeps_ = function(a) {
-  return a in goog.dependencies_.nameToPath ? goog.dependencies_.nameToPath[a] : null;
-}, goog.findBasePath_(), goog.global.CLOSURE_NO_DEPS || goog.importScript_(goog.basePath + "deps.js"));
-goog.normalizePath_ = function(a) {
-  a = a.split("/");
-  for (var b = 0;b < a.length;) {
-    "." == a[b] ? a.splice(b, 1) : b && ".." == a[b] && a[b - 1] && ".." != a[b - 1] ? a.splice(--b, 2) : b++;
-  }
-  return a.join("/");
-};
-goog.loadFileSync_ = function(a) {
-  if (goog.global.CLOSURE_LOAD_FILE_SYNC) {
-    return goog.global.CLOSURE_LOAD_FILE_SYNC(a);
-  }
-  try {
-    var b = new goog.global.XMLHttpRequest;
-    b.open("get", a, !1);
-    b.send();
-    return 0 == b.status || 200 == b.status ? b.responseText : null;
-  } catch (c) {
-    return null;
-  }
-};
-goog.retrieveAndExec_ = function(a, b, c) {
-  if (!COMPILED) {
-    var d = a;
-    a = goog.normalizePath_(a);
-    var e = goog.global.CLOSURE_IMPORT_SCRIPT || goog.writeScriptTag_, f = goog.loadFileSync_(a);
-    if (null == f) {
-      throw Error('Load of "' + a + '" failed');
-    }
-    c && (f = goog.transpile_.call(goog.global, f, a));
-    f = b ? goog.wrapModule_(a, f) : f + ("\n//# sourceURL=" + a);
-    goog.IS_OLD_IE_ ? (goog.dependencies_.deferred[d] = f, goog.queuedModules_.push(d)) : e(a, f);
-  }
-};
-goog.transpile_ = function(a, b) {
-  var c = goog.global.$jscomp;
-  c || (goog.global.$jscomp = c = {});
-  var d = c.transpile;
-  if (!d) {
-    var e = goog.basePath + "transpile.js", f = goog.loadFileSync_(e);
-    f && (eval(f + "\n//# sourceURL=" + e), c = goog.global.$jscomp, d = c.transpile);
-  }
-  d || (d = c.transpile = function(a, b) {
-    goog.logToConsole_(b + " requires transpilation but no transpiler was found.");
-    return a;
-  });
-  return d(a, b);
-};
-goog.typeOf = function(a) {
-  var b = typeof a;
-  if ("object" == b) {
-    if (a) {
-      if (a instanceof Array) {
-        return "array";
-      }
-      if (a instanceof Object) {
-        return b;
-      }
-      var c = Object.prototype.toString.call(a);
-      if ("[object Window]" == c) {
-        return "object";
-      }
-      if ("[object Array]" == c || "number" == typeof a.length && "undefined" != typeof a.splice && "undefined" != typeof a.propertyIsEnumerable && !a.propertyIsEnumerable("splice")) {
-        return "array";
-      }
-      if ("[object Function]" == c || "undefined" != typeof a.call && "undefined" != typeof a.propertyIsEnumerable && !a.propertyIsEnumerable("call")) {
-        return "function";
-      }
-    } else {
-      return "null";
-    }
-  } else {
-    if ("function" == b && "undefined" == typeof a.call) {
-      return "object";
-    }
-  }
-  return b;
-};
-goog.isNull = function(a) {
-  return null === a;
-};
-goog.isDefAndNotNull = function(a) {
-  return null != a;
-};
-goog.isArray = function(a) {
-  return "array" == goog.typeOf(a);
-};
-goog.isArrayLike = function(a) {
-  var b = goog.typeOf(a);
-  return "array" == b || "object" == b && "number" == typeof a.length;
-};
-goog.isDateLike = function(a) {
-  return goog.isObject(a) && "function" == typeof a.getFullYear;
-};
-goog.isString = function(a) {
-  return "string" == typeof a;
-};
-goog.isBoolean = function(a) {
-  return "boolean" == typeof a;
-};
-goog.isNumber = function(a) {
-  return "number" == typeof a;
-};
-goog.isFunction = function(a) {
-  return "function" == goog.typeOf(a);
-};
-goog.isObject = function(a) {
-  var b = typeof a;
-  return "object" == b && null != a || "function" == b;
-};
-goog.getUid = function(a) {
-  return a[goog.UID_PROPERTY_] || (a[goog.UID_PROPERTY_] = ++goog.uidCounter_);
-};
-goog.hasUid = function(a) {
-  return !!a[goog.UID_PROPERTY_];
-};
-goog.removeUid = function(a) {
-  null !== a && "removeAttribute" in a && a.removeAttribute(goog.UID_PROPERTY_);
-  try {
-    delete a[goog.UID_PROPERTY_];
-  } catch (b) {
-  }
-};
-goog.UID_PROPERTY_ = "closure_uid_" + (1E9 * Math.random() >>> 0);
-goog.uidCounter_ = 0;
-goog.getHashCode = goog.getUid;
-goog.removeHashCode = goog.removeUid;
-goog.cloneObject = function(a) {
-  var b = goog.typeOf(a);
-  if ("object" == b || "array" == b) {
-    if (a.clone) {
-      return a.clone();
-    }
-    var b = "array" == b ? [] : {}, c;
-    for (c in a) {
-      b[c] = goog.cloneObject(a[c]);
-    }
-    return b;
-  }
-  return a;
-};
-goog.bindNative_ = function(a, b, c) {
-  return a.call.apply(a.bind, arguments);
-};
-goog.bindJs_ = function(a, b, c) {
-  if (!a) {
-    throw Error();
-  }
-  if (2 < arguments.length) {
-    var d = Array.prototype.slice.call(arguments, 2);
-    return function() {
-      var c = Array.prototype.slice.call(arguments);
-      Array.prototype.unshift.apply(c, d);
-      return a.apply(b, c);
-    };
-  }
-  return function() {
-    return a.apply(b, arguments);
-  };
-};
-goog.bind = function(a, b, c) {
-  Function.prototype.bind && -1 != Function.prototype.bind.toString().indexOf("native code") ? goog.bind = goog.bindNative_ : goog.bind = goog.bindJs_;
-  return goog.bind.apply(null, arguments);
-};
-goog.partial = function(a, b) {
-  var c = Array.prototype.slice.call(arguments, 1);
-  return function() {
-    var b = c.slice();
-    b.push.apply(b, arguments);
-    return a.apply(this, b);
-  };
-};
-goog.mixin = function(a, b) {
-  for (var c in b) {
-    a[c] = b[c];
-  }
-};
-goog.now = goog.TRUSTED_SITE && Date.now || function() {
-  return +new Date;
-};
-goog.globalEval = function(a) {
-  if (goog.global.execScript) {
-    goog.global.execScript(a, "JavaScript");
-  } else {
-    if (goog.global.eval) {
-      if (null == goog.evalWorksForGlobals_) {
-        if (goog.global.eval("var _evalTest_ = 1;"), "undefined" != typeof goog.global._evalTest_) {
-          try {
-            delete goog.global._evalTest_;
-          } catch (d) {
-          }
-          goog.evalWorksForGlobals_ = !0;
-        } else {
-          goog.evalWorksForGlobals_ = !1;
-        }
-      }
-      if (goog.evalWorksForGlobals_) {
-        goog.global.eval(a);
-      } else {
-        var b = goog.global.document, c = b.createElement("SCRIPT");
-        c.type = "text/javascript";
-        c.defer = !1;
-        c.appendChild(b.createTextNode(a));
-        b.body.appendChild(c);
-        b.body.removeChild(c);
-      }
-    } else {
-      throw Error("goog.globalEval not available");
-    }
-  }
-};
-goog.evalWorksForGlobals_ = null;
-goog.getCssName = function(a, b) {
-  var c = function(a) {
-    return goog.cssNameMapping_[a] || a;
-  }, d = function(a) {
-    a = a.split("-");
-    for (var b = [], d = 0;d < a.length;d++) {
-      b.push(c(a[d]));
-    }
-    return b.join("-");
-  }, d = goog.cssNameMapping_ ? "BY_WHOLE" == goog.cssNameMappingStyle_ ? c : d : function(a) {
-    return a;
-  };
-  return b ? a + "-" + d(b) : d(a);
-};
-goog.setCssNameMapping = function(a, b) {
-  goog.cssNameMapping_ = a;
-  goog.cssNameMappingStyle_ = b;
-};
-!COMPILED && goog.global.CLOSURE_CSS_NAME_MAPPING && (goog.cssNameMapping_ = goog.global.CLOSURE_CSS_NAME_MAPPING);
-goog.getMsg = function(a, b) {
-  b && (a = a.replace(/\{\$([^}]+)}/g, function(a, d) {
-    return null != b && d in b ? b[d] : a;
-  }));
-  return a;
-};
-goog.getMsgWithFallback = function(a, b) {
-  return a;
-};
-goog.exportSymbol = function(a, b, c) {
-  goog.exportPath_(a, b, c);
-};
-goog.exportProperty = function(a, b, c) {
-  a[b] = c;
-};
-goog.inherits = function(a, b) {
-  function c() {
-  }
-  c.prototype = b.prototype;
-  a.superClass_ = b.prototype;
-  a.prototype = new c;
-  a.prototype.constructor = a;
-  a.base = function(a, c, f) {
-    for (var g = Array(arguments.length - 2), h = 2;h < arguments.length;h++) {
-      g[h - 2] = arguments[h];
-    }
-    return b.prototype[c].apply(a, g);
-  };
-};
-goog.base = function(a, b, c) {
-  var d = arguments.callee.caller;
-  if (goog.STRICT_MODE_COMPATIBLE || goog.DEBUG && !d) {
-    throw Error("arguments.caller not defined.  goog.base() cannot be used with strict mode code. See http://www.ecma-international.org/ecma-262/5.1/#sec-C");
-  }
-  if (d.superClass_) {
-    for (var e = Array(arguments.length - 1), f = 1;f < arguments.length;f++) {
-      e[f - 1] = arguments[f];
-    }
-    return d.superClass_.constructor.apply(a, e);
-  }
-  e = Array(arguments.length - 2);
-  for (f = 2;f < arguments.length;f++) {
-    e[f - 2] = arguments[f];
-  }
-  for (var f = !1, g = a.constructor;g;g = g.superClass_ && g.superClass_.constructor) {
-    if (g.prototype[b] === d) {
-      f = !0;
-    } else {
-      if (f) {
-        return g.prototype[b].apply(a, e);
-      }
-    }
-  }
-  if (a[b] === d) {
-    return a.constructor.prototype[b].apply(a, e);
-  }
-  throw Error("goog.base called from a method of one name to a method of a different name");
-};
-goog.scope = function(a) {
-  if (goog.isInModuleLoader_()) {
-    throw Error("goog.scope is not supported within a goog.module.");
-  }
-  a.call(goog.global);
-};
-COMPILED || (goog.global.COMPILED = COMPILED);
-goog.defineClass = function(a, b) {
-  var c = b.constructor, d = b.statics;
-  c && c != Object.prototype.constructor || (c = function() {
-    throw Error("cannot instantiate an interface (no constructor defined).");
-  });
-  c = goog.defineClass.createSealingConstructor_(c, a);
-  a && goog.inherits(c, a);
-  delete b.constructor;
-  delete b.statics;
-  goog.defineClass.applyProperties_(c.prototype, b);
-  null != d && (d instanceof Function ? d(c) : goog.defineClass.applyProperties_(c, d));
-  return c;
-};
-goog.defineClass.SEAL_CLASS_INSTANCES = goog.DEBUG;
-goog.defineClass.createSealingConstructor_ = function(a, b) {
-  if (!goog.defineClass.SEAL_CLASS_INSTANCES) {
-    return a;
-  }
-  var c = !goog.defineClass.isUnsealable_(b), d = function() {
-    var b = a.apply(this, arguments) || this;
-    b[goog.UID_PROPERTY_] = b[goog.UID_PROPERTY_];
-    this.constructor === d && c && Object.seal instanceof Function && Object.seal(b);
-    return b;
-  };
-  return d;
-};
-goog.defineClass.isUnsealable_ = function(a) {
-  return a && a.prototype && a.prototype[goog.UNSEALABLE_CONSTRUCTOR_PROPERTY_];
-};
-goog.defineClass.OBJECT_PROTOTYPE_FIELDS_ = "constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" ");
-goog.defineClass.applyProperties_ = function(a, b) {
-  for (var c in b) {
-    Object.prototype.hasOwnProperty.call(b, c) && (a[c] = b[c]);
-  }
-  for (var d = 0;d < goog.defineClass.OBJECT_PROTOTYPE_FIELDS_.length;d++) {
-    c = goog.defineClass.OBJECT_PROTOTYPE_FIELDS_[d], Object.prototype.hasOwnProperty.call(b, c) && (a[c] = b[c]);
-  }
-};
-goog.tagUnsealableClass = function(a) {
-  !COMPILED && goog.defineClass.SEAL_CLASS_INSTANCES && (a.prototype[goog.UNSEALABLE_CONSTRUCTOR_PROPERTY_] = !0);
-};
-goog.UNSEALABLE_CONSTRUCTOR_PROPERTY_ = "goog_defineClass_legacy_unsealable";
-var axs = {};
-axs.browserUtils = {};
-axs.browserUtils.matchSelector = function(a, b) {
-  return a.matches ? a.matches(b) : a.webkitMatchesSelector ? a.webkitMatchesSelector(b) : a.mozMatchesSelector ? a.mozMatchesSelector(b) : a.msMatchesSelector ? a.msMatchesSelector(b) : !1;
-};
-axs.constants = {};
-axs.constants.ARIA_ROLES = {alert:{namefrom:["author"], parent:["region"]}, alertdialog:{namefrom:["author"], namerequired:!0, parent:["alert", "dialog"]}, application:{namefrom:["author"], namerequired:!0, parent:["landmark"]}, article:{namefrom:["author"], parent:["document", "region"]}, banner:{namefrom:["author"], parent:["landmark"]}, button:{childpresentational:!0, namefrom:["contents", "author"], namerequired:!0, parent:["command"], properties:["aria-expanded", "aria-pressed"]}, checkbox:{namefrom:["contents", 
-"author"], namerequired:!0, parent:["input"], requiredProperties:["aria-checked"], properties:["aria-checked"]}, columnheader:{namefrom:["contents", "author"], namerequired:!0, parent:["gridcell", "sectionhead", "widget"], properties:["aria-sort"], scope:["row"]}, combobox:{mustcontain:["listbox", "textbox"], namefrom:["author"], namerequired:!0, parent:["select"], requiredProperties:["aria-expanded"], properties:["aria-expanded", "aria-autocomplete", "aria-required"]}, command:{"abstract":!0, namefrom:["author"], 
-parent:["widget"]}, complementary:{namefrom:["author"], parent:["landmark"]}, composite:{"abstract":!0, childpresentational:!1, namefrom:["author"], parent:["widget"], properties:["aria-activedescendant"]}, contentinfo:{namefrom:["author"], parent:["landmark"]}, definition:{namefrom:["author"], parent:["section"]}, dialog:{namefrom:["author"], namerequired:!0, parent:["window"]}, directory:{namefrom:["contents", "author"], parent:["list"]}, document:{namefrom:[" author"], namerequired:!0, parent:["structure"], 
-properties:["aria-expanded"]}, form:{namefrom:["author"], parent:["landmark"]}, grid:{mustcontain:["row", "rowgroup"], namefrom:["author"], namerequired:!0, parent:["composite", "region"], properties:["aria-level", "aria-multiselectable", "aria-readonly"]}, gridcell:{namefrom:["contents", "author"], namerequired:!0, parent:["section", "widget"], properties:["aria-readonly", "aria-required", "aria-selected"], scope:["row"]}, group:{namefrom:[" author"], parent:["section"], properties:["aria-activedescendant"]}, 
-heading:{namerequired:!0, parent:["sectionhead"], properties:["aria-level"]}, img:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["section"]}, input:{"abstract":!0, namefrom:["author"], parent:["widget"]}, landmark:{"abstract":!0, namefrom:["contents", "author"], namerequired:!1, parent:["region"]}, link:{namefrom:["contents", "author"], namerequired:!0, parent:["command"], properties:["aria-expanded"]}, list:{mustcontain:["group", "listitem"], namefrom:["author"], parent:["region"]}, 
-listbox:{mustcontain:["option"], namefrom:["author"], namerequired:!0, parent:["list", "select"], properties:["aria-multiselectable", "aria-required"]}, listitem:{namefrom:["contents", "author"], namerequired:!0, parent:["section"], properties:["aria-level", "aria-posinset", "aria-setsize"], scope:["list"]}, log:{namefrom:[" author"], namerequired:!0, parent:["region"]}, main:{namefrom:["author"], parent:["landmark"]}, marquee:{namerequired:!0, parent:["section"]}, math:{childpresentational:!0, namefrom:["author"], 
-parent:["section"]}, menu:{mustcontain:["group", "menuitemradio", "menuitem", "menuitemcheckbox"], namefrom:["author"], namerequired:!0, parent:["list", "select"]}, menubar:{namefrom:["author"], parent:["menu"]}, menuitem:{namefrom:["contents", "author"], namerequired:!0, parent:["command"], scope:["menu", "menubar"]}, menuitemcheckbox:{namefrom:["contents", "author"], namerequired:!0, parent:["checkbox", "menuitem"], scope:["menu", "menubar"]}, menuitemradio:{namefrom:["contents", "author"], namerequired:!0, 
-parent:["menuitemcheckbox", "radio"], scope:["menu", "menubar"]}, navigation:{namefrom:["author"], parent:["landmark"]}, note:{namefrom:["author"], parent:["section"]}, option:{namefrom:["contents", "author"], namerequired:!0, parent:["input"], properties:["aria-checked", "aria-posinset", "aria-selected", "aria-setsize"]}, presentation:{parent:["structure"]}, progressbar:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["range"]}, radio:{namefrom:["contents", "author"], namerequired:!0, 
-parent:["checkbox", "option"]}, radiogroup:{mustcontain:["radio"], namefrom:["author"], namerequired:!0, parent:["select"], properties:["aria-required"]}, range:{"abstract":!0, namefrom:["author"], parent:["widget"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-valuetext"]}, region:{namefrom:[" author"], parent:["section"]}, roletype:{"abstract":!0, properties:"aria-atomic aria-busy aria-controls aria-describedby aria-disabled aria-dropeffect aria-flowto aria-grabbed aria-haspopup aria-hidden aria-invalid aria-label aria-labelledby aria-live aria-owns aria-relevant".split(" ")}, 
-row:{mustcontain:["columnheader", "gridcell", "rowheader"], namefrom:["contents", "author"], parent:["group", "widget"], properties:["aria-level", "aria-selected"], scope:["grid", "rowgroup", "treegrid"]}, rowgroup:{mustcontain:["row"], namefrom:["contents", "author"], parent:["group"], scope:["grid"]}, rowheader:{namefrom:["contents", "author"], namerequired:!0, parent:["gridcell", "sectionhead", "widget"], properties:["aria-sort"], scope:["row"]}, search:{namefrom:["author"], parent:["landmark"]}, 
-section:{"abstract":!0, namefrom:["contents", "author"], parent:["structure"], properties:["aria-expanded"]}, sectionhead:{"abstract":!0, namefrom:["contents", "author"], parent:["structure"], properties:["aria-expanded"]}, select:{"abstract":!0, namefrom:["author"], parent:["composite", "group", "input"]}, separator:{childpresentational:!0, namefrom:["author"], parent:["structure"], properties:["aria-expanded", "aria-orientation"]}, scrollbar:{childpresentational:!0, namefrom:["author"], namerequired:!1, 
-parent:["input", "range"], requiredProperties:["aria-controls", "aria-orientation", "aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-controls", "aria-orientation", "aria-valuemax", "aria-valuemin", "aria-valuenow"]}, slider:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["input", "range"], requiredProperties:["aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-orientation"]}, spinbutton:{namefrom:["author"], 
-namerequired:!0, parent:["input", "range"], requiredProperties:["aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-required"]}, status:{parent:["region"]}, structure:{"abstract":!0, parent:["roletype"]}, tab:{namefrom:["contents", "author"], parent:["sectionhead", "widget"], properties:["aria-selected"], scope:["tablist"]}, tablist:{mustcontain:["tab"], namefrom:["author"], parent:["composite", "directory"], properties:["aria-level"]}, 
-tabpanel:{namefrom:["author"], namerequired:!0, parent:["region"]}, textbox:{namefrom:["author"], namerequired:!0, parent:["input"], properties:["aria-activedescendant", "aria-autocomplete", "aria-multiline", "aria-readonly", "aria-required"]}, timer:{namefrom:["author"], namerequired:!0, parent:["status"]}, toolbar:{namefrom:["author"], parent:["group"]}, tooltip:{namerequired:!0, parent:["section"]}, tree:{mustcontain:["group", "treeitem"], namefrom:["author"], namerequired:!0, parent:["select"], 
-properties:["aria-multiselectable", "aria-required"]}, treegrid:{mustcontain:["row"], namefrom:["author"], namerequired:!0, parent:["grid", "tree"]}, treeitem:{namefrom:["contents", "author"], namerequired:!0, parent:["listitem", "option"], scope:["group", "tree"]}, widget:{"abstract":!0, parent:["roletype"]}, window:{"abstract":!0, namefrom:[" author"], parent:["roletype"], properties:["aria-expanded"]}};
-axs.constants.WIDGET_ROLES = {};
-axs.constants.addAllParentRolesToSet_ = function(a, b) {
-  if (a.parent) {
-    for (var c = a.parent, d = 0;d < c.length;d++) {
-      var e = c[d];
-      b[e] = !0;
-      axs.constants.addAllParentRolesToSet_(axs.constants.ARIA_ROLES[e], b);
-    }
-  }
-};
-axs.constants.addAllPropertiesToSet_ = function(a, b, c) {
-  var d = a[b];
-  if (d) {
-    for (var e = 0;e < d.length;e++) {
-      c[d[e]] = !0;
-    }
-  }
-  if (a.parent) {
-    for (a = a.parent, d = 0;d < a.length;d++) {
-      axs.constants.addAllPropertiesToSet_(axs.constants.ARIA_ROLES[a[d]], b, c);
-    }
-  }
-};
-for (var roleName in axs.constants.ARIA_ROLES) {
-  var role = axs.constants.ARIA_ROLES[roleName], propertiesSet = {};
-  axs.constants.addAllPropertiesToSet_(role, "properties", propertiesSet);
-  role.propertiesSet = propertiesSet;
-  var requiredPropertiesSet = {};
-  axs.constants.addAllPropertiesToSet_(role, "requiredProperties", requiredPropertiesSet);
-  role.requiredPropertiesSet = requiredPropertiesSet;
-  var parentRolesSet = {};
-  axs.constants.addAllParentRolesToSet_(role, parentRolesSet);
-  role.allParentRolesSet = parentRolesSet;
-  "widget" in parentRolesSet && (axs.constants.WIDGET_ROLES[roleName] = role);
-}
-axs.constants.ARIA_PROPERTIES = {activedescendant:{type:"property", valueType:"idref"}, atomic:{defaultValue:"false", type:"property", valueType:"boolean"}, autocomplete:{defaultValue:"none", type:"property", valueType:"token", values:["inline", "list", "both", "none"]}, busy:{defaultValue:"false", type:"state", valueType:"boolean"}, checked:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "mixed", "undefined"]}, controls:{type:"property", valueType:"idref_list"}, 
-describedby:{type:"property", valueType:"idref_list"}, disabled:{defaultValue:"false", type:"state", valueType:"boolean"}, dropeffect:{defaultValue:"none", type:"property", valueType:"token_list", values:"copy move link execute popup none".split(" ")}, expanded:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "undefined"]}, flowto:{type:"property", valueType:"idref_list"}, grabbed:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", 
-"undefined"]}, haspopup:{defaultValue:"false", type:"property", valueType:"boolean"}, hidden:{defaultValue:"false", type:"state", valueType:"boolean"}, invalid:{defaultValue:"false", type:"state", valueType:"token", values:["grammar", "false", "spelling", "true"]}, label:{type:"property", valueType:"string"}, labelledby:{type:"property", valueType:"idref_list"}, level:{type:"property", valueType:"integer"}, live:{defaultValue:"off", type:"property", valueType:"token", values:["off", "polite", "assertive"]}, 
-multiline:{defaultValue:"false", type:"property", valueType:"boolean"}, multiselectable:{defaultValue:"false", type:"property", valueType:"boolean"}, orientation:{defaultValue:"vertical", type:"property", valueType:"token", values:["horizontal", "vertical"]}, owns:{type:"property", valueType:"idref_list"}, posinset:{type:"property", valueType:"integer"}, pressed:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "mixed", "undefined"]}, readonly:{defaultValue:"false", 
-type:"property", valueType:"boolean"}, relevant:{defaultValue:"additions text", type:"property", valueType:"token_list", values:["additions", "removals", "text", "all"]}, required:{defaultValue:"false", type:"property", valueType:"boolean"}, selected:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "undefined"]}, setsize:{type:"property", valueType:"integer"}, sort:{defaultValue:"none", type:"property", valueType:"token", values:["ascending", "descending", "none", 
-"other"]}, valuemax:{type:"property", valueType:"decimal"}, valuemin:{type:"property", valueType:"decimal"}, valuenow:{type:"property", valueType:"decimal"}, valuetext:{type:"property", valueType:"string"}};
-(function() {
-  for (var a in axs.constants.ARIA_PROPERTIES) {
-    var b = axs.constants.ARIA_PROPERTIES[a];
-    if (b.values) {
-      for (var c = {}, d = 0;d < b.values.length;d++) {
-        c[b.values[d]] = !0;
-      }
-      b.valuesSet = c;
-    }
-  }
-})();
-axs.constants.GLOBAL_PROPERTIES = axs.constants.ARIA_ROLES.roletype.propertiesSet;
-axs.constants.NO_ROLE_NAME = " ";
-axs.constants.WIDGET_ROLE_TO_NAME = {alert:"aria_role_alert", alertdialog:"aria_role_alertdialog", button:"aria_role_button", checkbox:"aria_role_checkbox", columnheader:"aria_role_columnheader", combobox:"aria_role_combobox", dialog:"aria_role_dialog", grid:"aria_role_grid", gridcell:"aria_role_gridcell", link:"aria_role_link", listbox:"aria_role_listbox", log:"aria_role_log", marquee:"aria_role_marquee", menu:"aria_role_menu", menubar:"aria_role_menubar", menuitem:"aria_role_menuitem", menuitemcheckbox:"aria_role_menuitemcheckbox", 
-menuitemradio:"aria_role_menuitemradio", option:axs.constants.NO_ROLE_NAME, progressbar:"aria_role_progressbar", radio:"aria_role_radio", radiogroup:"aria_role_radiogroup", rowheader:"aria_role_rowheader", scrollbar:"aria_role_scrollbar", slider:"aria_role_slider", spinbutton:"aria_role_spinbutton", status:"aria_role_status", tab:"aria_role_tab", tabpanel:"aria_role_tabpanel", textbox:"aria_role_textbox", timer:"aria_role_timer", toolbar:"aria_role_toolbar", tooltip:"aria_role_tooltip", treeitem:"aria_role_treeitem"};
-axs.constants.STRUCTURE_ROLE_TO_NAME = {article:"aria_role_article", application:"aria_role_application", banner:"aria_role_banner", columnheader:"aria_role_columnheader", complementary:"aria_role_complementary", contentinfo:"aria_role_contentinfo", definition:"aria_role_definition", directory:"aria_role_directory", document:"aria_role_document", form:"aria_role_form", group:"aria_role_group", heading:"aria_role_heading", img:"aria_role_img", list:"aria_role_list", listitem:"aria_role_listitem", 
-main:"aria_role_main", math:"aria_role_math", navigation:"aria_role_navigation", note:"aria_role_note", region:"aria_role_region", rowheader:"aria_role_rowheader", search:"aria_role_search", separator:"aria_role_separator"};
-axs.constants.ATTRIBUTE_VALUE_TO_STATUS = [{name:"aria-autocomplete", values:{inline:"aria_autocomplete_inline", list:"aria_autocomplete_list", both:"aria_autocomplete_both"}}, {name:"aria-checked", values:{"true":"aria_checked_true", "false":"aria_checked_false", mixed:"aria_checked_mixed"}}, {name:"aria-disabled", values:{"true":"aria_disabled_true"}}, {name:"aria-expanded", values:{"true":"aria_expanded_true", "false":"aria_expanded_false"}}, {name:"aria-invalid", values:{"true":"aria_invalid_true", 
-grammar:"aria_invalid_grammar", spelling:"aria_invalid_spelling"}}, {name:"aria-multiline", values:{"true":"aria_multiline_true"}}, {name:"aria-multiselectable", values:{"true":"aria_multiselectable_true"}}, {name:"aria-pressed", values:{"true":"aria_pressed_true", "false":"aria_pressed_false", mixed:"aria_pressed_mixed"}}, {name:"aria-readonly", values:{"true":"aria_readonly_true"}}, {name:"aria-required", values:{"true":"aria_required_true"}}, {name:"aria-selected", values:{"true":"aria_selected_true", 
-"false":"aria_selected_false"}}];
-axs.constants.INPUT_TYPE_TO_INFORMATION_TABLE_MSG = {button:"input_type_button", checkbox:"input_type_checkbox", color:"input_type_color", datetime:"input_type_datetime", "datetime-local":"input_type_datetime_local", date:"input_type_date", email:"input_type_email", file:"input_type_file", image:"input_type_image", month:"input_type_month", number:"input_type_number", password:"input_type_password", radio:"input_type_radio", range:"input_type_range", reset:"input_type_reset", search:"input_type_search", 
-submit:"input_type_submit", tel:"input_type_tel", text:"input_type_text", url:"input_type_url", week:"input_type_week"};
-axs.constants.TAG_TO_INFORMATION_TABLE_VERBOSE_MSG = {A:"tag_link", BUTTON:"tag_button", H1:"tag_h1", H2:"tag_h2", H3:"tag_h3", H4:"tag_h4", H5:"tag_h5", H6:"tag_h6", LI:"tag_li", OL:"tag_ol", SELECT:"tag_select", TEXTAREA:"tag_textarea", UL:"tag_ul", SECTION:"tag_section", NAV:"tag_nav", ARTICLE:"tag_article", ASIDE:"tag_aside", HGROUP:"tag_hgroup", HEADER:"tag_header", FOOTER:"tag_footer", TIME:"tag_time", MARK:"tag_mark"};
-axs.constants.TAG_TO_INFORMATION_TABLE_BRIEF_MSG = {BUTTON:"tag_button", SELECT:"tag_select", TEXTAREA:"tag_textarea"};
-axs.constants.MIXED_VALUES = {"true":!0, "false":!0, mixed:!0};
-axs.constants.Severity = {INFO:"Info", WARNING:"Warning", SEVERE:"Severe"};
-axs.constants.AuditResult = {PASS:"PASS", FAIL:"FAIL", NA:"NA"};
-axs.constants.InlineElements = {TT:!0, I:!0, B:!0, BIG:!0, SMALL:!0, EM:!0, STRONG:!0, DFN:!0, CODE:!0, SAMP:!0, KBD:!0, VAR:!0, CITE:!0, ABBR:!0, ACRONYM:!0, A:!0, IMG:!0, OBJECT:!0, BR:!0, SCRIPT:!0, MAP:!0, Q:!0, SUB:!0, SUP:!0, SPAN:!0, BDO:!0, INPUT:!0, SELECT:!0, TEXTAREA:!0, LABEL:!0, BUTTON:!0};
-axs.constants.NATIVELY_DISABLEABLE = {BUTTON:!0, INPUT:!0, SELECT:!0, TEXTAREA:!0, FIELDSET:!0, OPTGROUP:!0, OPTION:!0};
-axs.constants.ARIA_TO_HTML_ATTRIBUTE = {"aria-checked":"checked", "aria-disabled":"disabled", "aria-hidden":"hidden", "aria-expanded":"open", "aria-valuemax":"max", "aria-valuemin":"min", "aria-readonly":"readonly", "aria-required":"required", "aria-selected":"selected", "aria-valuenow":"value"};
-axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO = {A:[{role:"link", allowed:"button checkbox menuitem menuitemcheckbox menuitemradio tab treeitem".split(" "), selector:"a[href]"}], ADDRESS:[{role:"", allowed:["contentinfo", "presentation"]}], AREA:[{role:"link", selector:"area[href]"}], ARTICLE:[{role:"article", allowed:["presentation", "article", "document", "application", "main"]}], ASIDE:[{role:"complementary", allowed:["note", "complementary", "search", "presentation"]}], AUDIO:[{role:"", allowed:["application", 
-"presentation"]}], BASE:[{role:"", reserved:!0}], BODY:[{role:"document", allowed:["presentation"]}], BUTTON:[{role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'button:not([aria-pressed]):not([type="menu"])'}, {role:"button", allowed:["button"], selector:"button[aria-pressed]"}, {role:"button", attributes:{"aria-haspopup":!0}, allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'button[type="menu"]'}], CAPTION:[{role:"", 
-allowed:["presentation"]}], COL:[{role:"", reserved:!0}], COLGROUP:[{role:"", reserved:!0}], DATALIST:[{role:"listbox", attributes:{"aria-multiselectable":!1}, allowed:["presentation"]}], DEL:[{role:"", allowed:["*"]}], DD:[{role:"", allowed:["presentation"]}], DT:[{role:"", allowed:["presentation"]}], DETAILS:[{role:"group", allowed:["group", "presentation"]}], DIALOG:[{role:"dialog", allowed:"dialog alert alertdialog application log marquee status".split(" "), selector:"dialog[open]"}, {role:"dialog", 
-attributes:{"aria-hidden":!0}, allowed:"dialog alert alertdialog application log marquee status".split(" "), selector:"dialog:not([open])"}], DIV:[{role:"", allowed:["*"]}], DL:[{role:"list", allowed:["presentation"]}], EMBED:[{role:"", allowed:["application", "document", "img", "presentation"]}], FIGURE:[{role:"", allowed:["*"]}], FOOTER:[{role:"", allowed:["contentinfo", "presentation"]}], FORM:[{role:"form", allowed:["presentation"]}], P:[{role:"", allowed:["*"]}], PRE:[{role:"", allowed:["*"]}], 
-BLOCKQUOTE:[{role:"", allowed:["*"]}], H1:[{role:"heading"}], H2:[{role:"heading"}], H3:[{role:"heading"}], H4:[{role:"heading"}], H5:[{role:"heading"}], H6:[{role:"heading"}], HEAD:[{role:"", reserved:!0}], HEADER:[{role:"", allowed:["banner", "presentation"]}], HR:[{role:"separator", allowed:["presentation"]}], HTML:[{role:"", reserved:!0}], IFRAME:[{role:"", allowed:["application", "document", "img", "presentation"], selector:"iframe:not([seamless])"}, {role:"", allowed:["application", "document", 
-"img", "presentation", "group"], selector:"iframe[seamless]"}], IMG:[{role:"presentation", reserved:!0, selector:'img[alt=""]'}, {role:"img", allowed:["*"], selector:'img[alt]:not([alt=""])'}], INPUT:[{role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'input[type="button"]:not([aria-pressed])'}, {role:"button", allowed:["button"], selector:'input[type="button"][aria-pressed]'}, {role:"checkbox", allowed:["checkbox"], selector:'input[type="checkbox"]'}, 
-{role:"", selector:'input[type="color"]'}, {role:"", selector:'input[type="date"]'}, {role:"", selector:'input[type="datetime"]'}, {role:"textbox", selector:'input[type="email"]:not([list])'}, {role:"", selector:'input[type="file"]'}, {role:"", reserved:!0, selector:'input[type="hidden"]'}, {role:"button", allowed:["button"], selector:'input[type="image"][aria-pressed]'}, {role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'input[type="image"]:not([aria-pressed])'}, 
-{role:"", selector:'input[type="month"]'}, {role:"", selector:'input[type="number"]'}, {role:"textbox", selector:'input[type="password"]'}, {role:"radio", allowed:["menuitemradio"], selector:'input[type="radio"]'}, {role:"slider", selector:'input[type="range"]'}, {role:"button", selector:'input[type="reset"]'}, {role:"combobox", selector:'input[type="search"][list]'}, {role:"textbox", selector:'input[type="search"]:not([list])'}, {role:"button", selector:'input[type="submit"]'}, {role:"combobox", 
-selector:'input[type="tel"][list]'}, {role:"textbox", selector:'input[type="tel"]:not([list])'}, {role:"combobox", selector:'input[type="text"][list]'}, {role:"textbox", selector:'input[type="text"]:not([list])'}, {role:"textbox", selector:"input:not([type])"}, {role:"", selector:'input[type="time"]'}, {role:"combobox", selector:'input[type="url"][list]'}, {role:"textbox", selector:'input[type="url"]:not([list])'}, {role:"", selector:'input[type="week"]'}], INS:[{role:"", allowed:["*"]}], KEYGEN:[{role:""}], 
-LABEL:[{role:"", allowed:["presentation"]}], LI:[{role:"listitem", allowed:"menuitem menuitemcheckbox menuitemradio option tab treeitem presentation".split(" "), selector:'ol:not([role="presentation"])>li, ul:not([role="presentation"])>li'}, {role:"listitem", allowed:"listitem menuitem menuitemcheckbox menuitemradio option tab treeitem presentation".split(" "), selector:'ol[role="presentation"]>li, ul[role="presentation"]>li'}], LINK:[{role:"link", reserved:!0, selector:"link[href]"}], MAIN:[{role:"", 
-allowed:["main", "presentation"]}], MAP:[{role:"", reserved:!0}], MATH:[{role:"", allowed:["presentation"]}], MENU:[{role:"toolbar", selector:'menu[type="toolbar"]'}], MENUITEM:[{role:"menuitem", selector:'menuitem[type="command"]'}, {role:"menuitemcheckbox", selector:'menuitem[type="checkbox"]'}, {role:"menuitemradio", selector:'menuitem[type="radio"]'}], META:[{role:"", reserved:!0}], METER:[{role:"progressbar", allowed:["presentation"]}], NAV:[{role:"navigation", allowed:["navigation", "presentation"]}], 
-NOSCRIPT:[{role:"", reserved:!0}], OBJECT:[{role:"", allowed:["application", "document", "img", "presentation"]}], OL:[{role:"list", allowed:"directory group listbox menu menubar tablist toolbar tree presentation".split(" ")}], OPTGROUP:[{role:"", allowed:["presentation"]}], OPTION:[{role:"option"}], OUTPUT:[{role:"status", allowed:["*"]}], PARAM:[{role:"", reserved:!0}], PICTURE:[{role:"", reserved:!0}], PROGRESS:[{role:"progressbar", allowed:["presentation"]}], SCRIPT:[{role:"", reserved:!0}], 
-SECTION:[{role:"region", allowed:"alert alertdialog application contentinfo dialog document log marquee search status presentation".split(" ")}], SELECT:[{role:"listbox"}], SOURCE:[{role:"", reserved:!0}], SPAN:[{role:"", allowed:["*"]}], STYLE:[{role:"", reserved:!0}], SVG:[{role:"", allowed:["application", "document", "img", "presentation"]}], SUMMARY:[{role:"", allowed:["presentation"]}], TABLE:[{role:"", allowed:["*"]}], TEMPLATE:[{role:"", reserved:!0}], TEXTAREA:[{role:"textbox"}], TBODY:[{role:"rowgroup", 
-allowed:["*"]}], THEAD:[{role:"rowgroup", allowed:["*"]}], TFOOT:[{role:"rowgroup", allowed:["*"]}], TITLE:[{role:"", reserved:!0}], TD:[{role:"", allowed:["*"]}], TH:[{role:"", allowed:["*"]}], TR:[{role:"", allowed:["*"]}], TRACK:[{role:"", reserved:!0}], UL:[{role:"list", allowed:"directory group listbox menu menubar tablist toolbar tree presentation".split(" ")}], VIDEO:[{role:"", allowed:["application", "presentation"]}]};
-axs.color = {};
-axs.color.Color = function(a, b, c, d) {
-  this.red = a;
-  this.green = b;
-  this.blue = c;
-  this.alpha = d;
-};
-axs.color.YCbCr = function(a) {
-  this.luma = this.z = a[0];
-  this.Cb = this.x = a[1];
-  this.Cr = this.y = a[2];
-};
-axs.color.YCbCr.prototype = {multiply:function(a) {
-  return new axs.color.YCbCr([this.luma * a, this.Cb * a, this.Cr * a]);
-}, add:function(a) {
-  return new axs.color.YCbCr([this.luma + a.luma, this.Cb + a.Cb, this.Cr + a.Cr]);
-}, subtract:function(a) {
-  return new axs.color.YCbCr([this.luma - a.luma, this.Cb - a.Cb, this.Cr - a.Cr]);
-}};
-axs.color.calculateContrastRatio = function(a, b) {
-  1 > a.alpha && (a = axs.color.flattenColors(a, b));
-  var c = axs.color.calculateLuminance(a), d = axs.color.calculateLuminance(b);
-  return (Math.max(c, d) + .05) / (Math.min(c, d) + .05);
-};
-axs.color.calculateLuminance = function(a) {
-  return axs.color.toYCbCr(a).luma;
-};
-axs.color.luminanceRatio = function(a, b) {
-  return (Math.max(a, b) + .05) / (Math.min(a, b) + .05);
-};
-axs.color.parseColor = function(a) {
-  if ("transparent" === a) {
-    return new axs.color.Color(0, 0, 0, 0);
-  }
-  var b = a.match(/^rgb\((\d+), (\d+), (\d+)\)$/);
-  if (b) {
-    a = parseInt(b[1], 10);
-    var c = parseInt(b[2], 10), d = parseInt(b[3], 10);
-    return new axs.color.Color(a, c, d, 1);
-  }
-  return (b = a.match(/^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/)) ? (a = parseInt(b[1], 10), c = parseInt(b[2], 10), d = parseInt(b[3], 10), b = parseFloat(b[4]), new axs.color.Color(a, c, d, b)) : null;
-};
-axs.color.colorChannelToString = function(a) {
-  a = Math.round(a);
-  return 15 >= a ? "0" + a.toString(16) : a.toString(16);
-};
-axs.color.colorToString = function(a) {
-  return 1 == a.alpha ? "#" + axs.color.colorChannelToString(a.red) + axs.color.colorChannelToString(a.green) + axs.color.colorChannelToString(a.blue) : "rgba(" + [a.red, a.green, a.blue, a.alpha].join() + ")";
-};
-axs.color.luminanceFromContrastRatio = function(a, b, c) {
-  return c ? (a + .05) * b - .05 : (a + .05) / b - .05;
-};
-axs.color.translateColor = function(a, b) {
-  for (var c = b > a.luma ? axs.color.WHITE_YCC : axs.color.BLACK_YCC, d = c == axs.color.WHITE_YCC ? axs.color.YCC_CUBE_FACES_WHITE : axs.color.YCC_CUBE_FACES_BLACK, e = new axs.color.YCbCr([0, a.Cb, a.Cr]), f = new axs.color.YCbCr([1, a.Cb, a.Cr]), f = {a:e, b:f}, e = null, g = 0;g < d.length && !(e = axs.color.findIntersection(f, d[g]), 0 <= e.z && 1 >= e.z);g++) {
-  }
-  if (!e) {
-    throw "Couldn't find intersection with YCbCr color cube for Cb=" + a.Cb + ", Cr=" + a.Cr + ".";
-  }
-  if (e.x != a.x || e.y != a.y) {
-    throw "Intersection has wrong Cb/Cr values.";
-  }
-  if (Math.abs(c.luma - e.luma) < Math.abs(c.luma - b)) {
-    return c = [b, a.Cb, a.Cr], axs.color.fromYCbCrArray(c);
-  }
-  c = (b - e.luma) / (c.luma - e.luma);
-  c = [b, e.Cb - e.Cb * c, e.Cr - e.Cr * c];
-  return axs.color.fromYCbCrArray(c);
-};
-axs.color.suggestColors = function(a, b, c) {
-  var d = {}, e = axs.color.calculateLuminance(a), f = axs.color.calculateLuminance(b), g = f > e, h = axs.color.toYCbCr(b), k = axs.color.toYCbCr(a), m;
-  for (m in c) {
-    var l = c[m], n = axs.color.luminanceFromContrastRatio(e, l + .02, g);
-    if (1 >= n && 0 <= n) {
-      var p = axs.color.translateColor(h, n), l = axs.color.calculateContrastRatio(p, a), n = {};
-      n.fg = axs.color.colorToString(p);
-      n.bg = axs.color.colorToString(a);
-      n.contrast = l.toFixed(2);
-      d[m] = n;
-    } else {
-      l = axs.color.luminanceFromContrastRatio(f, l + .02, !g), 1 >= l && 0 <= l && (p = axs.color.translateColor(k, l), l = axs.color.calculateContrastRatio(b, p), n = {}, n.bg = axs.color.colorToString(p), n.fg = axs.color.colorToString(b), n.contrast = l.toFixed(2), d[m] = n);
-    }
-  }
-  return d;
-};
-axs.color.flattenColors = function(a, b) {
-  var c = a.alpha;
-  return new axs.color.Color((1 - c) * b.red + c * a.red, (1 - c) * b.green + c * a.green, (1 - c) * b.blue + c * a.blue, a.alpha + b.alpha * (1 - a.alpha));
-};
-axs.color.multiplyMatrixVector = function(a, b) {
-  var c = b[0], d = b[1], e = b[2];
-  return [a[0][0] * c + a[0][1] * d + a[0][2] * e, a[1][0] * c + a[1][1] * d + a[1][2] * e, a[2][0] * c + a[2][1] * d + a[2][2] * e];
-};
-axs.color.toYCbCr = function(a) {
-  var b = a.red / 255, c = a.green / 255;
-  a = a.blue / 255;
-  return new axs.color.YCbCr(axs.color.multiplyMatrixVector(axs.color.YCC_MATRIX, [.03928 >= b ? b / 12.92 : Math.pow((b + .055) / 1.055, 2.4), .03928 >= c ? c / 12.92 : Math.pow((c + .055) / 1.055, 2.4), .03928 >= a ? a / 12.92 : Math.pow((a + .055) / 1.055, 2.4)]));
-};
-axs.color.fromYCbCr = function(a) {
-  return axs.color.fromYCbCrArray([a.luma, a.Cb, a.Cr]);
-};
-axs.color.fromYCbCrArray = function(a) {
-  var b = axs.color.multiplyMatrixVector(axs.color.INVERTED_YCC_MATRIX, a);
-  a = b[0];
-  var c = b[1], b = b[2];
-  return new axs.color.Color(Math.min(Math.max(Math.round(255 * (.00303949 >= a ? 12.92 * a : 1.055 * Math.pow(a, 1 / 2.4) - .055)), 0), 255), Math.min(Math.max(Math.round(255 * (.00303949 >= c ? 12.92 * c : 1.055 * Math.pow(c, 1 / 2.4) - .055)), 0), 255), Math.min(Math.max(Math.round(255 * (.00303949 >= b ? 12.92 * b : 1.055 * Math.pow(b, 1 / 2.4) - .055)), 0), 255), 1);
-};
-axs.color.RGBToYCbCrMatrix = function(a, b) {
-  return [[a, 1 - a - b, b], [-a / (2 - 2 * b), (a + b - 1) / (2 - 2 * b), (1 - b) / (2 - 2 * b)], [(1 - a) / (2 - 2 * a), (a + b - 1) / (2 - 2 * a), -b / (2 - 2 * a)]];
-};
-axs.color.invert3x3Matrix = function(a) {
-  var b = a[0][0], c = a[0][1], d = a[0][2], e = a[1][0], f = a[1][1], g = a[1][2], h = a[2][0], k = a[2][1];
-  a = a[2][2];
-  return axs.color.scalarMultiplyMatrix([[f * a - g * k, d * k - c * a, c * g - d * f], [g * h - e * a, b * a - d * h, d * e - b * g], [e * k - f * h, h * c - b * k, b * f - c * e]], 1 / (b * (f * a - g * k) - c * (a * e - g * h) + d * (e * k - f * h)));
-};
-axs.color.findIntersection = function(a, b) {
-  var c = [a.a.x - b.p0.x, a.a.y - b.p0.y, a.a.z - b.p0.z], d = axs.color.invert3x3Matrix([[a.a.x - a.b.x, b.p1.x - b.p0.x, b.p2.x - b.p0.x], [a.a.y - a.b.y, b.p1.y - b.p0.y, b.p2.y - b.p0.y], [a.a.z - a.b.z, b.p1.z - b.p0.z, b.p2.z - b.p0.z]]), c = axs.color.multiplyMatrixVector(d, c)[0];
-  return a.a.add(a.b.subtract(a.a).multiply(c));
-};
-axs.color.scalarMultiplyMatrix = function(a, b) {
-  for (var c = [], d = 0;3 > d;d++) {
-    c[d] = axs.color.scalarMultiplyVector(a[d], b);
-  }
-  return c;
-};
-axs.color.scalarMultiplyVector = function(a, b) {
-  for (var c = [], d = 0;d < a.length;d++) {
-    c[d] = a[d] * b;
-  }
-  return c;
-};
-axs.color.kR = .2126;
-axs.color.kB = .0722;
-axs.color.YCC_MATRIX = axs.color.RGBToYCbCrMatrix(axs.color.kR, axs.color.kB);
-axs.color.INVERTED_YCC_MATRIX = axs.color.invert3x3Matrix(axs.color.YCC_MATRIX);
-axs.color.BLACK = new axs.color.Color(0, 0, 0, 1);
-axs.color.BLACK_YCC = axs.color.toYCbCr(axs.color.BLACK);
-axs.color.WHITE = new axs.color.Color(255, 255, 255, 1);
-axs.color.WHITE_YCC = axs.color.toYCbCr(axs.color.WHITE);
-axs.color.RED = new axs.color.Color(255, 0, 0, 1);
-axs.color.RED_YCC = axs.color.toYCbCr(axs.color.RED);
-axs.color.GREEN = new axs.color.Color(0, 255, 0, 1);
-axs.color.GREEN_YCC = axs.color.toYCbCr(axs.color.GREEN);
-axs.color.BLUE = new axs.color.Color(0, 0, 255, 1);
-axs.color.BLUE_YCC = axs.color.toYCbCr(axs.color.BLUE);
-axs.color.CYAN = new axs.color.Color(0, 255, 255, 1);
-axs.color.CYAN_YCC = axs.color.toYCbCr(axs.color.CYAN);
-axs.color.MAGENTA = new axs.color.Color(255, 0, 255, 1);
-axs.color.MAGENTA_YCC = axs.color.toYCbCr(axs.color.MAGENTA);
-axs.color.YELLOW = new axs.color.Color(255, 255, 0, 1);
-axs.color.YELLOW_YCC = axs.color.toYCbCr(axs.color.YELLOW);
-axs.color.YCC_CUBE_FACES_BLACK = [{p0:axs.color.BLACK_YCC, p1:axs.color.RED_YCC, p2:axs.color.GREEN_YCC}, {p0:axs.color.BLACK_YCC, p1:axs.color.GREEN_YCC, p2:axs.color.BLUE_YCC}, {p0:axs.color.BLACK_YCC, p1:axs.color.BLUE_YCC, p2:axs.color.RED_YCC}];
-axs.color.YCC_CUBE_FACES_WHITE = [{p0:axs.color.WHITE_YCC, p1:axs.color.CYAN_YCC, p2:axs.color.MAGENTA_YCC}, {p0:axs.color.WHITE_YCC, p1:axs.color.MAGENTA_YCC, p2:axs.color.YELLOW_YCC}, {p0:axs.color.WHITE_YCC, p1:axs.color.YELLOW_YCC, p2:axs.color.CYAN_YCC}];
-axs.dom = {};
-axs.dom.parentElement = function(a) {
-  if (!a) {
-    return null;
-  }
-  a = axs.dom.composedParentNode(a);
-  if (!a) {
-    return null;
-  }
-  switch(a.nodeType) {
-    case Node.ELEMENT_NODE:
-      return a;
-    default:
-      return axs.dom.parentElement(a);
-  }
-};
-axs.dom.shadowHost = function(a) {
-  return "host" in a ? a.host : null;
-};
-axs.dom.composedParentNode = function(a) {
-  if (!a) {
-    return null;
-  }
-  if (a.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
-    return axs.dom.shadowHost(a);
-  }
-  var b = a.parentNode;
-  if (!b) {
-    return null;
-  }
-  if (b.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
-    return axs.dom.shadowHost(b);
-  }
-  if (!b.shadowRoot) {
-    return b;
-  }
-  a = a.getDestinationInsertionPoints();
-  return 0 < a.length ? axs.dom.composedParentNode(a[a.length - 1]) : null;
-};
-axs.dom.asElement = function(a) {
-  switch(a.nodeType) {
-    case Node.COMMENT_NODE:
-      break;
-    case Node.ELEMENT_NODE:
-      if ("script" == a.localName || "template" == a.localName) {
-        break;
-      }
-      return a;
-    case Node.DOCUMENT_FRAGMENT_NODE:
-      return a.host;
-    case Node.TEXT_NODE:
-      return axs.dom.parentElement(a);
-    default:
-      console.warn("Unhandled node type: ", a.nodeType);
-  }
-  return null;
-};
-axs.dom.composedTreeSearch = function(a, b, c, d, e) {
-  if (a === b) {
-    return !0;
-  }
-  if (a.nodeType == Node.ELEMENT_NODE) {
-    var f = a
-  }
-  var g = !1;
-  d = Object.create(d);
-  if (f) {
-    var h = f.localName;
-    d.collectIdRefs && (d.idrefs = axs.utils.getReferencedIds(f));
-    if (!d.disabled || "legend" === h && axs.browserUtils.matchSelector(f, "fieldset>legend:first-of-type")) {
-      d.disabled = axs.utils.isElementDisabled(f, !0);
-    }
-    d.hidden || (d.hidden = axs.utils.isElementHidden(f));
-    if (c.preorder && !c.preorder(f, d)) {
-      return g;
-    }
-    var k = f.shadowRoot || f.webkitShadowRoot;
-    if (k) {
-      return d.level++, g = axs.dom.composedTreeSearch(k, b, c, d, k), f && c.postorder && !g && c.postorder(f, d), g;
-    }
-    if ("content" == h) {
-      a = f.getDistributedNodes();
-      for (h = 0;h < a.length && !g;h++) {
-        g = axs.dom.composedTreeSearch(a[h], b, c, d, e);
-      }
-      c.postorder && !g && c.postorder.call(null, f, d);
-      return g;
-    }
-  }
-  for (a = a.firstChild;null != a && !g;) {
-    g = axs.dom.composedTreeSearch(a, b, c, d, e), a = a.nextSibling;
-  }
-  f && c.postorder && !g && c.postorder.call(null, f, d);
-  return g;
-};
-axs.utils = {};
-axs.utils.FOCUSABLE_ELEMENTS_SELECTOR = "input:not([type=hidden]):not([disabled]),select:not([disabled]),textarea:not([disabled]),button:not([disabled]),a[href],iframe,[tabindex]";
-axs.utils.LABELABLE_ELEMENTS_SELECTOR = "button,input:not([type=hidden]),keygen,meter,output,progress,select,textarea";
-axs.utils.elementIsTransparent = function(a) {
-  return "0" == a.style.opacity;
-};
-axs.utils.elementHasZeroArea = function(a) {
-  a = a.getBoundingClientRect();
-  var b = a.top - a.bottom;
-  return a.right - a.left && b ? !1 : !0;
-};
-axs.utils.elementIsOutsideScrollArea = function(a) {
-  for (var b = axs.dom.parentElement(a), c = a.ownerDocument.defaultView;b != c.document.body;) {
-    if (axs.utils.isClippedBy(a, b)) {
-      return !0;
-    }
-    if (axs.utils.canScrollTo(a, b) && !axs.utils.elementIsOutsideScrollArea(b)) {
-      return !1;
-    }
-    b = axs.dom.parentElement(b);
-  }
-  return !axs.utils.canScrollTo(a, c.document.body);
-};
-axs.utils.canScrollTo = function(a, b) {
-  var c = a.getBoundingClientRect(), d = b.getBoundingClientRect();
-  if (b == b.ownerDocument.body) {
-    var e = d.top, f = d.left
-  } else {
-    e = d.top - b.scrollTop, f = d.left - b.scrollLeft;
-  }
-  var g = e + b.scrollHeight, h = f + b.scrollWidth;
-  if (c.right < f || c.bottom < e || c.left > h || c.top > g) {
-    return !1;
-  }
-  e = a.ownerDocument.defaultView;
-  f = e.getComputedStyle(b);
-  return c.left > d.right || c.top > d.bottom ? "scroll" == f.overflow || "auto" == f.overflow || b instanceof e.HTMLBodyElement : !0;
-};
-axs.utils.isClippedBy = function(a, b) {
-  var c = a.getBoundingClientRect(), d = b.getBoundingClientRect(), e = d.top - b.scrollTop, f = d.left - b.scrollLeft, g = a.ownerDocument.defaultView.getComputedStyle(b);
-  return (c.right < d.left || c.bottom < d.top || c.left > d.right || c.top > d.bottom) && "hidden" == g.overflow ? !0 : c.right < f || c.bottom < e ? "visible" != g.overflow : !1;
-};
-axs.utils.isAncestor = function(a, b) {
-  if (null == b) {
-    return !1;
-  }
-  if (b === a) {
-    return !0;
-  }
-  var c = axs.dom.composedParentNode(b);
-  return axs.utils.isAncestor(a, c);
-};
-axs.utils.overlappingElements = function(a) {
-  if (axs.utils.elementHasZeroArea(a)) {
-    return null;
-  }
-  for (var b = [], c = a.getClientRects(), d = 0;d < c.length;d++) {
-    var e = c[d], e = document.elementFromPoint((e.left + e.right) / 2, (e.top + e.bottom) / 2);
-    if (null != e && e != a && !axs.utils.isAncestor(e, a) && !axs.utils.isAncestor(a, e)) {
-      var f = window.getComputedStyle(e, null);
-      f && (f = axs.utils.getBgColor(f, e)) && 0 < f.alpha && 0 > b.indexOf(e) && b.push(e);
-    }
-  }
-  return b;
-};
-axs.utils.elementIsHtmlControl = function(a) {
-  var b = a.ownerDocument.defaultView;
-  return a instanceof b.HTMLButtonElement || a instanceof b.HTMLInputElement || a instanceof b.HTMLSelectElement || a instanceof b.HTMLTextAreaElement ? !0 : !1;
-};
-axs.utils.elementIsAriaWidget = function(a) {
-  return a.hasAttribute("role") && (a = a.getAttribute("role")) && (a = axs.constants.ARIA_ROLES[a]) && "widget" in a.allParentRolesSet ? !0 : !1;
-};
-axs.utils.elementIsVisible = function(a) {
-  return axs.utils.elementIsTransparent(a) || axs.utils.elementHasZeroArea(a) || axs.utils.elementIsOutsideScrollArea(a) || axs.utils.overlappingElements(a).length ? !1 : !0;
-};
-axs.utils.isLargeFont = function(a) {
-  var b = a.fontSize;
-  a = "bold" == a.fontWeight;
-  var c = b.match(/(\d+)px/);
-  if (c) {
-    b = parseInt(c[1], 10);
-    if (c = window.getComputedStyle(document.body, null).fontSize.match(/(\d+)px/)) {
-      var d = parseInt(c[1], 10), c = 1.2 * d, d = 1.5 * d
-    } else {
-      c = 19.2, d = 24;
-    }
-    return a && b >= c || b >= d;
-  }
-  if (c = b.match(/(\d+)em/)) {
-    return b = parseInt(c[1], 10), a && 1.2 <= b || 1.5 <= b ? !0 : !1;
-  }
-  if (c = b.match(/(\d+)%/)) {
-    return b = parseInt(c[1], 10), a && 120 <= b || 150 <= b ? !0 : !1;
-  }
-  if (c = b.match(/(\d+)pt/)) {
-    if (b = parseInt(c[1], 10), a && 14 <= b || 18 <= b) {
-      return !0;
-    }
-  }
-  return !1;
-};
-axs.utils.getBgColor = function(a, b) {
-  var c = axs.color.parseColor(a.backgroundColor);
-  if (!c) {
-    return null;
-  }
-  1 > a.opacity && (c.alpha *= a.opacity);
-  if (1 > c.alpha) {
-    var d = axs.utils.getParentBgColor(b);
-    if (null == d) {
-      return null;
-    }
-    c = axs.color.flattenColors(c, d);
-  }
-  return c;
-};
-axs.utils.getParentBgColor = function(a) {
-  var b = a;
-  a = [];
-  for (var c = null;b = axs.dom.parentElement(b);) {
-    var d = window.getComputedStyle(b, null);
-    if (d) {
-      var e = axs.color.parseColor(d.backgroundColor);
-      if (e && (1 > d.opacity && (e.alpha *= d.opacity), 0 != e.alpha && (a.push(e), 1 == e.alpha))) {
-        c = !0;
-        break;
-      }
-    }
-  }
-  c || a.push(new axs.color.Color(255, 255, 255, 1));
-  for (b = a.pop();a.length;) {
-    c = a.pop(), b = axs.color.flattenColors(c, b);
-  }
-  return b;
-};
-axs.utils.getFgColor = function(a, b, c) {
-  var d = axs.color.parseColor(a.color);
-  if (!d) {
-    return null;
-  }
-  1 > d.alpha && (d = axs.color.flattenColors(d, c));
-  1 > a.opacity && (b = axs.utils.getParentBgColor(b), d.alpha *= a.opacity, d = axs.color.flattenColors(d, b));
-  return d;
-};
-axs.utils.getContrastRatioForElement = function(a) {
-  var b = window.getComputedStyle(a, null);
-  return axs.utils.getContrastRatioForElementWithComputedStyle(b, a);
-};
-axs.utils.getContrastRatioForElementWithComputedStyle = function(a, b) {
-  if (axs.utils.isElementHidden(b)) {
-    return null;
-  }
-  var c = axs.utils.getBgColor(a, b);
-  if (!c) {
-    return null;
-  }
-  var d = axs.utils.getFgColor(a, b, c);
-  return d ? axs.color.calculateContrastRatio(d, c) : null;
-};
-axs.utils.isNativeTextElement = function(a) {
-  var b = a.tagName.toLowerCase();
-  a = a.type ? a.type.toLowerCase() : "";
-  if ("textarea" == b) {
-    return !0;
-  }
-  if ("input" != b) {
-    return !1;
-  }
-  switch(a) {
-    case "email":
-    ;
-    case "number":
-    ;
-    case "password":
-    ;
-    case "search":
-    ;
-    case "text":
-    ;
-    case "tel":
-    ;
-    case "url":
-    ;
-    case "":
-      return !0;
-    default:
-      return !1;
-  }
-};
-axs.utils.isLowContrast = function(a, b, c) {
-  a = Math.round(10 * a) / 10;
-  return c ? 4.5 > a || !axs.utils.isLargeFont(b) && 7 > a : 3 > a || !axs.utils.isLargeFont(b) && 4.5 > a;
-};
-axs.utils.hasLabel = function(a) {
-  var b = a.tagName.toLowerCase(), c = a.type ? a.type.toLowerCase() : "";
-  if (a.hasAttribute("aria-label") || a.hasAttribute("title") || "img" == b && a.hasAttribute("alt") || "input" == b && "image" == c && a.hasAttribute("alt") || "input" == b && ("submit" == c || "reset" == c) || a.hasAttribute("aria-labelledby") || a.hasAttribute("id") && 0 < document.querySelectorAll('label[for="' + a.id + '"]').length) {
-    return !0;
-  }
-  for (b = axs.dom.parentElement(a);b;) {
-    if ("label" == b.tagName.toLowerCase() && b.control == a) {
-      return !0;
-    }
-    b = axs.dom.parentElement(b);
-  }
-  return !1;
-};
-axs.utils.isNativelyDisableable = function(a) {
-  return a.tagName.toUpperCase() in axs.constants.NATIVELY_DISABLEABLE;
-};
-axs.utils.isElementDisabled = function(a, b) {
-  if (axs.browserUtils.matchSelector(a, b ? "[aria-disabled=true]" : "[aria-disabled=true], [aria-disabled=true] *")) {
-    return !0;
-  }
-  if (!axs.utils.isNativelyDisableable(a) || axs.browserUtils.matchSelector(a, "fieldset>legend:first-of-type *")) {
-    return !1;
-  }
-  for (var c = a;null !== c;c = axs.dom.parentElement(c)) {
-    if (c.hasAttribute("disabled")) {
-      return !0;
-    }
-    if (b) {
-      break;
-    }
-  }
-  return !1;
-};
-axs.utils.isElementHidden = function(a) {
-  if (!(a instanceof a.ownerDocument.defaultView.HTMLElement)) {
-    return !1;
-  }
-  if (a.hasAttribute("chromevoxignoreariahidden")) {
-    var b = !0
-  }
-  var c = window.getComputedStyle(a, null);
-  return "none" == c.display || "hidden" == c.visibility ? !0 : a.hasAttribute("aria-hidden") && "true" == a.getAttribute("aria-hidden").toLowerCase() ? !b : !1;
-};
-axs.utils.isElementOrAncestorHidden = function(a) {
-  return axs.utils.isElementHidden(a) ? !0 : axs.dom.parentElement(a) ? axs.utils.isElementOrAncestorHidden(axs.dom.parentElement(a)) : !1;
-};
-axs.utils.isInlineElement = function(a) {
-  a = a.tagName.toUpperCase();
-  return axs.constants.InlineElements[a];
-};
-axs.utils.getRoles = function(a, b) {
-  if (!a || a.nodeType !== Node.ELEMENT_NODE || !a.hasAttribute("role") && !b) {
-    return null;
-  }
-  var c = a.getAttribute("role");
-  !c && b && (c = axs.properties.getImplicitRole(a));
-  if (!c) {
-    return null;
-  }
-  for (var c = c.split(" "), d = {roles:[], valid:!1}, e = 0;e < c.length;e++) {
-    var f = c[e], g = axs.constants.ARIA_ROLES[f], f = {name:f};
-    g && !g["abstract"] ? (f.details = g, d.applied || (d.applied = f), f.valid = d.valid = !0) : f.valid = !1;
-    d.roles.push(f);
-  }
-  return d;
-};
-axs.utils.getAriaPropertyValue = function(a, b, c) {
-  var d = a.replace(/^aria-/, ""), e = axs.constants.ARIA_PROPERTIES[d], d = {name:a, rawValue:b};
-  if (!e) {
-    return d.valid = !1, d.reason = '"' + a + '" is not a valid ARIA property', d;
-  }
-  e = e.valueType;
-  if (!e) {
-    return d.valid = !1, d.reason = '"' + a + '" is not a valid ARIA property', d;
-  }
-  switch(e) {
-    case "idref":
-      a = axs.utils.isValidIDRefValue(b, c), d.valid = a.valid, d.reason = a.reason, d.idref = a.idref;
-    case "idref_list":
-      a = b.split(/\s+/);
-      d.valid = !0;
-      for (b = 0;b < a.length;b++) {
-        e = axs.utils.isValidIDRefValue(a[b], c), e.valid || (d.valid = !1), d.values ? d.values.push(e) : d.values = [e];
-      }
-      return d;
-    case "integer":
-      c = axs.utils.isValidNumber(b);
-      if (!c.valid) {
-        return d.valid = !1, d.reason = c.reason, d;
-      }
-      Math.floor(c.value) !== c.value ? (d.valid = !1, d.reason = "" + b + " is not a whole integer") : (d.valid = !0, d.value = c.value);
-      return d;
-    case "decimal":
-    ;
-    case "number":
-      c = axs.utils.isValidNumber(b);
-      d.valid = c.valid;
-      if (!c.valid) {
-        return d.reason = c.reason, d;
-      }
-      d.value = c.value;
-      return d;
-    case "string":
-      return d.valid = !0, d.value = b, d;
-    case "token":
-      return c = axs.utils.isValidTokenValue(a, b.toLowerCase()), c.valid ? (d.valid = !0, d.value = c.value) : (d.valid = !1, d.value = b, d.reason = c.reason), d;
-    case "token_list":
-      e = b.split(/\s+/);
-      d.valid = !0;
-      for (b = 0;b < e.length;b++) {
-        c = axs.utils.isValidTokenValue(a, e[b].toLowerCase()), c.valid || (d.valid = !1, d.reason ? (d.reason = [d.reason], d.reason.push(c.reason)) : (d.reason = c.reason, d.possibleValues = c.possibleValues)), d.values ? d.values.push(c.value) : d.values = [c.value];
-      }
-      return d;
-    case "tristate":
-      return c = axs.utils.isPossibleValue(b.toLowerCase(), axs.constants.MIXED_VALUES, a), c.valid ? (d.valid = !0, d.value = c.value) : (d.valid = !1, d.value = b, d.reason = c.reason), d;
-    case "boolean":
-      return c = axs.utils.isValidBoolean(b), c.valid ? (d.valid = !0, d.value = c.value) : (d.valid = !1, d.value = b, d.reason = c.reason), d;
-  }
-  d.valid = !1;
-  d.reason = "Not a valid ARIA property";
-  return d;
-};
-axs.utils.isValidTokenValue = function(a, b) {
-  var c = a.replace(/^aria-/, "");
-  return axs.utils.isPossibleValue(b, axs.constants.ARIA_PROPERTIES[c].valuesSet, a);
-};
-axs.utils.isPossibleValue = function(a, b, c) {
-  return b[a] ? {valid:!0, value:a} : {valid:!1, value:a, reason:'"' + a + '" is not a valid value for ' + c, possibleValues:Object.keys(b)};
-};
-axs.utils.isValidBoolean = function(a) {
-  try {
-    var b = JSON.parse(a);
-  } catch (c) {
-    b = "";
-  }
-  return "boolean" != typeof b ? {valid:!1, value:a, reason:'"' + a + '" is not a true/false value'} : {valid:!0, value:b};
-};
-axs.utils.isValidIDRefValue = function(a, b) {
-  return 0 == a.length ? {valid:!0, idref:a} : b.ownerDocument.getElementById(a) ? {valid:!0, idref:a} : {valid:!1, idref:a, reason:'No element with ID "' + a + '"'};
-};
-axs.utils.isValidNumber = function(a) {
-  var b = {valid:!1, value:a, reason:'"' + a + '" is not a number'};
-  if (!a) {
-    return b;
-  }
-  if (/^0x/i.test(a)) {
-    return b.reason = '"' + a + '" is not a decimal number', b;
-  }
-  a *= 1;
-  return isFinite(a) ? {valid:!0, value:a} : b;
-};
-axs.utils.isElementImplicitlyFocusable = function(a) {
-  var b = a.ownerDocument.defaultView;
-  return a instanceof b.HTMLAnchorElement || a instanceof b.HTMLAreaElement ? a.hasAttribute("href") : a instanceof b.HTMLInputElement || a instanceof b.HTMLSelectElement || a instanceof b.HTMLTextAreaElement || a instanceof b.HTMLButtonElement || a instanceof b.HTMLIFrameElement ? !a.disabled : !1;
-};
-axs.utils.values = function(a) {
-  var b = [], c;
-  for (c in a) {
-    a.hasOwnProperty(c) && "function" != typeof a[c] && b.push(a[c]);
-  }
-  return b;
-};
-axs.utils.namedValues = function(a) {
-  var b = {}, c;
-  for (c in a) {
-    a.hasOwnProperty(c) && "function" != typeof a[c] && (b[c] = a[c]);
-  }
-  return b;
-};
-function escapeId(a) {
-  return a.replace(/[^a-zA-Z0-9_-]/g, function(a) {
-    return "\\" + a;
-  });
-}
-axs.utils.getQuerySelectorText = function(a) {
-  if (null == a || "HTML" == a.tagName) {
-    return "html";
-  }
-  if ("BODY" == a.tagName) {
-    return "body";
-  }
-  if (a.hasAttribute) {
-    if (a.id) {
-      return "#" + escapeId(a.id);
-    }
-    if (a.className) {
-      for (var b = "", c = 0;c < a.classList.length;c++) {
-        b += "." + a.classList[c];
-      }
-      var d = 0;
-      if (a.parentNode) {
-        for (c = 0;c < a.parentNode.children.length;c++) {
-          var e = a.parentNode.children[c];
-          axs.browserUtils.matchSelector(e, b) && d++;
-          if (e === a) {
-            break;
-          }
-        }
-      } else {
-        d = 1;
-      }
-      if (1 == d) {
-        return axs.utils.getQuerySelectorText(a.parentNode) + " > " + b;
-      }
-    }
-    if (a.parentNode) {
-      b = a.parentNode.children;
-      d = 1;
-      for (c = 0;b[c] !== a;) {
-        b[c].tagName == a.tagName && d++, c++;
-      }
-      c = "";
-      "BODY" != a.parentNode.tagName && (c = axs.utils.getQuerySelectorText(a.parentNode) + " > ");
-      return 1 == d ? c + a.tagName : c + a.tagName + ":nth-of-type(" + d + ")";
-    }
-  } else {
-    if (a.selectorText) {
-      return a.selectorText;
-    }
-  }
-  return "";
-};
-axs.utils.getAriaIdReferrers = function(a, b) {
-  var c = function(a) {
-    var b = axs.constants.ARIA_PROPERTIES[a];
-    if (b) {
-      if ("idref" === b.valueType) {
-        return "[aria-" + a + "='" + d + "']";
-      }
-      if ("idref_list" === b.valueType) {
-        return "[aria-" + a + "~='" + d + "']";
-      }
-    }
-    return "";
-  };
-  if (!a) {
-    return null;
-  }
-  var d = a.id;
-  if (!d) {
-    return null;
-  }
-  d = d.replace(/'/g, "\\'");
-  if (b) {
-    var e = b.replace(/^aria-/, ""), f = c(e);
-    if (f) {
-      return a.ownerDocument.querySelectorAll(f);
-    }
-  } else {
-    var g = [];
-    for (e in axs.constants.ARIA_PROPERTIES) {
-      (f = c(e)) && g.push(f);
-    }
-    return a.ownerDocument.querySelectorAll(g.join(","));
-  }
-  return null;
-};
-axs.utils.getHtmlIdReferrers = function(a) {
-  if (!a) {
-    return null;
-  }
-  var b = a.id;
-  if (!b) {
-    return null;
-  }
-  var b = b.replace(/'/g, "\\'"), c = "[contextmenu='{id}'] [itemref~='{id}'] button[form='{id}'] button[menu='{id}'] fieldset[form='{id}'] input[form='{id}'] input[list='{id}'] keygen[form='{id}'] label[for='{id}'] label[form='{id}'] menuitem[command='{id}'] object[form='{id}'] output[for~='{id}'] output[form='{id}'] select[form='{id}'] td[headers~='{id}'] textarea[form='{id}'] tr[headers~='{id}']".split(" ").map(function(a) {
-    return a.replace("{id}", b);
-  });
-  return a.ownerDocument.querySelectorAll(c.join(","));
-};
-axs.utils.getReferencedIds = function(a) {
-  for (var b = [], c = function(a) {
-    a && (0 < a.indexOf(" ") ? b = b.concat(f.value.split(" ")) : b.push(a));
-  }, d = 0;d < a.attributes.length;d++) {
-    var e = a.tagName.toLowerCase(), f = a.attributes[d];
-    if (f.specified) {
-      var g = f.name, h = g.match(/aria-(.+)/);
-      if (h) {
-        e = axs.constants.ARIA_PROPERTIES[h[1]], !e || "idref" !== e.valueType && "idref_list" !== e.valueType || c(f.value);
-      } else {
-        switch(g) {
-          case "contextmenu":
-          ;
-          case "itemref":
-            c(f.value);
-            break;
-          case "form":
-            "button" != e && "fieldset" != e && "input" != e && "keygen" != e && "label" != e && "object" != e && "output" != e && "select" != e && "textarea" != e || c(f.value);
-            break;
-          case "for":
-            "label" != e && "output" != e || c(f.value);
-            break;
-          case "menu":
-            "button" == e && c(f.value);
-            break;
-          case "list":
-            "input" == e && c(f.value);
-            break;
-          case "command":
-            "menuitem" == e && c(f.value);
-            break;
-          case "headers":
-            "td" != e && "tr" != e || c(f.value);
-        }
-      }
-    }
-  }
-  return b;
-};
-axs.utils.getIdReferrers = function(a) {
-  var b = [], c = axs.utils.getHtmlIdReferrers(a);
-  c && (b = b.concat(Array.prototype.slice.call(c)));
-  (c = axs.utils.getAriaIdReferrers(a)) && (b = b.concat(Array.prototype.slice.call(c)));
-  return b;
-};
-axs.utils.getIdReferents = function(a, b) {
-  var c = [], d = a.replace(/^aria-/, ""), d = axs.constants.ARIA_PROPERTIES[d];
-  if (!d || !b.hasAttribute(a)) {
-    return c;
-  }
-  d = d.valueType;
-  if ("idref_list" === d || "idref" === d) {
-    for (var d = b.ownerDocument, e = b.getAttribute(a), e = e.split(/\s+/), f = 0, g = e.length;f < g;f++) {
-      var h = d.getElementById(e[f]);
-      h && (c[c.length] = h);
-    }
-  }
-  return c;
-};
-axs.utils.getAriaPropertiesByValueType = function(a) {
-  var b = {}, c;
-  for (c in axs.constants.ARIA_PROPERTIES) {
-    var d = axs.constants.ARIA_PROPERTIES[c];
-    d && 0 <= a.indexOf(d.valueType) && (b[c] = d);
-  }
-  return b;
-};
-axs.utils.getSelectorForAriaProperties = function(a) {
-  a = Object.keys(a).map(function(a) {
-    return "[aria-" + a + "]";
-  });
-  a.sort();
-  return a.join(",");
-};
-axs.utils.findDescendantsWithRole = function(a, b) {
-  if (!a || !b) {
-    return [];
-  }
-  var c = axs.properties.getSelectorForRole(b);
-  if (c && (c = a.querySelectorAll(c))) {
-    c = Array.prototype.map.call(c, function(a) {
-      return a;
-    });
-  } else {
-    return [];
-  }
-  return c;
-};
-axs.properties = {};
-axs.properties.TEXT_CONTENT_XPATH = './/text()[normalize-space(.)!=""]/parent::*[name()!="script"]';
-axs.properties.getFocusProperties = function(a) {
-  var b = {}, c = a.getAttribute("tabindex");
-  void 0 != c ? b.tabindex = {value:c, valid:!0} : axs.utils.isElementImplicitlyFocusable(a) && (b.implicitlyFocusable = {value:!0, valid:!0});
-  if (0 == Object.keys(b).length) {
-    return null;
-  }
-  var d = axs.utils.elementIsTransparent(a), e = axs.utils.elementHasZeroArea(a), f = axs.utils.elementIsOutsideScrollArea(a), g = axs.utils.overlappingElements(a);
-  if (d || e || f || 0 < g.length) {
-    var c = axs.utils.isElementOrAncestorHidden(a), h = {value:!1, valid:c};
-    d && (h.transparent = !0);
-    e && (h.zeroArea = !0);
-    f && (h.outsideScrollArea = !0);
-    g && 0 < g.length && (h.overlappingElements = g);
-    d = {value:c, valid:c};
-    c && (d.reason = axs.properties.getHiddenReason(a));
-    h.hidden = d;
-    b.visible = h;
-  } else {
-    b.visible = {value:!0, valid:!0};
-  }
-  return b;
-};
-axs.properties.getHiddenReason = function(a) {
-  if (!(a && a instanceof a.ownerDocument.defaultView.HTMLElement)) {
-    return null;
-  }
-  if (a.hasAttribute("chromevoxignoreariahidden")) {
-    var b = !0
-  }
-  var c = window.getComputedStyle(a, null);
-  return "none" == c.display ? {property:"display: none", on:a} : "hidden" == c.visibility ? {property:"visibility: hidden", on:a} : a.hasAttribute("aria-hidden") && "true" == a.getAttribute("aria-hidden").toLowerCase() && !b ? {property:"aria-hidden", on:a} : axs.properties.getHiddenReason(axs.dom.parentElement(a));
-};
-axs.properties.getColorProperties = function(a) {
-  var b = {};
-  (a = axs.properties.getContrastRatioProperties(a)) && (b.contrastRatio = a);
-  return 0 == Object.keys(b).length ? null : b;
-};
-axs.properties.hasDirectTextDescendant = function(a) {
-  function b() {
-    for (var b = c.evaluate(axs.properties.TEXT_CONTENT_XPATH, a, null, XPathResult.ANY_TYPE, null), e = b.iterateNext();null != e;e = b.iterateNext()) {
-      if (e === a) {
-        return !0;
-      }
-    }
-    return !1;
-  }
-  var c;
-  c = a.nodeType == Node.DOCUMENT_NODE ? a : a.ownerDocument;
-  return c.evaluate ? b() : function() {
-    for (var b = c.createTreeWalker(a, NodeFilter.SHOW_TEXT, null, !1);b.nextNode();) {
-      var e = b.currentNode, f = e.parentNode.tagName.toLowerCase();
-      if (e.nodeValue.trim() && "script" !== f && a !== e) {
-        return !0;
-      }
-    }
-    return !1;
-  }();
-};
-axs.properties.getContrastRatioProperties = function(a) {
-  if (!axs.properties.hasDirectTextDescendant(a)) {
-    return null;
-  }
-  var b = {}, c = window.getComputedStyle(a, null), d = axs.utils.getBgColor(c, a);
-  if (!d) {
-    return null;
-  }
-  b.backgroundColor = axs.color.colorToString(d);
-  var e = axs.utils.getFgColor(c, a, d);
-  b.foregroundColor = axs.color.colorToString(e);
-  a = axs.utils.getContrastRatioForElementWithComputedStyle(c, a);
-  if (!a) {
-    return null;
-  }
-  b.value = a.toFixed(2);
-  axs.utils.isLowContrast(a, c) && (b.alert = !0);
-  var f = axs.utils.isLargeFont(c) ? 3 : 4.5, c = axs.utils.isLargeFont(c) ? 4.5 : 7, g = {};
-  f > a && (g.AA = f);
-  c > a && (g.AAA = c);
-  if (!Object.keys(g).length) {
-    return b;
-  }
-  (d = axs.color.suggestColors(d, e, g)) && Object.keys(d).length && (b.suggestedColors = d);
-  return b;
-};
-axs.properties.findTextAlternatives = function(a, b, c, d) {
-  var e = c || !1;
-  c = axs.dom.asElement(a);
-  if (!c || !d && axs.utils.isElementOrAncestorHidden(c)) {
-    return null;
-  }
-  if (a.nodeType == Node.TEXT_NODE) {
-    return c = {type:"text"}, c.text = a.textContent, c.lastWord = axs.properties.getLastWord(c.text), b.content = c, a.textContent;
-  }
-  a = null;
-  e || (a = axs.properties.getTextFromAriaLabelledby(c, b));
-  if (c.hasAttribute("aria-label")) {
-    var f = {type:"text"};
-    f.text = c.getAttribute("aria-label");
-    f.lastWord = axs.properties.getLastWord(f.text);
-    a ? f.unused = !0 : e && axs.utils.elementIsHtmlControl(c) || (a = f.text);
-    b.ariaLabel = f;
-  }
-  c.hasAttribute("role") && "presentation" == c.getAttribute("role") || (a = axs.properties.getTextFromHostLanguageAttributes(c, b, a, e));
-  e && axs.utils.elementIsHtmlControl(c) && (f = c.ownerDocument.defaultView, c instanceof f.HTMLInputElement && ("text" == c.type && c.value && 0 < c.value.length && (b.controlValue = {text:c.value}), "range" == c.type && (b.controlValue = {text:c.value})), c instanceof f.HTMLSelectElement && (b.controlValue = {text:c.value}), b.controlValue && (f = b.controlValue, a ? f.unused = !0 : a = f.text));
-  if (e && axs.utils.elementIsAriaWidget(c)) {
-    e = c.getAttribute("role");
-    "textbox" == e && c.textContent && 0 < c.textContent.length && (b.controlValue = {text:c.textContent});
-    if ("slider" == e || "spinbutton" == e) {
-      c.hasAttribute("aria-valuetext") ? b.controlValue = {text:c.getAttribute("aria-valuetext")} : c.hasAttribute("aria-valuenow") && (b.controlValue = {value:c.getAttribute("aria-valuenow"), text:"" + c.getAttribute("aria-valuenow")});
-    }
-    if ("menu" == e) {
-      for (var g = c.querySelectorAll("[role=menuitemcheckbox], [role=menuitemradio]"), f = [], h = 0;h < g.length;h++) {
-        "true" == g[h].getAttribute("aria-checked") && f.push(g[h]);
-      }
-      if (0 < f.length) {
-        g = "";
-        for (h = 0;h < f.length;h++) {
-          g += axs.properties.findTextAlternatives(f[h], {}, !0), h < f.length - 1 && (g += ", ");
-        }
-        b.controlValue = {text:g};
-      }
-    }
-    if ("combobox" == e || "select" == e) {
-      b.controlValue = {text:"TODO"};
-    }
-    b.controlValue && (f = b.controlValue, a ? f.unused = !0 : a = f.text);
-  }
-  f = !0;
-  c.hasAttribute("role") && (e = c.getAttribute("role"), (e = axs.constants.ARIA_ROLES[e]) && (!e.namefrom || 0 > e.namefrom.indexOf("contents")) && (f = !1));
-  (d = axs.properties.getTextFromDescendantContent(c, d)) && f && (e = {type:"text"}, e.text = d, e.lastWord = axs.properties.getLastWord(e.text), a ? e.unused = !0 : a = d, b.content = e);
-  c.hasAttribute("title") && (d = {type:"string", valid:!0}, d.text = c.getAttribute("title"), d.lastWord = axs.properties.getLastWord(d.lastWord), a ? d.unused = !0 : a = d.text, b.title = d);
-  return 0 == Object.keys(b).length && null == a ? null : a;
-};
-axs.properties.getTextFromDescendantContent = function(a, b) {
-  for (var c = a.childNodes, d = [], e = 0;e < c.length;e++) {
-    var f = axs.properties.findTextAlternatives(c[e], {}, !0, b);
-    f && d.push(f.trim());
-  }
-  if (d.length) {
-    c = "";
-    for (e = 0;e < d.length;e++) {
-      c = [c, d[e]].join(" ").trim();
-    }
-    return c;
-  }
-  return null;
-};
-axs.properties.getTextFromAriaLabelledby = function(a, b) {
-  var c = null;
-  if (!a.hasAttribute("aria-labelledby")) {
-    return c;
-  }
-  for (var d = a.getAttribute("aria-labelledby").split(/\s+/), e = {valid:!0}, f = [], g = [], h = 0;h < d.length;h++) {
-    var k = {type:"element"}, m = d[h];
-    k.value = m;
-    var l = document.getElementById(m);
-    l ? (k.valid = !0, k.text = axs.properties.findTextAlternatives(l, {}, !0, !0), k.lastWord = axs.properties.getLastWord(k.text), f.push(k.text), k.element = l) : (k.valid = !1, e.valid = !1, k.errorMessage = {messageKey:"noElementWithId", args:[m]});
-    g.push(k);
-  }
-  0 < g.length && (g[g.length - 1].last = !0, e.values = g, e.text = f.join(" "), e.lastWord = axs.properties.getLastWord(e.text), c = e.text, b.ariaLabelledby = e);
-  return c;
-};
-axs.properties.getTextFromHostLanguageAttributes = function(a, b, c, d) {
-  if (axs.browserUtils.matchSelector(a, "img") && a.hasAttribute("alt")) {
-    var e = {type:"string", valid:!0};
-    e.text = a.getAttribute("alt");
-    c ? e.unused = !0 : c = e.text;
-    b.alt = e;
-  }
-  if (axs.browserUtils.matchSelector(a, 'input:not([type="hidden"]):not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), video:not([disabled])') && !d) {
-    if (a.hasAttribute("id")) {
-      d = document.querySelectorAll('label[for="' + a.id + '"]');
-      for (var e = {}, f = [], g = [], h = 0;h < d.length;h++) {
-        var k = {type:"element"}, m = d[h], l = axs.properties.findTextAlternatives(m, {}, !0);
-        l && 0 < l.trim().length && (k.text = l.trim(), g.push(l.trim()));
-        k.element = m;
-        f.push(k);
-      }
-      0 < f.length && (f[f.length - 1].last = !0, e.values = f, e.text = g.join(" "), e.lastWord = axs.properties.getLastWord(e.text), c ? e.unused = !0 : c = e.text, b.labelFor = e);
-    }
-    d = axs.dom.parentElement(a);
-    for (e = {};d;) {
-      if ("label" == d.tagName.toLowerCase() && (f = d, f.control == a)) {
-        e.type = "element";
-        e.text = axs.properties.findTextAlternatives(f, {}, !0);
-        e.lastWord = axs.properties.getLastWord(e.text);
-        e.element = f;
-        break;
-      }
-      d = axs.dom.parentElement(d);
-    }
-    e.text && (c ? e.unused = !0 : c = e.text, b.labelWrapped = e);
-    axs.browserUtils.matchSelector(a, 'input[type="image"]') && a.hasAttribute("alt") && (e = {type:"string", valid:!0}, e.text = a.getAttribute("alt"), c ? e.unused = !0 : c = e.text, b.alt = e);
-    Object.keys(b).length || (b.noLabel = !0);
-  }
-  return c;
-};
-axs.properties.getLastWord = function(a) {
-  if (!a) {
-    return null;
-  }
-  var b = a.lastIndexOf(" ") + 1, c = a.length - 10;
-  return a.substring(b > c ? b : c);
-};
-axs.properties.getTextProperties = function(a) {
-  var b = {}, c = axs.properties.findTextAlternatives(a, b, !1, !0);
-  if (0 == Object.keys(b).length && ((a = axs.dom.asElement(a)) && axs.browserUtils.matchSelector(a, "img") && (b.alt = {valid:!1, errorMessage:"No alt value provided"}, a = a.src, "string" == typeof a && (c = a.split("/").pop(), b.filename = {text:c})), !c)) {
-    return null;
-  }
-  b.hasProperties = !!Object.keys(b).length;
-  b.computedText = c;
-  b.lastWord = axs.properties.getLastWord(c);
-  return b;
-};
-axs.properties.getAriaProperties = function(a) {
-  var b = {}, c = axs.properties.getGlobalAriaProperties(a), d;
-  for (d in axs.constants.ARIA_PROPERTIES) {
-    var e = "aria-" + d;
-    if (a.hasAttribute(e)) {
-      var f = a.getAttribute(e);
-      c[e] = axs.utils.getAriaPropertyValue(e, f, a);
-    }
-  }
-  0 < Object.keys(c).length && (b.properties = axs.utils.values(c));
-  f = axs.utils.getRoles(a);
-  if (!f) {
-    return Object.keys(b).length ? b : null;
-  }
-  b.roles = f;
-  if (!f.valid || !f.roles) {
-    return b;
-  }
-  for (var e = f.roles, g = 0;g < e.length;g++) {
-    var h = e[g];
-    if (h.details && h.details.propertiesSet) {
-      for (d in h.details.propertiesSet) {
-        d in c || (a.hasAttribute(d) ? (f = a.getAttribute(d), c[d] = axs.utils.getAriaPropertyValue(d, f, a), "values" in c[d] && (f = c[d].values, f[f.length - 1].isLast = !0)) : h.details.requiredPropertiesSet[d] && (c[d] = {name:d, valid:!1, reason:"Required property not set"}));
-      }
-    }
-  }
-  0 < Object.keys(c).length && (b.properties = axs.utils.values(c));
-  return 0 < Object.keys(b).length ? b : null;
-};
-axs.properties.getGlobalAriaProperties = function(a) {
-  var b = {}, c;
-  for (c in axs.constants.GLOBAL_PROPERTIES) {
-    if (a.hasAttribute(c)) {
-      var d = a.getAttribute(c);
-      b[c] = axs.utils.getAriaPropertyValue(c, d, a);
-    }
-  }
-  return b;
-};
-axs.properties.getVideoProperties = function(a) {
-  if (!axs.browserUtils.matchSelector(a, "video")) {
-    return null;
-  }
-  var b = {};
-  b.captionTracks = axs.properties.getTrackElements(a, "captions");
-  b.descriptionTracks = axs.properties.getTrackElements(a, "descriptions");
-  b.chapterTracks = axs.properties.getTrackElements(a, "chapters");
-  return b;
-};
-axs.properties.getTrackElements = function(a, b) {
-  var c = a.querySelectorAll("track[kind=" + b + "]"), d = {};
-  if (!c.length) {
-    return d.valid = !1, d.reason = {messageKey:"noTracksProvided", args:[[b]]}, d;
-  }
-  d.valid = !0;
-  for (var e = [], f = 0;f < c.length;f++) {
-    var g = {}, h = c[f].getAttribute("src"), k = c[f].getAttribute("srcLang"), m = c[f].getAttribute("label");
-    h ? (g.valid = !0, g.src = h) : (g.valid = !1, g.reason = {messageKey:"noSrcProvided"});
-    h = "";
-    m && (h += m, k && (h += " "));
-    k && (h += "(" + k + ")");
-    "" == h && (h = "[[object Object]]");
-    g.name = h;
-    e.push(g);
-  }
-  d.values = e;
-  return d;
-};
-axs.properties.getAllProperties = function(a) {
-  var b = axs.dom.asElement(a);
-  if (!b) {
-    return {};
-  }
-  var c = {};
-  c.ariaProperties = axs.properties.getAriaProperties(b);
-  c.colorProperties = axs.properties.getColorProperties(b);
-  c.focusProperties = axs.properties.getFocusProperties(b);
-  c.textProperties = axs.properties.getTextProperties(a);
-  c.videoProperties = axs.properties.getVideoProperties(b);
-  return c;
-};
-(function() {
-  function a(a) {
-    if (!a) {
-      return null;
-    }
-    var c = a.tagName;
-    if (!c) {
-      return null;
-    }
-    c = c.toUpperCase();
-    c = axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO[c];
-    if (!c || !c.length) {
-      return null;
-    }
-    for (var d = null, e = 0, f = c.length;e < f;e++) {
-      var g = c[e];
-      if (g.selector) {
-        if (axs.browserUtils.matchSelector(a, g.selector)) {
-          return g;
-        }
-      } else {
-        d = g;
-      }
-    }
-    return d;
-  }
-  axs.properties.getImplicitRole = function(b) {
-    return (b = a(b)) ? b.role : "";
-  };
-  axs.properties.canTakeAriaAttributes = function(b) {
-    return (b = a(b)) ? !b.reserved : !0;
-  };
-})();
-axs.properties.getNativelySupportedAttributes = function(a) {
-  var b = [];
-  if (!a) {
-    return b;
-  }
-  a = a.cloneNode(!1);
-  for (var c = Object.keys(axs.constants.ARIA_TO_HTML_ATTRIBUTE), d = 0;d < c.length;d++) {
-    var e = c[d];
-    axs.constants.ARIA_TO_HTML_ATTRIBUTE[e] in a && (b[b.length] = e);
-  }
-  return b;
-};
-(function() {
-  var a = {};
-  axs.properties.getSelectorForRole = function(b) {
-    if (!b) {
-      return "";
-    }
-    if (a[b] && a.hasOwnProperty(b)) {
-      return a[b];
-    }
-    var c = ['[role="' + b + '"]'];
-    Object.keys(axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO).forEach(function(a) {
-      var e = axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO[a];
-      if (e && e.length) {
-        for (var f = 0;f < e.length;f++) {
-          var g = e[f];
-          if (g.role === b) {
-            if (g.selector) {
-              c[c.length] = g.selector;
-            } else {
-              c[c.length] = a;
-              break;
-            }
-          }
-        }
-      }
-    });
-    return a[b] = c.join(",");
-  };
-})();
-axs.AuditRule = function(a) {
-  for (var b = a.opt_requires || {}, c = !0, d = [], e = 0;e < axs.AuditRule.requiredFields.length;e++) {
-    var f = axs.AuditRule.requiredFields[e];
-    f in a || (c = !1, d.push(f));
-  }
-  if (!c) {
-    throw "Invalid spec; the following fields were not specified: " + d.join(", ") + "\n" + JSON.stringify(a);
-  }
-  this.name = a.name;
-  this.severity = a.severity;
-  this.relevantElementMatcher_ = a.relevantElementMatcher;
-  this.isRelevant_ = a.isRelevant || function(a, b) {
-    return !0;
-  };
-  this.test_ = a.test;
-  this.code = a.code;
-  this.heading = a.heading || "";
-  this.url = a.url || "";
-  this.requiresConsoleAPI = !!b.consoleAPI;
-  this.relevantElements = [];
-  this.relatedElements = [];
-  this.collectIdRefs = b.idRefs || !1;
-};
-axs.AuditRule.requiredFields = "name severity relevantElementMatcher test code heading".split(" ");
-axs.AuditRule.NOT_APPLICABLE = {result:axs.constants.AuditResult.NA};
-axs.AuditRule.prototype.addElement = function(a, b) {
-  a.push(b);
-};
-axs.AuditRule.prototype.collectMatchingElement = function(a, b) {
-  return this.relevantElementMatcher_(a, b) && b.inScope ? (this.relevantElements.push({element:a, flags:b}), !0) : !1;
-};
-axs.AuditRule.prototype.canRun = function(a) {
-  return this.disabled || !a.withConsoleApi && this.requiresConsoleAPI ? !1 : !0;
-};
-axs.AuditRule.Result = function(a, b) {
-  var c = axs.utils.namedValues(b);
-  c.severity = a.getSeverity(b.name) || c.severity;
-  this.rule = c;
-  this.maxResults = a.maxResults;
-  this.update(axs.constants.AuditResult.NA);
-};
-axs.AuditRule.Result.prototype.update = function(a, b) {
-  if (a === axs.constants.AuditResult.FAIL) {
-    var c = this.elements || (this.elements = []);
-    this.result = a;
-    this.maxResults && this.elements.length >= this.maxResults ? this.resultsTruncated = !0 : b && c.push(b);
-  } else {
-    a === axs.constants.AuditResult.PASS ? (this.elements || (this.elements = []), this.result !== axs.constants.AuditResult.FAIL && (this.result = a)) : this.result || (this.result = a);
-  }
-};
-axs.AuditRule.prototype.run = function(a) {
-  try {
-    for (var b = this._options || {}, c = new axs.AuditRule.Result(a, this), d;d = this.relevantElements.shift();) {
-      var e = d.element, f = d.flags;
-      this.isRelevant_(e, f) && (this.test_(e, f, b.config) ? c.update(axs.constants.AuditResult.FAIL, e) : c.update(axs.constants.AuditResult.PASS, e));
-    }
-    return c;
-  } finally {
-    this.relatedElements.length = 0;
-  }
-};
-axs.AuditRules = {};
-(function() {
-  var a = {}, b = {};
-  axs.AuditRules.specs = {};
-  axs.AuditRules.addRule = function(c) {
-    var d = new axs.AuditRule(c);
-    if (d.code in b) {
-      throw Error('Can not add audit rule with same code: "' + d.code + '"');
-    }
-    if (d.name in a) {
-      throw Error('Can not add audit rule with same name: "' + d.name + '"');
-    }
-    a[d.name] = b[d.code] = d;
-    axs.AuditRules.specs[c.name] = c;
-  };
-  axs.AuditRules.getRule = function(c) {
-    return a[c] || b[c] || null;
-  };
-  axs.AuditRules.getRules = function(b) {
-    var d = Object.keys(a);
-    return b ? d : d.map(function(a) {
-      return this.getRule(a);
-    }, axs.AuditRules);
-  };
-  axs.AuditRules.getActiveRules = function(a) {
-    var b;
-    b = a.auditRulesToRun && 0 < a.auditRulesToRun.length ? a.auditRulesToRun : axs.AuditRules.getRules(!0);
-    if (a.auditRulesToIgnore) {
-      for (var e = 0;e < a.auditRulesToIgnore.length;e++) {
-        var f = a.auditRulesToIgnore[e];
-        0 > b.indexOf(f) || b.splice(b.indexOf(f), 1);
-      }
-    }
-    return b.map(axs.AuditRules.getRule);
-  };
-})();
-axs.AuditResults = function() {
-  this.errors_ = [];
-  this.warnings_ = [];
-};
-goog.exportSymbol("axs.AuditResults", axs.AuditResults);
-axs.AuditResults.prototype.addError = function(a) {
-  "" != a && this.errors_.push(a);
-};
-goog.exportProperty(axs.AuditResults.prototype, "addError", axs.AuditResults.prototype.addError);
-axs.AuditResults.prototype.addWarning = function(a) {
-  "" != a && this.warnings_.push(a);
-};
-goog.exportProperty(axs.AuditResults.prototype, "addWarning", axs.AuditResults.prototype.addWarning);
-axs.AuditResults.prototype.numErrors = function() {
-  return this.errors_.length;
-};
-goog.exportProperty(axs.AuditResults.prototype, "numErrors", axs.AuditResults.prototype.numErrors);
-axs.AuditResults.prototype.numWarnings = function() {
-  return this.warnings_.length;
-};
-goog.exportProperty(axs.AuditResults.prototype, "numWarnings", axs.AuditResults.prototype.numWarnings);
-axs.AuditResults.prototype.getErrors = function() {
-  return this.errors_;
-};
-goog.exportProperty(axs.AuditResults.prototype, "getErrors", axs.AuditResults.prototype.getErrors);
-axs.AuditResults.prototype.getWarnings = function() {
-  return this.warnings_;
-};
-goog.exportProperty(axs.AuditResults.prototype, "getWarnings", axs.AuditResults.prototype.getWarnings);
-axs.AuditResults.prototype.toString = function() {
-  for (var a = "", b = 0;b < this.errors_.length;b++) {
-    0 == b && (a += "\nErrors:\n");
-    var c = this.errors_[b], a = a + (c + "\n\n");
-  }
-  for (b = 0;b < this.warnings_.length;b++) {
-    0 == b && (a += "\nWarnings:\n"), c = this.warnings_[b], a += c + "\n\n";
-  }
-  return a;
-};
-goog.exportProperty(axs.AuditResults.prototype, "toString", axs.AuditResults.prototype.toString);
-axs.Audit = {};
-axs.AuditConfiguration = function(a) {
-  null == a && (a = {});
-  this.rules_ = {};
-  this.maxResults = this.auditRulesToIgnore = this.auditRulesToRun = this.scope = null;
-  this.withConsoleApi = !1;
-  this.showUnsupportedRulesWarning = this.walkDom = !0;
-  for (var b in this) {
-    this.hasOwnProperty(b) && b in a && (this[b] = a[b]);
-  }
-  goog.exportProperty(this, "scope", this.scope);
-  goog.exportProperty(this, "auditRulesToRun", this.auditRulesToRun);
-  goog.exportProperty(this, "auditRulesToIgnore", this.auditRulesToIgnore);
-  goog.exportProperty(this, "withConsoleApi", this.withConsoleApi);
-  goog.exportProperty(this, "walkDom", this.walkDom);
-  goog.exportProperty(this, "showUnsupportedRulesWarning", this.showUnsupportedRulesWarning);
-};
-goog.exportSymbol("axs.AuditConfiguration", axs.AuditConfiguration);
-axs.AuditConfiguration.prototype = {ignoreSelectors:function(a, b) {
-  a in this.rules_ || (this.rules_[a] = {});
-  "ignore" in this.rules_[a] || (this.rules_[a].ignore = []);
-  Array.prototype.push.call(this.rules_[a].ignore, b);
-}, getIgnoreSelectors:function(a) {
-  return a in this.rules_ && "ignore" in this.rules_[a] ? this.rules_[a].ignore : [];
-}, setSeverity:function(a, b) {
-  a in this.rules_ || (this.rules_[a] = {});
-  this.rules_[a].severity = b;
-}, getSeverity:function(a) {
-  return a in this.rules_ && "severity" in this.rules_[a] ? this.rules_[a].severity : null;
-}, setRuleConfig:function(a, b) {
-  a in this.rules_ || (this.rules_[a] = {});
-  this.rules_[a].config = b;
-}, getRuleConfig:function(a) {
-  return a in this.rules_ && "config" in this.rules_[a] ? this.rules_[a].config : null;
-}};
-goog.exportProperty(axs.AuditConfiguration.prototype, "ignoreSelectors", axs.AuditConfiguration.prototype.ignoreSelectors);
-goog.exportProperty(axs.AuditConfiguration.prototype, "getIgnoreSelectors", axs.AuditConfiguration.prototype.getIgnoreSelectors);
-axs.Audit.unsupportedRulesWarningShown = !1;
-axs.Audit.getRulesCannotRun = function(a) {
-  return a.withConsoleApi ? [] : axs.AuditRules.getRules().filter(function(a) {
-    return a.requiresConsoleAPI;
-  }).map(function(a) {
-    return a.code;
-  });
-};
-axs.Audit.run = function(a) {
-  a = a || new axs.AuditConfiguration;
-  if (!axs.Audit.unsupportedRulesWarningShown && a.showUnsupportedRulesWarning) {
-    var b = axs.Audit.getRulesCannotRun(a);
-    0 < b.length && (console.warn("Some rules cannot be checked using the axs.Audit.run() method call. Use the Chrome plugin to check these rules: " + b.join(", ")), console.warn("To remove this message, pass an AuditConfiguration object to axs.Audit.run() and set configuration.showUnsupportedRulesWarning = false."));
-    axs.Audit.unsupportedRulesWarningShown = !0;
-  }
-  b = axs.AuditRules.getActiveRules(a);
-  a.collectIdRefs = b.some(function(a) {
-    return a.collectIdRefs;
-  });
-  a.scope || (a.scope = document.documentElement);
-  axs.Audit.collectMatchingElements(a, b);
-  for (var c = [], d = 0;d < b.length;d++) {
-    var e = b[d];
-    e.canRun(a) && c.push(e.run(a));
-  }
-  return c;
-};
-goog.exportSymbol("axs.Audit.run", axs.Audit.run);
-(function() {
-  function a(a, c) {
-    var d = a.getIgnoreSelectors(c.name);
-    if (0 < d.length || a.scope) {
-      this.ignoreSelectors = d;
-    }
-    if (d = a.getRuleConfig(c.name)) {
-      this.config = d;
-    }
-  }
-  axs.Audit.collectMatchingElements = function(b, c) {
-    axs.dom.composedTreeSearch(b.walkDom ? document.documentElement : b.scope, null, {preorder:function(d, e) {
-      e.inScope || (e.inScope = d === b.scope);
-      for (var f = 0;f < c.length;f++) {
-        var g = c[f];
-        g.canRun(b) && (g._options = new a(b, g), e.ignoring[g.name] || (e.ignoring[g.name] = g._options.shouldIgnore(d)) || g.collectMatchingElement(d, e));
-      }
-      return !0;
-    }}, {walkDom:b.walkDom, collectIdRefs:b.collectIdRefs, level:0, ignoring:{}, disabled:!1, hidden:!1});
-  };
-  a.prototype.shouldIgnore = function(a) {
-    var c = this.ignoreSelectors;
-    if (c) {
-      for (var d = 0;d < c.length;d++) {
-        if (axs.browserUtils.matchSelector(a, c[d])) {
-          return !0;
-        }
-      }
-    }
-    return !1;
-  };
-})();
-axs.Audit.auditResults = function(a) {
-  for (var b = new axs.AuditResults, c = 0;c < a.length;c++) {
-    var d = a[c];
-    d.result == axs.constants.AuditResult.FAIL && (d.rule.severity == axs.constants.Severity.SEVERE ? b.addError(axs.Audit.accessibilityErrorMessage(d)) : b.addWarning(axs.Audit.accessibilityErrorMessage(d)));
-  }
-  return b;
-};
-goog.exportSymbol("axs.Audit.auditResults", axs.Audit.auditResults);
-axs.Audit.createReport = function(a, b) {
-  var c;
-  c = "*** Begin accessibility audit results ***\nAn accessibility audit found " + axs.Audit.auditResults(a).toString();
-  b && (c = c + "\nFor more information, please see " + b);
-  return c + "\n*** End accessibility audit results ***";
-};
-goog.exportSymbol("axs.Audit.createReport", axs.Audit.createReport);
-axs.Audit.accessibilityErrorMessage = function(a) {
-  for (var b = a.rule.severity == axs.constants.Severity.SEVERE ? "Error: " : "Warning: ", b = b + (a.rule.code + " (" + a.rule.heading + ") failed on the following " + (1 == a.elements.length ? "element" : "elements")), b = 1 == a.elements.length ? b + ":" : b + (" (1 - " + Math.min(5, a.elements.length) + " of " + a.elements.length + "):"), c = Math.min(a.elements.length, 5), d = 0;d < c;d++) {
-    var e = a.elements[d], b = b + "\n";
-    try {
-      b += axs.utils.getQuerySelectorText(e);
-    } catch (f) {
-      b += " tagName:" + e.tagName, b += " id:" + e.id;
-    }
-  }
-  "" != a.rule.url && (b += "\nSee " + a.rule.url + " for more information.");
-  return b;
-};
-goog.exportSymbol("axs.Audit.accessibilityErrorMessage", axs.Audit.accessibilityErrorMessage);
-axs.AuditRules.addRule({name:"ariaOnReservedElement", heading:"This element does not support ARIA roles, states and properties", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_12", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return !axs.properties.canTakeAriaAttributes(a);
-}, test:function(a) {
-  return null !== axs.properties.getAriaProperties(a);
-}, code:"AX_ARIA_12"});
-axs.AuditRules.addRule({name:"ariaOwnsDescendant", heading:"aria-owns should not be used if ownership is implicit in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_06", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[aria-owns]");
-}, test:function(a) {
-  return axs.utils.getIdReferents("aria-owns", a).some(function(b) {
-    return a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_CONTAINED_BY;
-  });
-}, code:"AX_ARIA_06"});
-axs.AuditRules.addRule({name:"ariaRoleNotScoped", heading:"Elements with ARIA roles must be in the correct scope", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_09", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[role]");
-}, test:function(a) {
-  var b = axs.utils.getRoles(a);
-  if (!b || !b.applied) {
-    return !1;
-  }
-  b = b.applied.details.scope;
-  if (!b || 0 === b.length) {
-    return !1;
-  }
-  for (var c = a;c = axs.dom.parentElement(c);) {
-    var d = axs.utils.getRoles(c, !0);
-    if (d && d.applied && 0 <= b.indexOf(d.applied.name)) {
-      return !1;
-    }
-  }
-  if (a = axs.utils.getAriaIdReferrers(a, "aria-owns")) {
-    for (c = 0;c < a.length;c++) {
-      if ((d = axs.utils.getRoles(a[c], !0)) && d.applied && 0 <= b.indexOf(d.applied.name)) {
-        return !1;
-      }
-    }
-  }
-  return !0;
-}, code:"AX_ARIA_09"});
-axs.AuditRules.addRule({name:"audioWithoutControls", heading:"Audio elements should have controls", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_audio_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "audio[autoplay]");
-}, test:function(a) {
-  return !a.querySelectorAll("[controls]").length && 3 < a.duration;
-}, code:"AX_AUDIO_01"});
-(function() {
-  var a = /^aria\-/;
-  axs.AuditRules.addRule({name:"badAriaAttribute", heading:"This element has an invalid ARIA attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_11", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(b) {
-    b = b.attributes;
-    for (var c = 0, d = b.length;c < d;c++) {
-      if (a.test(b[c].name)) {
-        return !0;
-      }
-    }
-    return !1;
-  }, test:function(b) {
-    b = b.attributes;
-    for (var c = 0, d = b.length;c < d;c++) {
-      var e = b[c].name;
-      if (a.test(e) && (e = e.replace(a, ""), !axs.constants.ARIA_PROPERTIES.hasOwnProperty(e))) {
-        return !0;
-      }
-    }
-    return !1;
-  }, code:"AX_ARIA_11"});
-})();
-axs.AuditRules.addRule({name:"badAriaAttributeValue", heading:"ARIA state and property values must be valid", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_04", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  var b = axs.utils.getSelectorForAriaProperties(axs.constants.ARIA_PROPERTIES);
-  return axs.browserUtils.matchSelector(a, b);
-}, test:function(a) {
-  for (var b in axs.constants.ARIA_PROPERTIES) {
-    var c = "aria-" + b;
-    if (a.hasAttribute(c)) {
-      var d = a.getAttribute(c);
-      if (!axs.utils.getAriaPropertyValue(c, d, a).valid) {
-        return !0;
-      }
-    }
-  }
-  return !1;
-}, code:"AX_ARIA_04"});
-axs.AuditRules.addRule({name:"badAriaRole", heading:"Elements with ARIA roles must use a valid, non-abstract ARIA role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[role]");
-}, test:function(a) {
-  return !axs.utils.getRoles(a).valid;
-}, code:"AX_ARIA_01"});
-axs.AuditRules.addRule({name:"controlsWithoutLabel", heading:"Controls and media elements should have labels", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  if (!axs.browserUtils.matchSelector(a, 'input:not([type="hidden"]):not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), video:not([disabled])') || "presentation" == a.getAttribute("role")) {
-    return !1;
-  }
-  if (0 <= a.tabIndex) {
-    return !0;
-  }
-  for (a = axs.dom.parentElement(a);null != a;a = axs.dom.parentElement(a)) {
-    if (axs.utils.elementIsAriaWidget(a)) {
-      return !1;
-    }
-  }
-  return !0;
-}, test:function(a, b) {
-  if (b.hidden || "input" == a.tagName.toLowerCase() && "button" == a.type && a.value.length || "button" == a.tagName.toLowerCase() && a.textContent.replace(/^\s+|\s+$/g, "").length || axs.utils.hasLabel(a)) {
-    return !1;
-  }
-  var c = axs.properties.findTextAlternatives(a, {});
-  return null === c || "" === c.trim() ? !0 : !1;
-}, code:"AX_TEXT_01", ruleName:"Controls and media elements should have labels"});
-axs.AuditRules.addRule({name:"duplicateId", heading:"Any ID referred to via an IDREF must be unique in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_02", severity:axs.constants.Severity.SEVERE, opt_requires:{idRefs:!0}, relevantElementMatcher:function(a, b) {
-  b.idrefs.length && !b.hidden && this.relatedElements.push({element:a, flags:b});
-  return a.hasAttribute("id") ? !0 : !1;
-}, isRelevant:function(a, b) {
-  var c = a.id, d = b.level;
-  return this.relatedElements.some(function(a) {
-    var b = a.flags.idrefs;
-    return a.flags.level === d && 0 <= b.indexOf(c);
-  });
-}, test:function(a) {
-  var b = "[id='" + a.id.replace(/'/g, "\\'") + "']";
-  return 1 < a.ownerDocument.querySelectorAll(b).length;
-}, code:"AX_HTML_02"});
-axs.AuditRules.addRule({name:"focusableElementNotVisibleAndNotAriaHidden", heading:"These elements are focusable but either invisible or obscured by another element", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  if (!axs.browserUtils.matchSelector(a, axs.utils.FOCUSABLE_ELEMENTS_SELECTOR)) {
-    return !1;
-  }
-  if (0 <= a.tabIndex) {
-    return !0;
-  }
-  for (var b = axs.dom.parentElement(a);null != b;b = axs.dom.parentElement(b)) {
-    if (axs.utils.elementIsAriaWidget(b)) {
-      return !1;
-    }
-  }
-  a = axs.properties.findTextAlternatives(a, {});
-  return null === a || "" === a.trim() ? !1 : !0;
-}, test:function(a, b) {
-  if (b.hidden) {
-    return !1;
-  }
-  a.focus();
-  return !axs.utils.elementIsVisible(a);
-}, code:"AX_FOCUS_01"});
-axs.AuditRules.addRule({name:"humanLangMissing", heading:"The web page should have the content's human language indicated in the markup", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return a instanceof a.ownerDocument.defaultView.HTMLHtmlElement;
-}, test:function(a) {
-  return a.lang ? !1 : !0;
-}, code:"AX_HTML_01"});
-axs.AuditRules.addRule({name:"imagesWithoutAltText", heading:"Images should have a text alternative or presentational role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_02", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
-  return axs.browserUtils.matchSelector(a, "img") && !b.hidden;
-}, test:function(a) {
-  if (a.hasAttribute("alt") && "" == a.alt || "presentation" == a.getAttribute("role")) {
-    return !1;
-  }
-  var b = {};
-  axs.properties.findTextAlternatives(a, b);
-  return 0 == Object.keys(b).length ? !0 : !1;
-}, code:"AX_TEXT_02"});
-axs.AuditRules.addRule({name:"linkWithUnclearPurpose", heading:"The purpose of each link should be clear from the link text", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_04", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
-  return axs.browserUtils.matchSelector(a, "a[href]") && !b.hidden;
-}, test:function(a, b, c) {
-  c = c || {};
-  var d = c.blacklistPhrases || [], e = /\s+/;
-  for (b = 0;b < d.length;b++) {
-    var f = "^\\s*" + d[b].trim().replace(e, "\\s*") + "s*[^a-z]$";
-    if ((new RegExp(f, "i")).test(a.textContent)) {
-      return !0;
-    }
-  }
-  c = c.stopwords || "click tap go here learn more this page link about".split(" ");
-  a = axs.properties.findTextAlternatives(a, {});
-  if (null === a || "" === a.trim()) {
-    return !0;
-  }
-  a = a.replace(/[^a-zA-Z ]/g, "");
-  for (b = 0;b < c.length;b++) {
-    if (a = a.replace(new RegExp("\\b" + c[b] + "\\b", "ig"), ""), "" == a.trim()) {
-      return !0;
-    }
-  }
-  return !1;
-}, code:"AX_TEXT_04"});
-axs.AuditRules.addRule({name:"lowContrastElements", heading:"Text elements should have a reasonable contrast ratio", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_color_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
-  return !b.disabled && axs.properties.hasDirectTextDescendant(a);
-}, test:function(a) {
-  var b = window.getComputedStyle(a, null);
-  return (a = axs.utils.getContrastRatioForElementWithComputedStyle(b, a)) && axs.utils.isLowContrast(a, b);
-}, code:"AX_COLOR_01"});
-axs.AuditRules.addRule({name:"mainRoleOnInappropriateElement", heading:"role=main should only appear on significant elements", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_05", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[role~=main]");
-}, test:function(a) {
-  if (axs.utils.isInlineElement(a)) {
-    return !0;
-  }
-  a = axs.properties.getTextFromDescendantContent(a);
-  return !a || 50 > a.length ? !0 : !1;
-}, code:"AX_ARIA_05"});
-axs.AuditRules.addRule({name:"elementsWithMeaningfulBackgroundImage", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a, b) {
-  return !b.hidden;
-}, heading:"Meaningful images should not be used in element backgrounds", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_image_01", test:function(a) {
-  if (a.textContent && 0 < a.textContent.length) {
-    return !1;
-  }
-  a = window.getComputedStyle(a, null);
-  var b = a.backgroundImage;
-  if (!b || "undefined" === b || "none" === b || 0 != b.indexOf("url")) {
-    return !1;
-  }
-  b = parseInt(a.width, 10);
-  a = parseInt(a.height, 10);
-  return 150 > b && 150 > a;
-}, code:"AX_IMAGE_01"});
-axs.AuditRules.addRule({name:"multipleAriaOwners", heading:"An element's ID must not be present in more that one aria-owns attribute at any time", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_07", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[aria-owns]");
-}, test:function(a) {
-  return axs.utils.getIdReferents("aria-owns", a).some(function(a) {
-    return 1 < axs.utils.getAriaIdReferrers(a, "aria-owns").length;
-  });
-}, code:"AX_ARIA_07"});
-axs.AuditRules.addRule({name:"multipleLabelableElementsPerLabel", heading:"A label element may not have labelable descendants other than its labeled control.", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_text_03--labels-should-only-contain-one-labelable-element", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "label");
-}, test:function(a) {
-  if (1 < a.querySelectorAll(axs.utils.LABELABLE_ELEMENTS_SELECTOR).length) {
-    return !0;
-  }
-}, code:"AX_TEXT_03"});
-axs.AuditRules.addRule({name:"nonExistentRelatedElement", heading:"Attributes which refer to other elements by ID should refer to elements which exist in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_03", severity:axs.constants.Severity.SEVERE, opt_requires:{idRefs:!0}, relevantElementMatcher:function(a, b) {
-  return 0 < b.idrefs.length;
-}, test:function(a, b) {
-  return b.idrefs.some(function(a) {
-    return !document.getElementById(a);
-  });
-}, code:"AX_HTML_03"});
-axs.AuditRules.addRule({name:"pageWithoutTitle", heading:"The web page should have a title that describes topic or purpose", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_title_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return "html" == a.tagName.toLowerCase();
-}, test:function(a) {
-  a = a.querySelector("head");
-  return a ? (a = a.querySelector("title")) ? !a.textContent : !0 : !0;
-}, code:"AX_TITLE_01"});
-axs.AuditRules.addRule({name:"requiredAriaAttributeMissing", heading:"Elements with ARIA roles must have all required attributes for that role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_03", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[role]");
-}, test:function(a) {
-  var b = axs.utils.getRoles(a);
-  if (!b.valid) {
-    return !1;
-  }
-  for (var c = 0;c < b.roles.length;c++) {
-    var d = b.roles[c].details.requiredPropertiesSet, e;
-    for (e in d) {
-      if (d = e.replace(/^aria-/, ""), !("defaultValue" in axs.constants.ARIA_PROPERTIES[d] || a.hasAttribute(e)) && 0 > axs.properties.getNativelySupportedAttributes(a).indexOf(e)) {
-        return !0;
-      }
-    }
-  }
-}, code:"AX_ARIA_03"});
-(function() {
-  function a(a) {
-    a = axs.utils.getRoles(a);
-    if (!a || !a.applied) {
-      return [];
-    }
-    a = a.applied;
-    return a.valid ? a.details.mustcontain || [] : [];
-  }
-  axs.AuditRules.addRule({name:"requiredOwnedAriaRoleMissing", heading:"Elements with ARIA roles must ensure required owned elements are present", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_08", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(b) {
-    return axs.browserUtils.matchSelector(b, "[role]") ? 0 < a(b).length : !1;
-  }, test:function(b) {
-    if ("true" === b.getAttribute("aria-busy")) {
-      return !1;
-    }
-    for (var c = a(b), d = c.length - 1;0 <= d;d--) {
-      var e = axs.utils.findDescendantsWithRole(b, c[d]);
-      if (e && e.length) {
-        return !1;
-      }
-    }
-    b = axs.utils.getIdReferents("aria-owns", b);
-    for (d = b.length - 1;0 <= d;d--) {
-      if ((e = axs.utils.getRoles(b[d], !0)) && e.applied) {
-        for (var e = e.applied, f = c.length - 1;0 <= f;f--) {
-          if (e.name === c[f]) {
-            return !1;
-          }
-        }
-      }
-    }
-    return !0;
-  }, code:"AX_ARIA_08"});
-})();
-axs.AuditRules.addRule({name:"roleTooltipRequiresDescribedby", heading:"Elements with role=tooltip should have a corresponding element with aria-describedby", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_02", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a, b) {
-  return axs.browserUtils.matchSelector(a, "[role=tooltip]") && !b.hidden;
-}, test:function(a) {
-  a = axs.utils.getAriaIdReferrers(a, "aria-describedby");
-  return !a || 0 === a.length;
-}, code:"AX_TOOLTIP_01"});
-axs.AuditRules.addRule({name:"tabIndexGreaterThanZero", heading:"Avoid positive integer values for tabIndex", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_03", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[tabindex]");
-}, test:function(a) {
-  if (0 < a.tabIndex) {
-    return !0;
-  }
-}, code:"AX_FOCUS_03"});
-(function() {
-  function a(a) {
-    if (0 == a.childElementCount) {
-      return !0;
-    }
-    if (a.hasAttribute("role") && "presentation" != a.getAttribute("role")) {
-      return !1;
-    }
-    if ("presentation" == a.getAttribute("role")) {
-      a = a.querySelectorAll("*");
-      for (var c = 0;c < a.length;c++) {
-        if ("TR" != a[c].tagName && "TD" != a[c].tagName) {
-          return !1;
-        }
-      }
-      return !0;
-    }
-    return !1;
-  }
-  axs.AuditRules.addRule({name:"tableHasAppropriateHeaders", heading:"Tables should have appropriate headers", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_table_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(b) {
-    return axs.browserUtils.matchSelector(b, "table") && !a(b) && 0 < b.querySelectorAll("tr").length;
-  }, test:function(a) {
-    a = a.querySelectorAll("tr");
-    var c;
-    a: {
-      c = a[0].children;
-      for (var d = 0;d < c.length;d++) {
-        if ("TH" != c[d].tagName) {
-          c = !0;
-          break a;
-        }
-      }
-      c = !1;
-    }
-    if (c) {
-      a: {
-        for (c = 0;c < a.length;c++) {
-          if ("TH" != a[c].children[0].tagName) {
-            c = !0;
-            break a;
-          }
-        }
-        c = !1;
-      }
-    }
-    if (c) {
-      a: {
-        c = a[0].children;
-        for (d = 1;d < c.length;d++) {
-          if ("TH" != c[d].tagName) {
-            c = !0;
-            break a;
-          }
-        }
-        for (d = 1;d < a.length;d++) {
-          if ("TH" != a[d].children[0].tagName) {
-            c = !0;
-            break a;
-          }
-        }
-        c = !1;
-      }
-    }
-    return c;
-  }, code:"AX_TABLE_01"});
-})();
-(function() {
-  axs.AuditRules.addRule({name:"uncontrolledTabpanel", heading:"A tabpanel should be related to a tab via aria-controls or aria-labelledby", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_13", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-    return axs.browserUtils.matchSelector(a, '[role="tabpanel"]');
-  }, test:function(a) {
-    var b;
-    b = document.querySelectorAll('[role="tab"][aria-controls="' + a.id + '"]');
-    (b = a.id && 1 === b.length) || (a.hasAttribute("aria-labelledby") ? (a = document.querySelectorAll("#" + a.getAttribute("aria-labelledby")), b = 1 === a.length && "tab" === a[0].getAttribute("role")) : b = !1);
-    return !b;
-  }, code:"AX_ARIA_13"});
-})();
-axs.AuditRules.addRule({name:"unfocusableElementsWithOnClick", heading:"Elements with onclick handlers must be focusable", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_02", severity:axs.constants.Severity.WARNING, opt_requires:{consoleAPI:!0}, relevantElementMatcher:function(a, b) {
-  return a instanceof a.ownerDocument.defaultView.HTMLBodyElement || b.hidden ? !1 : "click" in getEventListeners(a) ? !0 : !1;
-}, test:function(a) {
-  return !a.hasAttribute("tabindex") && !axs.utils.isElementImplicitlyFocusable(a) && !a.disabled;
-}, code:"AX_FOCUS_02"});
-(function() {
-  var a = /^aria\-/, b = axs.utils.getSelectorForAriaProperties(axs.constants.ARIA_PROPERTIES);
-  axs.AuditRules.addRule({name:"unsupportedAriaAttribute", heading:"This element has an unsupported ARIA attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_10", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-    return axs.browserUtils.matchSelector(a, b);
-  }, test:function(b) {
-    var d = axs.utils.getRoles(b, !0), d = d && d.applied ? d.applied.details.propertiesSet : axs.constants.GLOBAL_PROPERTIES;
-    b = b.attributes;
-    for (var e = 0, f = b.length;e < f;e++) {
-      var g = b[e].name;
-      if (a.test(g)) {
-        var h = g.replace(a, "");
-        if (axs.constants.ARIA_PROPERTIES.hasOwnProperty(h) && !(g in d)) {
-          return !0;
-        }
-      }
-    }
-    return !1;
-  }, code:"AX_ARIA_10"});
-})();
-axs.AuditRules.addRule({name:"videoWithoutCaptions", heading:"Video elements should use <track> elements to provide captions", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_video_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "video");
-}, test:function(a) {
-  return !a.querySelectorAll("track[kind=captions]").length;
-}, code:"AX_VIDEO_01"});
-
-  return axs;
-});
-
-// Define AMD module if possible, export globals otherwise.
-if (typeof define !== 'undefined' && define.amd) {
-  define([], fn);
-} else {
-  var axs = fn.call(this);
-}
-
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index a8cc93b56..4510b13f3 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,7 +1,135 @@
 "use strict";
 
 window._qutebrowser.caret = (function() {
-    const funcs = {};
+
+    var axs = {};
+
+    axs.dom = {};
+
+    axs.color = {};
+
+    axs.utils = {};
+
+    axs.dom.parentElement = function(a) {
+        if (!a) {
+            return null;
+        }
+        a = axs.dom.composedParentNode(a);
+        if (!a) {
+            return null;
+        }
+        switch(a.nodeType) {
+            case Node.ELEMENT_NODE:
+                return a;
+            default:
+                return axs.dom.parentElement(a);
+        }
+    };
+
+    axs.dom.shadowHost = function(a) {
+        return "host" in a ? a.host : null;
+    };
+
+    axs.dom.composedParentNode = function(a) {
+        if (!a) {
+            return null;
+        }
+        if (a.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+            return axs.dom.shadowHost(a);
+        }
+        var b = a.parentNode;
+        if (!b) {
+            return null;
+        }
+        if (b.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+            return axs.dom.shadowHost(b);
+        }
+        if (!b.shadowRoot) {
+            return b;
+        }
+        a = a.getDestinationInsertionPoints();
+        return 0 < a.length ? axs.dom.composedParentNode(a[a.length - 1]) : null;
+    };
+
+    axs.color.Color = function(a, b, c, d) {
+        this.red = a;
+        this.green = b;
+        this.blue = c;
+        this.alpha = d;
+    };
+
+    axs.color.parseColor = function(a) {
+        if ("transparent" === a) {
+            return new axs.color.Color(0, 0, 0, 0);
+        }
+        var b = a.match(/^rgb\((\d+), (\d+), (\d+)\)$/);
+        if (b) {
+            a = parseInt(b[1], 10);
+            var c = parseInt(b[2], 10), d = parseInt(b[3], 10);
+            return new axs.color.Color(a, c, d, 1);
+        }
+        return (b = a.match(/^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/)) ? (a = parseInt(b[1], 10), c = parseInt(b[2], 10), d = parseInt(b[3], 10), b = parseFloat(b[4]), new axs.color.Color(a, c, d, b)) : null;
+    };
+
+    axs.color.flattenColors = function(a, b) {
+        var c = a.alpha;
+        return new axs.color.Color((1 - c) * b.red + c * a.red, (1 - c) * b.green + c * a.green, (1 - c) * b.blue + c * a.blue, a.alpha + b.alpha * (1 - a.alpha));
+    };
+
+    axs.utils.getParentBgColor = function(a) {
+        var b = a;
+        a = [];
+        for (var c = null;b = axs.dom.parentElement(b);) {
+            var d = window.getComputedStyle(b, null);
+            if (d) {
+                var e = axs.color.parseColor(d.backgroundColor);
+                if (e && (1 > d.opacity && (e.alpha *= d.opacity), 0 != e.alpha && (a.push(e), 1 == e.alpha))) {
+                    c = !0;
+                    break;
+                }
+            }
+        }
+        c || a.push(new axs.color.Color(255, 255, 255, 1));
+        for (b = a.pop();a.length;) {
+            c = a.pop(), b = axs.color.flattenColors(c, b);
+        }
+        return b;
+    };
+
+    axs.utils.getFgColor = function(a, b, c) {
+        var d = axs.color.parseColor(a.color);
+        if (!d) {
+            return null;
+        }
+        1 > d.alpha && (d = axs.color.flattenColors(d, c));
+        1 > a.opacity && (b = axs.utils.getParentBgColor(b), d.alpha *= a.opacity, d = axs.color.flattenColors(d, b));
+        return d;
+    };
+
+    axs.utils.getBgColor = function(a, b) {
+        var c = axs.color.parseColor(a.backgroundColor);
+        if (!c) {
+            return null;
+        }
+        1 > a.opacity && (c.alpha *= a.opacity);
+        if (1 > c.alpha) {
+            var d = axs.utils.getParentBgColor(b);
+            if (null == d) {
+                return null;
+            }
+            c = axs.color.flattenColors(c, d);
+        }
+        return c;
+    };
+
+    axs.color.colorChannelToString = function(a) {
+        a = Math.round(a);
+        return 15 >= a ? "0" + a.toString(16) : a.toString(16);
+    };
+
+    axs.color.colorToString = function(a) {
+        return 1 == a.alpha ? "#" + axs.color.colorChannelToString(a.red) + axs.color.colorChannelToString(a.green) + axs.color.colorChannelToString(a.blue) : "rgba(" + [a.red, a.green, a.blue, a.alpha].join() + ")";
+    };
 
     var Cursor = function(node, index, text) {
         this.node = node;
@@ -69,23 +197,6 @@ window._qutebrowser.caret = (function() {
         return (c == ' ' || c == '\n' || c == '\r' || c == '\t');
     };
 
-    /**
-     * Set the selection to the range between the given start and end cursors.
-     * @param {Cursor} start The desired start of the selection.
-     * @param {Cursor} end The desired end of the selection.
-     * @return {Selection} the selection object.
-     */
-    TraverseUtil.setSelection = function(start, end) {
-        var sel = window.getSelection();
-        sel.removeAllRanges();
-        var range = document.createRange();
-        range.setStart(start.node, start.index);
-        range.setEnd(end.node, end.index);
-        sel.addRange(range);
-
-        return sel;
-    };
-
     /**
      * Use the computed CSS style to figure out if this DOM node is currently
      * visible.
@@ -196,91 +307,6 @@ window._qutebrowser.caret = (function() {
         }
     };
 
-    /**
-     * Moves the cursor backwards until it has crossed exactly one character.
-     * @param {Cursor} cursor The cursor location where the search should start.
-     *     On exit, the cursor will be immediately to the left of the
-     *     character returned.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The previous character, or null if the top of the
-     *     document has been reached.
-     */
-    TraverseUtil.backwardsChar = function(cursor, nodesCrossed) {
-        while (true) {
-            // Move down until we get to a leaf node.
-            var childNode = null;
-            if (!TraverseUtil.treatAsLeafNode(cursor.node)) {
-                for (var i = cursor.index - 1; i >= 0; i--) {
-                    var node = cursor.node.childNodes[i];
-                    if (TraverseUtil.isSkipped(node)) {
-                        nodesCrossed.push(node);
-                        continue;
-                    }
-                    if (TraverseUtil.isVisible(node)) {
-                        childNode = node;
-                        break;
-                    }
-                }
-            }
-            if (childNode) {
-                cursor.node = childNode;
-                cursor.text = TraverseUtil.getNodeText(cursor.node);
-                if (cursor.text.length)
-                    cursor.index = cursor.text.length;
-                else
-                    cursor.index = cursor.node.childNodes.length;
-                if (cursor.node.constructor != Text)
-                    nodesCrossed.push(cursor.node);
-                continue;
-            }
-
-            // Return the previous character from this leaf node.
-            if (cursor.text.length > 0 && cursor.index > 0) {
-                return cursor.text[--cursor.index];
-            }
-
-            // Move to the previous sibling, going up the tree as necessary.
-            while (true) {
-                // Try to move to the previous sibling.
-                var siblingNode = null;
-                for (var node = cursor.node.previousSibling;
-                    node != null;
-                    node = node.previousSibling) {
-                    if (TraverseUtil.isSkipped(node)) {
-                        nodesCrossed.push(node);
-                        continue;
-                    }
-                    if (TraverseUtil.isVisible(node)) {
-                        siblingNode = node;
-                        break;
-                    }
-                }
-                if (siblingNode) {
-                    cursor.node = siblingNode;
-                    cursor.text = TraverseUtil.getNodeText(siblingNode);
-                    if (cursor.text.length)
-                        cursor.index = cursor.text.length;
-                    else
-                        cursor.index = cursor.node.childNodes.length;
-                    if (cursor.node.constructor != Text)
-                        nodesCrossed.push(cursor.node);
-                    break;
-                }
-
-                // Otherwise, move to the parent.
-                if (cursor.node.parentNode &&
-                    cursor.node.parentNode.constructor != HTMLBodyElement) {
-                    cursor.node = cursor.node.parentNode;
-                    cursor.text = null;
-                    cursor.index = 0;
-                } else {
-                    return null;
-                }
-            }
-        }
-    };
-
     /**
      * Finds the next character, starting from endCursor.  Upon exit, startCursor
      * and endCursor will surround the next character. If skipWhitespace is
@@ -341,538 +367,6 @@ window._qutebrowser.caret = (function() {
         }
     };
 
-    /**
-     * Finds the previous character, starting from startCursor.  Upon exit,
-     * startCursor and endCursor will surround the previous character.
-     * If skipWhitespace is true, will skip until a real character is found.
-     * Otherwise, it will attempt to select all of the whitespace between
-     * the initial position of endCursor and the next non-whitespace character.
-     * @param {Cursor} startCursor The position to start searching for the
-     *     char. On exit, will point to the position before the char.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     char. On exit, will point to the position past the char.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {boolean} skipWhitespace If true, will keep scanning until a
-     *     non-whitespace character is found.
-     * @return {?string} The previous char, or null if the top of the
-     *     document has been reached.
-     */
-    TraverseUtil.getPreviousChar = function(
-        startCursor, endCursor, nodesCrossed, skipWhitespace) {
-
-        // Save the starting position and get the first character.
-        endCursor.copyFrom(startCursor);
-        var c = TraverseUtil.backwardsChar(startCursor, nodesCrossed);
-        if (c == null)
-        return null;
-
-        // Keep track of whether the first character was whitespace.
-        var initialWhitespace = TraverseUtil.isWhitespace(c);
-
-        // Keep scanning until we find a non-whitespace or non-skipped character.
-        while ((TraverseUtil.isWhitespace(c)) ||
-            (TraverseUtil.isSkipped(startCursor.node))) {
-            c = TraverseUtil.backwardsChar(startCursor, nodesCrossed);
-            if (c == null)
-            return null;
-        }
-        if (skipWhitespace || !initialWhitespace) {
-            // If skipWhitepace is true, or if the first character we encountered
-            // was not whitespace, return that non-whitespace character.
-            endCursor.copyFrom(startCursor);
-            endCursor.index++;
-            return c;
-        } else {
-            for (var i = 0; i < nodesCrossed.length; i++) {
-                if (TraverseUtil.isSkipped(nodesCrossed[i])) {
-                    startCursor.index++;
-                    endCursor.copyFrom(startCursor);
-                    endCursor.index++;
-                    return ' ';
-                }
-            }
-            // Otherwise, return all of the whitespace before that last character.
-            startCursor.index++;
-            return ' ';
-        }
-    };
-
-    /**
-     * Finds the next word, starting from endCursor.  Upon exit, startCursor
-     * and endCursor will surround the next word.  A word is defined to be
-     * a string of 1 or more non-whitespace characters in the same DOM node.
-     * @param {Cursor} startCursor On exit, will point to the beginning of the
-     *     word returned.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     word.  On exit, will point to the end of the word returned.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The next word, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getNextWord = function(startCursor, endCursor,
-        nodesCrossed) {
-
-        // Find the first non-whitespace or non-skipped character.
-        var cursor = endCursor.clone();
-        var c = TraverseUtil.forwardsChar(cursor, nodesCrossed);
-        if (c == null)
-        return null;
-        while ((TraverseUtil.isWhitespace(c)) ||
-            (TraverseUtil.isSkipped(cursor.node))) {
-            c = TraverseUtil.forwardsChar(cursor, nodesCrossed);
-            if (c == null)
-            return null;
-        }
-
-        // Set startCursor to the position immediately before the first
-        // character in our word. It's safe to decrement |index| because
-        // forwardsChar guarantees that the cursor will be immediately to the
-        // right of the returned character on exit.
-        startCursor.copyFrom(cursor);
-        startCursor.index--;
-
-        // Keep building up our word until we reach a whitespace character or
-        // would cross a tag.  Don't actually return any tags crossed, because this
-        // word goes up until the tag boundary but not past it.
-        endCursor.copyFrom(cursor);
-        var word = c;
-        var newNodesCrossed = [];
-        c = TraverseUtil.forwardsChar(cursor, newNodesCrossed);
-        if (c == null) {
-            return word;
-        }
-        while (!TraverseUtil.isWhitespace(c) &&
-            newNodesCrossed.length == 0) {
-            word += c;
-            endCursor.copyFrom(cursor);
-            c = TraverseUtil.forwardsChar(cursor, newNodesCrossed);
-            if (c == null) {
-                return word;
-            }
-        }
-        return word;
-    };
-
-    /**
-     * Finds the previous word, starting from startCursor.  Upon exit, startCursor
-     * and endCursor will surround the previous word.  A word is defined to be
-     * a string of 1 or more non-whitespace characters in the same DOM node.
-     * @param {Cursor} startCursor The position to start searching for the
-     *     previous word.  On exit, will point to the beginning of the
-     *     word returned.
-     * @param {Cursor} endCursor On exit, will point to the end of the
-     *     word returned.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The previous word, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getPreviousWord = function(startCursor, endCursor,
-        nodesCrossed) {
-        // Find the first non-whitespace or non-skipped character.
-        var cursor = startCursor.clone();
-        var c = TraverseUtil.backwardsChar(cursor, nodesCrossed);
-        if (c == null)
-        return null;
-        while ((TraverseUtil.isWhitespace(c) ||
-            (TraverseUtil.isSkipped(cursor.node)))) {
-            c = TraverseUtil.backwardsChar(cursor, nodesCrossed);
-            if (c == null)
-            return null;
-        }
-
-        // Set endCursor to the position immediately after the first
-        // character we've found (the last character of the word, since we're
-        // searching backwards).
-        endCursor.copyFrom(cursor);
-        endCursor.index++;
-
-        // Keep building up our word until we reach a whitespace character or
-        // would cross a tag.  Don't actually return any tags crossed, because this
-        // word goes up until the tag boundary but not past it.
-        startCursor.copyFrom(cursor);
-        var word = c;
-        var newNodesCrossed = [];
-        c = TraverseUtil.backwardsChar(cursor, newNodesCrossed);
-        if (c == null)
-        return word;
-        while (!TraverseUtil.isWhitespace(c) &&
-            newNodesCrossed.length == 0) {
-            word = c + word;
-            startCursor.copyFrom(cursor);
-            c = TraverseUtil.backwardsChar(cursor, newNodesCrossed);
-            if (c == null)
-            return word;
-        }
-
-        return word;
-    };
-
-    /**
-     * Finds the next sentence, starting from endCursor.  Upon exit,
-     * startCursor and endCursor will surround the next sentence.
-     *
-     * @param {Cursor} startCursor On exit, marks the beginning of the sentence.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     sentence.  On exit, will point to the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {Object} breakTags Associative array of tags that should break
-     *     the sentence.
-     * @return {?string} The next sentence, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getNextSentence = function(
-        startCursor, endCursor, nodesCrossed, breakTags) {
-        return TraverseUtil.getNextString(
-            startCursor, endCursor, nodesCrossed,
-            function(str, word, nodes) {
-                if (str.substr(-1) == '.')
-                    return true;
-                for (var i = 0; i < nodes.length; i++) {
-                    if (TraverseUtil.isSkipped(nodes[i])) {
-                        return true;
-                    }
-                    var style = window.getComputedStyle(nodes[i], null);
-                    if (style && (style.display != 'inline' ||
-                        breakTags[nodes[i].tagName])) {
-                        return true;
-                    }
-                }
-                return false;
-            });
-    };
-
-    /**
-     * Finds the previous sentence, starting from startCursor.  Upon exit,
-     * startCursor and endCursor will surround the previous sentence.
-     *
-     * @param {Cursor} startCursor The position to start searching for the next
-     *     sentence.  On exit, will point to the start of the returned string.
-     * @param {Cursor} endCursor On exit, the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {Object} breakTags Associative array of tags that should break
-     *     the sentence.
-     * @return {?string} The previous sentence, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getPreviousSentence = function(
-        startCursor, endCursor, nodesCrossed, breakTags) {
-        return TraverseUtil.getPreviousString(
-            startCursor, endCursor, nodesCrossed,
-            function(str, word, nodes) {
-                if (word.substr(-1) == '.')
-                    return true;
-                for (var i = 0; i < nodes.length; i++) {
-                    if (TraverseUtil.isSkipped(nodes[i])) {
-                        return true;
-                    }
-                    var style = window.getComputedStyle(nodes[i], null);
-                    if (style && (style.display != 'inline' ||
-                        breakTags[nodes[i].tagName])) {
-                        return true;
-                    }
-                }
-                return false;
-            });
-    };
-
-    /**
-     * Finds the next line, starting from endCursor.  Upon exit,
-     * startCursor and endCursor will surround the next line.
-     *
-     * @param {Cursor} startCursor On exit, marks the beginning of the line.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     line.  On exit, will point to the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {number} lineLength The maximum number of characters in a line.
-     * @param {Object} breakTags Associative array of tags that should break
-     *     the line.
-     * @return {?string} The next line, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getNextLine = function(
-        startCursor, endCursor, nodesCrossed, lineLength, breakTags) {
-        return TraverseUtil.getNextString(
-            startCursor, endCursor, nodesCrossed,
-            function(str, word, nodes) {
-                if (str.length + word.length + 1 > lineLength)
-                    return true;
-                for (var i = 0; i < nodes.length; i++) {
-                    if (TraverseUtil.isSkipped(nodes[i])) {
-                        return true;
-                    }
-                    var style = window.getComputedStyle(nodes[i], null);
-                    if (style && (style.display != 'inline' ||
-                        breakTags[nodes[i].tagName])) {
-                        return true;
-                    }
-                }
-                return false;
-            });
-    };
-
-    /**
-     * Finds the previous line, starting from startCursor.  Upon exit,
-     * startCursor and endCursor will surround the previous line.
-     *
-     * @param {Cursor} startCursor The position to start searching for the next
-     *     line.  On exit, will point to the start of the returned string.
-     * @param {Cursor} endCursor On exit, the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {number} lineLength The maximum number of characters in a line.
-     * @param {Object} breakTags Associative array of tags that should break
-     *     the sentence.
-     *  @return {?string} The previous line, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getPreviousLine = function(
-        startCursor, endCursor, nodesCrossed, lineLength, breakTags) {
-        return TraverseUtil.getPreviousString(
-            startCursor, endCursor, nodesCrossed,
-            function(str, word, nodes) {
-                if (str.length + word.length + 1 > lineLength)
-                    return true;
-                for (var i = 0; i < nodes.length; i++) {
-                    if (TraverseUtil.isSkipped(nodes[i])) {
-                        return true;
-                    }
-                    var style = window.getComputedStyle(nodes[i], null);
-                    if (style && (style.display != 'inline' ||
-                        breakTags[nodes[i].tagName])) {
-                        return true;
-                    }
-                }
-                return false;
-            });
-    };
-
-    /**
-     * Finds the next paragraph, starting from endCursor.  Upon exit,
-     * startCursor and endCursor will surround the next paragraph.
-     *
-     * @param {Cursor} startCursor On exit, marks the beginning of the paragraph.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     paragraph.  On exit, will point to the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The next paragraph, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getNextParagraph = function(startCursor, endCursor,
-        nodesCrossed) {
-        return TraverseUtil.getNextString(
-            startCursor, endCursor, nodesCrossed,
-            function(str, word, nodes) {
-                for (var i = 0; i < nodes.length; i++) {
-                    if (TraverseUtil.isSkipped(nodes[i])) {
-                        return true;
-                    }
-                    var style = window.getComputedStyle(nodes[i], null);
-                    if (style && style.display != 'inline') {
-                        return true;
-                    }
-                }
-                return false;
-            });
-    };
-
-    /**
-     * Finds the previous paragraph, starting from startCursor.  Upon exit,
-     * startCursor and endCursor will surround the previous paragraph.
-     *
-     * @param {Cursor} startCursor The position to start searching for the next
-     *     paragraph.  On exit, will point to the start of the returned string.
-     * @param {Cursor} endCursor On exit, the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The previous paragraph, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getPreviousParagraph = function(
-        startCursor, endCursor, nodesCrossed) {
-        return TraverseUtil.getPreviousString(
-            startCursor, endCursor, nodesCrossed,
-            function(str, word, nodes) {
-                for (var i = 0; i < nodes.length; i++) {
-                    if (TraverseUtil.isSkipped(nodes[i])) {
-                        return true;
-                    }
-                    var style = window.getComputedStyle(nodes[i], null);
-                    if (style && style.display != 'inline') {
-                        return true;
-                    }
-                }
-                return false;
-            });
-    };
-
-    /**
-     * Customizable function to return the next string of words in the DOM, based
-     * on provided functions to decide when to break one string and start
-     * the next. This can be used to get the next sentence, line, paragraph,
-     * or potentially other granularities.
-     *
-     * Finds the next contiguous string, starting from endCursor.  Upon exit,
-     * startCursor and endCursor will surround the next string.
-     *
-     * The breakBefore function takes three parameters, and
-     * should return true if the string should be broken before the proposed
-     * next word:
-     *   str The string so far.
-     *   word The next word to be added.
-     *   nodesCrossed The nodes crossed in reaching this next word.
-     *
-     * @param {Cursor} startCursor On exit, will point to the beginning of the
-     *     next string.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     string.  On exit, will point to the end of the returned string.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {function(string, string, Array<string>)} breakBefore
-     *     Function that takes the string so far, next word to be added, and
-     *     nodes crossed, and returns true if the string should be ended before
-     *     adding this word.
-     * @return {?string} The next string, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getNextString = function(
-        startCursor, endCursor, nodesCrossed, breakBefore) {
-        // Get the first word and set the start cursor to the start of the
-        // first word.
-        var wordStartCursor = endCursor.clone();
-        var wordEndCursor = endCursor.clone();
-        var newNodesCrossed = [];
-        var str = '';
-        var word = TraverseUtil.getNextWord(
-            wordStartCursor, wordEndCursor, newNodesCrossed);
-        if (word == null)
-        return null;
-        startCursor.copyFrom(wordStartCursor);
-
-        // Always add the first word when the string is empty, and then keep
-        // adding more words as long as breakBefore returns false
-        while (!str || !breakBefore(str, word, newNodesCrossed)) {
-            // Append this word, set the end cursor to the end of this word, and
-            // update the returned list of nodes crossed to include ones we crossed
-            // in reaching this word.
-            if (str)
-                str += ' ';
-            str += word;
-            nodesCrossed = nodesCrossed.concat(newNodesCrossed);
-            endCursor.copyFrom(wordEndCursor);
-
-            // Get the next word and go back to the top of the loop.
-            newNodesCrossed = [];
-            word = TraverseUtil.getNextWord(
-                wordStartCursor, wordEndCursor, newNodesCrossed);
-            if (word == null)
-                return str;
-        }
-
-        return str;
-    };
-
-    /**
-     * Customizable function to return the previous string of words in the DOM,
-     * based on provided functions to decide when to break one string and start
-     * the next. See getNextString, above, for more details.
-     *
-     * Finds the previous contiguous string, starting from startCursor.  Upon exit,
-     * startCursor and endCursor will surround the next string.
-     *
-     * @param {Cursor} startCursor The position to start searching for the
-     *     previous string.  On exit, will point to the beginning of the
-     *     string returned.
-     * @param {Cursor} endCursor On exit, will point to the end of the
-     *     string returned.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {function(string, string, Array<string>)} breakBefore
-     *     Function that takes the string so far, the word to be added, and
-     *     nodes crossed, and returns true if the string should be ended before
-     *     adding this word.
-     * @return {?string} The next string, or null if the top of the
-     *     document has been reached.
-     */
-    TraverseUtil.getPreviousString = function(
-        startCursor, endCursor, nodesCrossed, breakBefore) {
-        // Get the first word and set the end cursor to the end of the
-        // first word.
-        var wordStartCursor = startCursor.clone();
-        var wordEndCursor = startCursor.clone();
-        var newNodesCrossed = [];
-        var str = '';
-        var word = TraverseUtil.getPreviousWord(
-            wordStartCursor, wordEndCursor, newNodesCrossed);
-        if (word == null)
-        return null;
-        endCursor.copyFrom(wordEndCursor);
-
-        // Always add the first word when the string is empty, and then keep
-        // adding more words as long as breakBefore returns false
-        while (!str || !breakBefore(str, word, newNodesCrossed)) {
-            // Prepend this word, set the start cursor to the start of this word, and
-            // update the returned list of nodes crossed to include ones we crossed
-            // in reaching this word.
-            if (str)
-                str = ' ' + str;
-            str = word + str;
-            nodesCrossed = nodesCrossed.concat(newNodesCrossed);
-            startCursor.copyFrom(wordStartCursor);
-            // Get the previous word and go back to the top of the loop.
-            newNodesCrossed = [];
-            word = TraverseUtil.getPreviousWord(
-                wordStartCursor, wordEndCursor, newNodesCrossed);
-            if (word == null)
-                return str;
-        }
-
-        return str;
-    };
-
-
-    function isFocusable(targetNode) {
-        if (!targetNode || typeof(targetNode.tabIndex) != 'number') {
-            return false;
-        }
-
-        if (targetNode.tabIndex >= 0) {
-            return true;
-        }
-
-        if (targetNode.hasAttribute &&
-            targetNode.hasAttribute('tabindex') &&
-            targetNode.getAttribute('tabindex') == '-1') {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Determines whether or not a node is or is the descendant of another node.
-     *
-     * @param {Object} node The node to be checked.
-     * @param {Object} ancestor The node to see if it's a descendant of.
-     * @return {boolean} True if the node is ancestor or is a descendant of it.
-     */
-    function isDescendantOfNode(node, ancestor) {
-        while (node && ancestor) {
-            if (node.isSameNode(ancestor)) {
-                return true;
-            }
-            node = node.parentNode;
-        }
-        return false;
-    }
-
-
     var CaretBrowsing = function() {};
 
     /**
@@ -989,12 +483,6 @@ window._qutebrowser.caret = (function() {
      */
     CaretBrowsing.blinkFlag = true;
 
-    /**
-     * Whether or not we're on a Mac - affects modifier keys.
-     * @type {boolean}
-     */
-    CaretBrowsing.isMac = (navigator.appVersion.indexOf("Mac") != -1);
-
     /**
      * Check if a node is a control that normally allows the user to interact
      * with it using arrow keys. We won't override the arrow keys when such a
@@ -1070,7 +558,7 @@ window._qutebrowser.caret = (function() {
         return false;
     };
 
-    function injectCaretStyles() {
+    CaretBrowsing.injectCaretStyles = function() {
         var style = '.CaretBrowsing_Caret {' +
             '  position: absolute;' +
             '  z-index: 2147483647;' +
@@ -1098,55 +586,6 @@ window._qutebrowser.caret = (function() {
         document.body.appendChild(node);
     }
 
-    /**
-     * If there's no initial selection, set the cursor just before the
-     * first text character in the document.
-     */
-    funcs.setInitialCursor = () => {
-        if (!CaretBrowsing.initiated) {
-            injectCaretStyles();
-            CaretBrowsing.setInitialCursor();
-        } else {
-            if (!window.getSelection().toString()) {
-                positionCaret();
-            }
-            CaretBrowsing.toggle();
-        }
-    }
-
-    funcs.toggle = () => {
-        CaretBrowsing.toggle();
-    }
-
-    function positionCaret() {
-        const walker = document.createTreeWalker(document.body, -1);
-        let node;
-        const textNodes = [];
-        let el;
-        while ((node = walker.nextNode())) {
-            if (node.nodeType === 3 && node.nodeValue.trim() !== "") {
-                textNodes.push(node);
-            }
-        }
-        for (let i = 0; i < textNodes.length; i++) {
-            const element = textNodes[i].parentElement;
-            if (isElementInViewport(element)) {
-                el = element;
-                break;
-            }
-        }
-        if (el !== undefined) {
-            var start = new Cursor(el, 0, '');
-            var end = new Cursor(el, 0, '');
-            var nodesCrossed = [];
-            var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
-            if (result == null) {
-                return;
-            }
-            CaretBrowsing.setAndValidateSelection(start, start);
-        }
-    }
-
     CaretBrowsing.setInitialCursor = function() {
         var sel = window.getSelection();
         if (sel.rangeCount > 0) {
@@ -1154,6 +593,7 @@ window._qutebrowser.caret = (function() {
         }
 
         positionCaret();
+        CaretBrowsing.injectCaretStyles();
         CaretBrowsing.toggle();
         CaretBrowsing.initiated = true;
         CaretBrowsing.selectionEnabled = false;
@@ -1196,22 +636,6 @@ window._qutebrowser.caret = (function() {
         return false;
     };
 
-    /**
-     * Set focus to the first focusable node in the given list.
-     * select the text, otherwise it doesn't appear focused to the user.
-     * Every other control behaves normally if you just call focus() on it.
-     * @param {Array<Node>} nodeList An array of nodes to focus.
-     * @return {boolean} True if the node was focused.
-     */
-    CaretBrowsing.setFocusToFirstFocusable = function(nodeList) {
-        for (var i = 0; i < nodeList.length; i++) {
-            if (CaretBrowsing.setFocusToNode(nodeList[i])) {
-                return true;
-            }
-        }
-        return false;
-    };
-
     /**
      * Set the caret element's normal style, i.e. not when animating.
      */
@@ -1489,165 +913,6 @@ window._qutebrowser.caret = (function() {
         }
     };
 
-    /**
-     * Return true if the selection directionality is ambiguous, which happens
-     * if, for example, the user double-clicks in the middle of a word to select
-     * it. In that case, the selection should extend by the right edge if the
-     * user presses right, and by the left edge if the user presses left.
-     * @param {Selection} sel The selection.
-     * @return {boolean} True if the selection directionality is ambiguous.
-     */
-    CaretBrowsing.isAmbiguous = function(sel) {
-        return (sel.anchorNode != sel.baseNode ||
-            sel.anchorOffset != sel.baseOffset ||
-            sel.focusNode != sel.extentNode ||
-            sel.focusOffset != sel.extentOffset);
-    };
-
-    /**
-     * Create a Cursor from the anchor position of the selection, the
-     * part that doesn't normally move.
-     * @param {Selection} sel The selection.
-     * @return {Cursor} A cursor pointing to the selection's anchor location.
-     */
-    CaretBrowsing.makeAnchorCursor = function(sel) {
-        return new Cursor(sel.anchorNode, sel.anchorOffset,
-            TraverseUtil.getNodeText(sel.anchorNode));
-    };
-
-    /**
-     * Create a Cursor from the focus position of the selection.
-     * @param {Selection} sel The selection.
-     * @return {Cursor} A cursor pointing to the selection's focus location.
-     */
-    CaretBrowsing.makeFocusCursor = function(sel) {
-        return new Cursor(sel.focusNode, sel.focusOffset,
-            TraverseUtil.getNodeText(sel.focusNode));
-    };
-
-    /**
-     * Create a Cursor from the left boundary of the selection - the boundary
-     * closer to the start of the document.
-     * @param {Selection} sel The selection.
-     * @return {Cursor} A cursor pointing to the selection's left boundary.
-     */
-    CaretBrowsing.makeLeftCursor = function(sel) {
-        var range = sel.rangeCount == 1 ? sel.getRangeAt(0) : null;
-        if (range &&
-            range.endContainer == sel.anchorNode &&
-            range.endOffset == sel.anchorOffset) {
-            return CaretBrowsing.makeFocusCursor(sel);
-        } else {
-            return CaretBrowsing.makeAnchorCursor(sel);
-        }
-    };
-
-    /**
-     * Create a Cursor from the right boundary of the selection - the boundary
-     * closer to the end of the document.
-     * @param {Selection} sel The selection.
-     * @return {Cursor} A cursor pointing to the selection's right boundary.
-     */
-    CaretBrowsing.makeRightCursor = function(sel) {
-        var range = sel.rangeCount == 1 ? sel.getRangeAt(0) : null;
-        if (range &&
-            range.endContainer == sel.anchorNode &&
-            range.endOffset == sel.anchorOffset) {
-            return CaretBrowsing.makeAnchorCursor(sel);
-        } else {
-            return CaretBrowsing.makeFocusCursor(sel);
-        }
-    };
-
-    /**
-     * Try to set the window's selection to be between the given start and end
-     * cursors, and return whether or not it was successful.
-     * @param {Cursor} start The start position.
-     * @param {Cursor} end The end position.
-     * @return {boolean} True if the selection was successfully set.
-     */
-    CaretBrowsing.setAndValidateSelection = function(start, end) {
-        var sel = window.getSelection();
-        sel.setBaseAndExtent(start.node, start.index, end.node, end.index);
-
-        if (sel.rangeCount != 1) {
-            return false;
-        }
-
-        return (sel.anchorNode == start.node &&
-            sel.anchorOffset == start.index &&
-            sel.focusNode == end.node &&
-            sel.focusOffset == end.index);
-    };
-
-    /**
-     * Note: the built-in function by the same name is unreliable.
-     * @param {Selection} sel The selection.
-     * @return {boolean} True if the start and end positions are the same.
-     */
-    CaretBrowsing.isCollapsed = function(sel) {
-        return (sel.anchorOffset == sel.focusOffset &&
-            sel.anchorNode == sel.focusNode);
-    };
-
-    /**
-     * Determines if the modifier key is held down that should cause
-     * the cursor to move by word rather than by character.
-     * @param {Event} evt A keyboard event.
-     * @return {boolean} True if the cursor should move by word.
-     */
-    CaretBrowsing.isMoveByWordEvent = function(evt) {
-        return evt.ctrlKey;
-    };
-
-    /**
-     * Moves the cursor forwards to the next valid position.
-     * @param {Cursor} cursor The current cursor location.
-     *     On exit, the cursor will be at the next position.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The character reached, or null if the bottom of the
-     *     document has been reached.
-     */
-    CaretBrowsing.forwards = function(cursor, nodesCrossed) {
-        var previousCursor = cursor.clone();
-        var result = TraverseUtil.forwardsChar(cursor, nodesCrossed);
-
-        // Work around the fact that TraverseUtil.forwardsChar returns once per
-        // char in a block of text, rather than once per possible selection
-        // position in a block of text.
-        if (result && cursor.node != previousCursor.node && cursor.index > 0) {
-            cursor.index = 0;
-        }
-
-        return result;
-    };
-
-    /**
-     * Moves the cursor backwards to the previous valid position.
-     * @param {Cursor} cursor The current cursor location.
-     *     On exit, the cursor will be at the previous position.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The character reached, or null if the top of the
-     *     document has been reached.
-     */
-    CaretBrowsing.backwards = function(cursor, nodesCrossed) {
-        var previousCursor = cursor.clone();
-        var result = TraverseUtil.backwardsChar(cursor, nodesCrossed);
-
-        // Work around the fact that TraverseUtil.backwardsChar returns once per
-        // char in a block of text, rather than once per possible selection
-        // position in a block of text.
-        if (result &&
-            cursor.node != previousCursor.node &&
-            cursor.index < cursor.text.length) {
-            cursor.index = cursor.text.length;
-        }
-
-        return result;
-    };
-
     CaretBrowsing.move = function(direction, granularity) {
         window
             .getSelection()
@@ -1682,472 +947,6 @@ window._qutebrowser.caret = (function() {
 
     }
 
-    funcs.moveRight = () => {
-        CaretBrowsing.move('right', 'character');
-    }
-
-    funcs.moveLeft = () => {
-        CaretBrowsing.move('left', 'character');
-    }
-
-    funcs.moveDown = () => {
-        CaretBrowsing.move('forward', 'line');
-    }
-
-    funcs.moveUp = () => {
-        CaretBrowsing.move('backward', 'line');
-    }
-
-    funcs.moveToEndOfWord = () => {
-        funcs.moveToNextWord();
-        funcs.moveLeft();
-    }
-
-    funcs.moveToNextWord = () => {
-        CaretBrowsing.move('forward', 'word');
-        funcs.moveRight();
-    }
-
-    funcs.moveToPreviousWord = () => {
-        CaretBrowsing.move('backward', 'word');
-    }
-
-    funcs.moveToStartOfLine = () => {
-        CaretBrowsing.move('left', 'lineboundary');
-    }
-
-    funcs.moveToEndOfLine = () => {
-        CaretBrowsing.move('right', 'lineboundary');
-    }
-
-    funcs.moveToStartOfNextBlock = () => {
-        CaretBrowsing.moveToBlock('forward', 'backward');
-    }
-
-    funcs.moveToStartOfPrevBlock = () => {
-        CaretBrowsing.moveToBlock('backward', 'backward');
-    }
-
-    funcs.moveToEndOfNextBlock = () => {
-        CaretBrowsing.moveToBlock('forward', 'forward');
-    }
-
-    funcs.moveToEndOfPrevBlock = () => {
-        CaretBrowsing.moveToBlock('backward', 'forward');
-    }
-
-    funcs.moveToStartOfDocument = () => {
-        CaretBrowsing.move('backward', 'documentboundary');
-    }
-
-    funcs.moveToEndOfDocument = () => {
-        CaretBrowsing.move('forward', 'documentboundary');
-    }
-
-    funcs.dropSelection = () => {
-        window.getSelection().removeAllRanges();
-    }
-
-    funcs.getSelection = () => {
-        return window.getSelection().toString();
-    }
-
-    funcs.toggleSelection = () => {
-        CaretBrowsing.selectionEnabled = !CaretBrowsing.selectionEnabled;
-    }
-
-    /**
-     * Called when the user presses the right arrow. If there's a selection,
-     * moves the cursor to the end of the selection range. If it's a cursor,
-     * moves past one character.
-     * @param {Event} evt The DOM event.
-     * @return {boolean} True if the default action should be performed.
-     */
-    CaretBrowsing.moveRight = function(evt) {
-        CaretBrowsing.targetX = null;
-
-        var sel = window.getSelection();
-        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
-            var right = CaretBrowsing.makeRightCursor(sel);
-            CaretBrowsing.setAndValidateSelection(right, right);
-            return false;
-        }
-
-        var start = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeLeftCursor(sel) :
-            CaretBrowsing.makeAnchorCursor(sel);
-        var end = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeRightCursor(sel) :
-            CaretBrowsing.makeFocusCursor(sel);
-        var previousEnd = end.clone();
-        var nodesCrossed = [];
-        while (true) {
-            var result;
-            if (CaretBrowsing.isMoveByWordEvent(evt)) {
-                result = TraverseUtil.getNextWord(previousEnd, end, nodesCrossed);
-            } else {
-                previousEnd = end.clone();
-                result = CaretBrowsing.forwards(end, nodesCrossed);
-            }
-
-            if (result === null) {
-                return CaretBrowsing.moveLeft(evt);
-            }
-
-            if (CaretBrowsing.setAndValidateSelection(
-                evt.shiftKey ? start : end, end)) {
-                break;
-            }
-        }
-
-        if (!evt.shiftKey) {
-            nodesCrossed.push(end.node);
-            CaretBrowsing.setFocusToFirstFocusable(nodesCrossed);
-        }
-
-        return false;
-    };
-
-    /**
-     * Called when the user presses the left arrow. If there's a selection,
-     * moves the cursor to the start of the selection range. If it's a cursor,
-     * moves backwards past one character.
-     * @param {Event} evt The DOM event.
-     * @return {boolean} True if the default action should be performed.
-     */
-    CaretBrowsing.moveLeft = function(evt) {
-        CaretBrowsing.targetX = null;
-
-        var sel = window.getSelection();
-        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
-            var left = CaretBrowsing.makeLeftCursor(sel);
-            CaretBrowsing.setAndValidateSelection(left, left);
-            return false;
-        }
-
-        var start = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeLeftCursor(sel) :
-            CaretBrowsing.makeFocusCursor(sel);
-        var end = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeRightCursor(sel) :
-            CaretBrowsing.makeAnchorCursor(sel);
-        var previousStart = start.clone();
-        var nodesCrossed = [];
-        while (true) {
-            var result;
-            if (CaretBrowsing.isMoveByWordEvent(evt)) {
-                result = TraverseUtil.getPreviousWord(
-                    start, previousStart, nodesCrossed);
-            } else {
-                previousStart = start.clone();
-                result = CaretBrowsing.backwards(start, nodesCrossed);
-            }
-
-            if (result === null) {
-                break;
-            }
-
-            if (CaretBrowsing.setAndValidateSelection(
-                evt.shiftKey ? end : start, start)) {
-                break;
-            }
-        }
-
-        if (!evt.shiftKey) {
-            nodesCrossed.push(start.node);
-            CaretBrowsing.setFocusToFirstFocusable(nodesCrossed);
-        }
-
-        return false;
-    };
-
-
-    /**
-     * Called when the user presses the down arrow. If there's a selection,
-     * moves the cursor to the end of the selection range. If it's a cursor,
-     * attempts to move to the equivalent horizontal pixel position in the
-     * subsequent line of text. If this is impossible, go to the first character
-     * of the next line.
-     * @param {Event} evt The DOM event.
-     * @return {boolean} True if the default action should be performed.
-     */
-    CaretBrowsing.moveDown = function(evt) {
-        var sel = window.getSelection();
-        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
-            var right = CaretBrowsing.makeRightCursor(sel);
-            CaretBrowsing.setAndValidateSelection(right, right);
-            return false;
-        }
-
-        var start = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeLeftCursor(sel) :
-            CaretBrowsing.makeAnchorCursor(sel);
-        var end = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeRightCursor(sel) :
-            CaretBrowsing.makeFocusCursor(sel);
-        var endRect = CaretBrowsing.getCursorRect(end);
-        if (CaretBrowsing.targetX === null) {
-            CaretBrowsing.targetX = endRect.left;
-        }
-        var previousEnd = end.clone();
-        var leftPos = end.clone();
-        var rightPos = end.clone();
-        var bestPos = null;
-        var bestY = null;
-        var bestDelta = null;
-        var bestHeight = null;
-        var nodesCrossed = [];
-        var y = -1;
-        while (true) {
-            if (null === CaretBrowsing.forwards(rightPos, nodesCrossed)) {
-                if (CaretBrowsing.setAndValidateSelection(
-                    evt.shiftKey ? start : leftPos, leftPos)) {
-                    break;
-                } else {
-                    return CaretBrowsing.moveLeft(evt);
-                }
-                break;
-            }
-            var range = document.createRange();
-            range.setStart(leftPos.node, leftPos.index);
-            range.setEnd(rightPos.node, rightPos.index);
-            var rect = range.getBoundingClientRect();
-            if (rect && rect.width < rect.height) {
-                y = rect.top + window.pageYOffset;
-
-                // Return the best match so far if we get half a line past the best.
-                if (bestY != null && y > bestY + bestHeight / 2) {
-                    if (CaretBrowsing.setAndValidateSelection(
-                        evt.shiftKey ? start : bestPos, bestPos)) {
-                        break;
-                    } else {
-                        bestY = null;
-                    }
-                }
-
-                // Stop here if we're an entire line the wrong direction
-                // (for example, we reached the top of the next column).
-                if (y < endRect.top - endRect.height) {
-                    if (CaretBrowsing.setAndValidateSelection(
-                        evt.shiftKey ? start : leftPos, leftPos)) {
-                        break;
-                    }
-                }
-
-                // Otherwise look to see if this current position is on the
-                // next line and better than the previous best match, if any.
-                if (y >= endRect.top + endRect.height) {
-                    var deltaLeft = Math.abs(CaretBrowsing.targetX - rect.left);
-                    if ((bestDelta == null || deltaLeft < bestDelta) &&
-                        (leftPos.node != end.node || leftPos.index != end.index)) {
-                        bestPos = leftPos.clone();
-                        bestY = y;
-                        bestDelta = deltaLeft;
-                        bestHeight = rect.height;
-                    }
-                    var deltaRight = Math.abs(CaretBrowsing.targetX - rect.right);
-                    if (bestDelta == null || deltaRight < bestDelta) {
-                        bestPos = rightPos.clone();
-                        bestY = y;
-                        bestDelta = deltaRight;
-                        bestHeight = rect.height;
-                    }
-
-                    // Return the best match so far if the deltas are getting worse,
-                    // not better.
-                    if (bestDelta != null &&
-                        deltaLeft > bestDelta &&
-                        deltaRight > bestDelta) {
-                        if (CaretBrowsing.setAndValidateSelection(
-                            evt.shiftKey ? start : bestPos, bestPos)) {
-                            break;
-                        } else {
-                            bestY = null;
-                        }
-                    }
-                }
-            }
-            leftPos = rightPos.clone();
-        }
-
-        if (!evt.shiftKey) {
-            CaretBrowsing.setFocusToNode(leftPos.node);
-        }
-
-        return false;
-    };
-
-    /**
-     * Called when the user presses the up arrow. If there's a selection,
-     * moves the cursor to the start of the selection range. If it's a cursor,
-     * attempts to move to the equivalent horizontal pixel position in the
-     * previous line of text. If this is impossible, go to the last character
-     * of the previous line.
-     * @param {Event} evt The DOM event.
-     * @return {boolean} True if the default action should be performed.
-     */
-    CaretBrowsing.moveUp = function(evt) {
-        var sel = window.getSelection();
-        if (!evt.shiftKey && !CaretBrowsing.isCollapsed(sel)) {
-            var left = CaretBrowsing.makeLeftCursor(sel);
-            CaretBrowsing.setAndValidateSelection(left, left);
-            return false;
-        }
-
-        var start = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeLeftCursor(sel) :
-            CaretBrowsing.makeFocusCursor(sel);
-        var end = CaretBrowsing.isAmbiguous(sel) ?
-            CaretBrowsing.makeRightCursor(sel) :
-            CaretBrowsing.makeAnchorCursor(sel);
-        var startRect = CaretBrowsing.getCursorRect(start);
-        if (CaretBrowsing.targetX === null) {
-            CaretBrowsing.targetX = startRect.left;
-        }
-        var previousStart = start.clone();
-        var leftPos = start.clone();
-        var rightPos = start.clone();
-        var bestPos = null;
-        var bestY = null;
-        var bestDelta = null;
-        var bestHeight = null;
-        var nodesCrossed = [];
-        var y = 999999;
-        while (true) {
-            if (null === CaretBrowsing.backwards(leftPos, nodesCrossed)) {
-                CaretBrowsing.setAndValidateSelection(
-                    evt.shiftKey ? end : rightPos, rightPos);
-                break;
-            }
-            var range = document.createRange();
-            range.setStart(leftPos.node, leftPos.index);
-            range.setEnd(rightPos.node, rightPos.index);
-            var rect = range.getBoundingClientRect();
-            if (rect && rect.width < rect.height) {
-                y = rect.top + window.pageYOffset;
-
-                // Return the best match so far if we get half a line past the best.
-                if (bestY != null && y < bestY - bestHeight / 2) {
-                    if (CaretBrowsing.setAndValidateSelection(
-                        evt.shiftKey ? end : bestPos, bestPos)) {
-                        break;
-                    } else {
-                        bestY = null;
-                    }
-                }
-
-                // Exit if we're an entire line the wrong direction
-                // (for example, we reached the bottom of the previous column.)
-                if (y > startRect.top + startRect.height) {
-                    if (CaretBrowsing.setAndValidateSelection(
-                        evt.shiftKey ? end : rightPos, rightPos)) {
-                        break;
-                    }
-                }
-
-                // Otherwise look to see if this current position is on the
-                // next line and better than the previous best match, if any.
-                if (y <= startRect.top - startRect.height) {
-                    var deltaLeft = Math.abs(CaretBrowsing.targetX - rect.left);
-                    if (bestDelta == null || deltaLeft < bestDelta) {
-                        bestPos = leftPos.clone();
-                        bestY = y;
-                        bestDelta = deltaLeft;
-                        bestHeight = rect.height;
-                    }
-                    var deltaRight = Math.abs(CaretBrowsing.targetX - rect.right);
-                    if ((bestDelta == null || deltaRight < bestDelta) &&
-                        (rightPos.node != start.node || rightPos.index != start.index)) {
-                        bestPos = rightPos.clone();
-                        bestY = y;
-                        bestDelta = deltaRight;
-                        bestHeight = rect.height;
-                    }
-
-                    // Return the best match so far if the deltas are getting worse,
-                    // not better.
-                    if (bestDelta != null &&
-                        deltaLeft > bestDelta &&
-                        deltaRight > bestDelta) {
-                        if (CaretBrowsing.setAndValidateSelection(
-                            evt.shiftKey ? end : bestPos, bestPos)) {
-                            break;
-                        } else {
-                            bestY = null;
-                        }
-                    }
-                }
-            }
-            rightPos = leftPos.clone();
-        }
-
-        if (!evt.shiftKey) {
-            CaretBrowsing.setFocusToNode(rightPos.node);
-        }
-
-        return false;
-    };
-
-    /**
-     * Set the document's selection to surround a control, so that the next
-     * arrow key they press will allow them to explore the content before
-     * or after a given control.
-     * @param {Node} control The control to escape from.
-     */
-    CaretBrowsing.escapeFromControl = function(control) {
-        control.blur();
-
-        var start = new Cursor(control, 0, '');
-        var previousStart = start.clone();
-        var end = new Cursor(control, 0, '');
-        var previousEnd = end.clone();
-
-        var nodesCrossed = [];
-        while (true) {
-            if (null === CaretBrowsing.backwards(start, nodesCrossed)) {
-                break;
-            }
-
-            var r = document.createRange();
-            r.setStart(start.node, start.index);
-            r.setEnd(previousStart.node, previousStart.index);
-            if (r.getBoundingClientRect()) {
-                break;
-            }
-            previousStart = start.clone();
-        }
-        while (true) {
-            if (null === CaretBrowsing.forwards(end, nodesCrossed)) {
-                break;
-            }
-            if (isDescendantOfNode(end.node, control)) {
-                previousEnd = end.clone();
-                continue;
-            }
-
-            var r = document.createRange();
-            r.setStart(previousEnd.node, previousEnd.index);
-            r.setEnd(end.node, end.index);
-            if (r.getBoundingClientRect()) {
-                break;
-            }
-        }
-
-        if (!isDescendantOfNode(previousStart.node, control)) {
-            start = previousStart.clone();
-        }
-
-        if (!isDescendantOfNode(previousEnd.node, control)) {
-            end = previousEnd.clone();
-        }
-
-        CaretBrowsing.setAndValidateSelection(start, end);
-
-        window.setTimeout(function() {
-            CaretBrowsing.updateCaretOrSelection(true);
-        }, 0);
-    };
-
     /**
      * Toggle whether caret browsing is enabled or not.
      */
@@ -2163,70 +962,6 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.updateIsCaretVisible();
     };
 
-    /**
-     * Event handler, called when a key is pressed.
-     * @param {Event} evt The DOM event.
-     * @return {boolean} True if the default action should be performed.
-     */
-    CaretBrowsing.onKeyDown = function(evt) {
-        if (!CaretBrowsing.isEnabled) {
-            return true;
-        }
-
-        evt.shiftKey = CaretBrowsing.selectionEnabled;
-        if (evt.target && CaretBrowsing.isControlThatNeedsArrowKeys(
-            /** @type (Node) */(evt.target))) {
-            if (evt.keyCode == 27) {
-                CaretBrowsing.escapeFromControl(/** @type {Node} */(evt.target));
-                return false;
-            } else {
-                return true;
-            }
-        }
-
-        // If the current selection doesn't have a range, try to escape out of
-        // the current control. If that fails, return so we don't fail whe
-        // trying to move the cursor or selection.
-        var sel = window.getSelection();
-        if (sel.rangeCount == 0) {
-            if (document.activeElement) {
-                CaretBrowsing.escapeFromControl(document.activeElement);
-                sel = window.getSelection();
-            }
-
-            if (sel.rangeCount == 0) {
-                return true;
-            }
-        }
-
-        if (CaretBrowsing.caretElement) {
-            CaretBrowsing.caretElement.style.visibility = 'visible';
-            CaretBrowsing.blinkFlag = true;
-        }
-
-        var result = true;
-        switch (evt.keyCode) {
-            case 37:
-                result = CaretBrowsing.moveLeft(evt);
-                break;
-            case 38:
-                result = CaretBrowsing.moveUp(evt);
-                break;
-            case 39:
-                result = CaretBrowsing.moveRight(evt);
-                break;
-            case 40:
-                result = CaretBrowsing.moveDown(evt);
-                break;
-        }
-
-        window.setTimeout(function() {
-            CaretBrowsing.updateCaretOrSelection(result == false);
-        }, 0);
-
-        return result;
-    };
-
     /**
      * Event handler, called when the mouse is clicked. Chrome already
      * sets the selection when the mouse is clicked, all we need to do is
@@ -2314,7 +1049,6 @@ window._qutebrowser.caret = (function() {
     CaretBrowsing.init = function() {
         CaretBrowsing.isWindowFocused = document.hasFocus();
 
-        // document.addEventListener('keydown', CaretBrowsing.onKeyDown, false);
         document.addEventListener('click', CaretBrowsing.onClick, false);
         window.addEventListener('focus', CaretBrowsing.onWindowFocus, false);
         window.addEventListener('blur', CaretBrowsing.onWindowBlur, false);
@@ -2340,13 +1074,13 @@ window._qutebrowser.caret = (function() {
     function isElementInViewport(node) {  // eslint-disable-line complexity
         let i;
         let boundingRect = (node.getClientRects()[0] ||
-                            node.getBoundingClientRect());
+            node.getBoundingClientRect());
 
         if (boundingRect.width <= 1 && boundingRect.height <= 1) {
             const rects = node.getClientRects();
             for (i = 0; i < rects.length; i++) {
                 if (rects[i].width > rects[0].height &&
-                        rects[i].height > rects[0].height) {
+                    rects[i].height > rects[0].height) {
                     boundingRect = rects[i];
                 }
             }
@@ -2362,7 +1096,7 @@ window._qutebrowser.caret = (function() {
             let visibleChildNode = false;
             for (i = 0; i < children.length; ++i) {
                 boundingRect = (children[i].getClientRects()[0] ||
-                                children[i].getBoundingClientRect());
+                    children[i].getBoundingClientRect());
                 if (boundingRect.width > 1 && boundingRect.height > 1) {
                     visibleChildNode = true;
                     break;
@@ -2373,20 +1107,157 @@ window._qutebrowser.caret = (function() {
             }
         }
         if (boundingRect.top + boundingRect.height < 10 ||
-                boundingRect.left + boundingRect.width < -10) {
+            boundingRect.left + boundingRect.width < -10) {
             return null;
         }
         const computedStyle = window.getComputedStyle(node, null);
         if (computedStyle.visibility !== "visible" ||
-                computedStyle.display === "none" ||
-                node.hasAttribute("disabled") ||
-                parseInt(computedStyle.width, 10) === 0 ||
-                parseInt(computedStyle.height, 10) === 0) {
+            computedStyle.display === "none" ||
+            node.hasAttribute("disabled") ||
+            parseInt(computedStyle.width, 10) === 0 ||
+            parseInt(computedStyle.height, 10) === 0) {
             return null;
         }
         return boundingRect.top >= -20;
     }
 
+    function positionCaret() {
+        const walker = document.createTreeWalker(document.body, -1);
+        let node;
+        const textNodes = [];
+        let el;
+        while ((node = walker.nextNode())) {
+            if (node.nodeType === 3 && node.nodeValue.trim() !== "") {
+                textNodes.push(node);
+            }
+        }
+        for (let i = 0; i < textNodes.length; i++) {
+            const element = textNodes[i].parentElement;
+            if (isElementInViewport(element)) {
+                el = element;
+                break;
+            }
+        }
+        if (el !== undefined) {
+            var start = new Cursor(el, 0, '');
+            var end = new Cursor(el, 0, '');
+            var nodesCrossed = [];
+            var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
+            if (result == null) {
+                return;
+            }
+            CaretBrowsing.setAndValidateSelection(start, start);
+        }
+    }
+
+    function isFocusable(targetNode) {
+        if (!targetNode || typeof(targetNode.tabIndex) != 'number') {
+            return false;
+        }
+
+        if (targetNode.tabIndex >= 0) {
+            return true;
+        }
+
+        if (targetNode.hasAttribute &&
+            targetNode.hasAttribute('tabindex') &&
+            targetNode.getAttribute('tabindex') == '-1') {
+            return true;
+        }
+
+        return false;
+    }
+
+    const funcs = {};
+
+    funcs.setInitialCursor = () => {
+        if (!CaretBrowsing.initiated) {
+            CaretBrowsing.setInitialCursor();
+        } else {
+            if (!window.getSelection().toString()) {
+                positionCaret();
+            }
+            CaretBrowsing.toggle();
+        }
+    }
+
+    funcs.toggle = () => {
+        CaretBrowsing.toggle();
+    }
+
+    funcs.moveRight = () => {
+        CaretBrowsing.move('right', 'character');
+    }
+
+    funcs.moveLeft = () => {
+        CaretBrowsing.move('left', 'character');
+    }
+
+    funcs.moveDown = () => {
+        CaretBrowsing.move('forward', 'line');
+    }
+
+    funcs.moveUp = () => {
+        CaretBrowsing.move('backward', 'line');
+    }
+
+    funcs.moveToEndOfWord = () => {
+        funcs.moveToNextWord();
+        funcs.moveLeft();
+    }
+
+    funcs.moveToNextWord = () => {
+        CaretBrowsing.move('forward', 'word');
+        funcs.moveRight();
+    }
+
+    funcs.moveToPreviousWord = () => {
+        CaretBrowsing.move('backward', 'word');
+    }
+
+    funcs.moveToStartOfLine = () => {
+        CaretBrowsing.move('left', 'lineboundary');
+    }
+
+    funcs.moveToEndOfLine = () => {
+        CaretBrowsing.move('right', 'lineboundary');
+    }
+
+    funcs.moveToStartOfNextBlock = () => {
+        CaretBrowsing.moveToBlock('forward', 'backward');
+    }
+
+    funcs.moveToStartOfPrevBlock = () => {
+        CaretBrowsing.moveToBlock('backward', 'backward');
+    }
+
+    funcs.moveToEndOfNextBlock = () => {
+        CaretBrowsing.moveToBlock('forward', 'forward');
+    }
+
+    funcs.moveToEndOfPrevBlock = () => {
+        CaretBrowsing.moveToBlock('backward', 'forward');
+    }
+
+    funcs.moveToStartOfDocument = () => {
+        CaretBrowsing.move('backward', 'documentboundary');
+    }
+
+    funcs.moveToEndOfDocument = () => {
+        CaretBrowsing.move('forward', 'documentboundary');
+    }
+
+    funcs.dropSelection = () => {
+        window.getSelection().removeAllRanges();
+    }
+
+    funcs.getSelection = () => {
+        return window.getSelection().toString();
+    }
+
+    funcs.toggleSelection = () => {
+        CaretBrowsing.selectionEnabled = !CaretBrowsing.selectionEnabled;
+    }
 
     return funcs;
 })();

From 4eda328a61713d4a6d9c52fa5c3e272596669c2e Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 30 Nov 2017 20:38:38 +0600
Subject: [PATCH 010/229] Fix some lint warnings. Enable caret tests

---
 qutebrowser/browser/browsertab.py             |  2 +-
 qutebrowser/browser/commands.py               | 21 +++++-----
 qutebrowser/browser/webengine/webenginetab.py | 41 ++++++++++---------
 qutebrowser/javascript/webengine_caret.js     |  3 +-
 tests/end2end/features/test_caret_bdd.py      |  5 ---
 5 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 827d11761..1498097b1 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -392,7 +392,7 @@ class AbstractCaret(QObject):
     def has_selection(self):
         raise NotImplementedError
 
-    def selection(self, html=False, selection=None):
+    def selection(self, html=False, callback=None):
         raise NotImplementedError
 
     def follow_selected(self, *, tab=False):
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 5a0108b1b..476bf1693 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -839,9 +839,9 @@ class CommandDispatcher:
             keep: Stay in visual mode after yanking the selection.
         """
         self.yank_object = {
-                'sel': sel,
-                'what': what,
-                'keep': keep
+            'sel': sel,
+            'what': what,
+            'keep': keep
         }
         if what == 'title':
             s = self._tabbed_browser.page_title(self._current_index())
@@ -877,7 +877,8 @@ class CommandDispatcher:
 
         utils.set_clipboard(s, selection=self.yank_object['sel'])
         if self.yank_object['what'] != 'selection':
-            message.info("Yanked {} to {}: {}".format(self.yank_object['what'], target, s))
+            message.info("Yanked {} to {}: {}".format(
+                self.yank_object['what'], target, s))
         else:
             message.info("{} {} yanked to {}".format(
                 len(s), "char" if len(s) == 1 else "chars", target))
@@ -1222,9 +1223,9 @@ class CommandDispatcher:
             # until it fixed or blocked async call implemented:
             # https://github.com/qutebrowser/qutebrowser/issues/3327
             self.userscript_object = {
-                    'cmd': cmd,
-                    'args': args,
-                    'verbose': verbose
+                'cmd': cmd,
+                'args': args,
+                'verbose': verbose
             }
             caret = self._current_widget().caret
             caret.selection(False, self._selection_callback)
@@ -1279,9 +1280,9 @@ class CommandDispatcher:
             env['QUTE_URL'] = url.toString(QUrl.FullyEncoded)
 
         try:
-            userscripts.run_async(tab, self.userscript_object['cmd'], 
-                    *self.userscript_object['args'], win_id=self._win_id, 
-                    env=env, verbose=self.userscript_object['verbose'])
+            userscripts.run_async(tab, self.userscript_object['cmd'],
+                *self.userscript_object['args'], win_id=self._win_id,
+                env=env, verbose=self.userscript_object['verbose'])
         except userscripts.Error as e:
             raise cmdexc.CommandError(e)
         finally:
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 243a711e0..8f71d5b1c 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -180,91 +180,91 @@ class WebEngineCaret(browsertab.AbstractCaret):
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_entered(self, mode):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'setInitialCursor'))
+            javascript.assemble('caret', 'setInitialCursor'))
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'toggle'))
+            javascript.assemble('caret', 'toggle'))
 
     def move_to_next_line(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveDown'))
+                javascript.assemble('caret', 'moveDown'))
 
     def move_to_prev_line(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveUp'))
+                javascript.assemble('caret', 'moveUp'))
 
     def move_to_next_char(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveRight'))
+                javascript.assemble('caret', 'moveRight'))
 
     def move_to_prev_char(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveLeft'))
+                javascript.assemble('caret', 'moveLeft'))
 
     def move_to_end_of_word(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToEndOfWord'))
+                javascript.assemble('caret', 'moveToEndOfWord'))
 
     def move_to_next_word(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToNextWord'))
+                javascript.assemble('caret', 'moveToNextWord'))
 
     def move_to_prev_word(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToPreviousWord'))
+                javascript.assemble('caret', 'moveToPreviousWord'))
 
     def move_to_start_of_line(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToStartOfLine'))
+            javascript.assemble('caret', 'moveToStartOfLine'))
 
     def move_to_end_of_line(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfLine'))
+            javascript.assemble('caret', 'moveToEndOfLine'))
 
     def move_to_start_of_next_block(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToStartOfNextBlock'))
+                javascript.assemble('caret', 'moveToStartOfNextBlock'))
 
     def move_to_start_of_prev_block(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToStartOfPrevBlock'))
+                javascript.assemble('caret', 'moveToStartOfPrevBlock'))
 
     def move_to_end_of_next_block(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToEndOfNextBlock'))
+                javascript.assemble('caret', 'moveToEndOfNextBlock'))
 
     def move_to_end_of_prev_block(self, count=1):
         for _ in range(count):
             self._tab.run_js_async(
-                    javascript.assemble('caret', 'moveToEndOfPrevBlock'))
+                javascript.assemble('caret', 'moveToEndOfPrevBlock'))
 
     def move_to_start_of_document(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToStartOfDocument'))
+            javascript.assemble('caret', 'moveToStartOfDocument'))
 
     def move_to_end_of_document(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfDocument'))
+            javascript.assemble('caret', 'moveToEndOfDocument'))
 
     def toggle_selection(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'toggleSelection'))
+            javascript.assemble('caret', 'toggleSelection'))
 
     def drop_selection(self):
         self._tab.run_js_async(
-                javascript.assemble('caret', 'dropSelection'))
+            javascript.assemble('caret', 'dropSelection'))
 
     def has_selection(self):
         if qtutils.version_check('5.10'):
@@ -283,7 +283,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
             # WORKAROUND for
             # https://bugreports.qt.io/browse/QTBUG-53134
             self._tab.run_js_async(
-                    'window.getSelection().toString()', callback)
+                'window.getSelection().toString()', callback)
             self.drop_selection()
 
     def _follow_selected_cb(self, js_elem, tab=False):
@@ -328,6 +328,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
             self._tab.run_js_async(js_code, lambda jsret:
                                    self._follow_selected_cb(jsret, tab))
 
+
 class WebEngineScroller(browsertab.AbstractScroller):
 
     """QtWebEngine implementations related to scrolling."""
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 4510b13f3..8390174a5 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,8 +1,7 @@
 "use strict";
 
 window._qutebrowser.caret = (function() {
-
-    var axs = {};
+    const axs = {};
 
     axs.dom = {};
 
diff --git a/tests/end2end/features/test_caret_bdd.py b/tests/end2end/features/test_caret_bdd.py
index 9e4e1dedd..97b18434b 100644
--- a/tests/end2end/features/test_caret_bdd.py
+++ b/tests/end2end/features/test_caret_bdd.py
@@ -23,9 +23,4 @@ import pytest_bdd as bdd
 # pylint: disable=unused-import
 from end2end.features.test_yankpaste_bdd import init_fake_clipboard
 
-
-pytestmark = pytest.mark.qtwebengine_todo("Caret mode is not implemented",
-                                          run=False)
-
-
 bdd.scenarios('caret.feature')

From ed1d036077a9d86f901ae3b5253d16feab76352c Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Wed, 6 Dec 2017 12:11:06 +0600
Subject: [PATCH 011/229] Fix eslint warnings

used some eslint ignore comments
---
 qutebrowser/javascript/webengine_caret.js | 2047 ++++++++++-----------
 1 file changed, 926 insertions(+), 1121 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 8390174a5..e6f71d44f 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,1075 +1,6 @@
-"use strict";
-
-window._qutebrowser.caret = (function() {
-    const axs = {};
-
-    axs.dom = {};
-
-    axs.color = {};
-
-    axs.utils = {};
-
-    axs.dom.parentElement = function(a) {
-        if (!a) {
-            return null;
-        }
-        a = axs.dom.composedParentNode(a);
-        if (!a) {
-            return null;
-        }
-        switch(a.nodeType) {
-            case Node.ELEMENT_NODE:
-                return a;
-            default:
-                return axs.dom.parentElement(a);
-        }
-    };
-
-    axs.dom.shadowHost = function(a) {
-        return "host" in a ? a.host : null;
-    };
-
-    axs.dom.composedParentNode = function(a) {
-        if (!a) {
-            return null;
-        }
-        if (a.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
-            return axs.dom.shadowHost(a);
-        }
-        var b = a.parentNode;
-        if (!b) {
-            return null;
-        }
-        if (b.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
-            return axs.dom.shadowHost(b);
-        }
-        if (!b.shadowRoot) {
-            return b;
-        }
-        a = a.getDestinationInsertionPoints();
-        return 0 < a.length ? axs.dom.composedParentNode(a[a.length - 1]) : null;
-    };
-
-    axs.color.Color = function(a, b, c, d) {
-        this.red = a;
-        this.green = b;
-        this.blue = c;
-        this.alpha = d;
-    };
-
-    axs.color.parseColor = function(a) {
-        if ("transparent" === a) {
-            return new axs.color.Color(0, 0, 0, 0);
-        }
-        var b = a.match(/^rgb\((\d+), (\d+), (\d+)\)$/);
-        if (b) {
-            a = parseInt(b[1], 10);
-            var c = parseInt(b[2], 10), d = parseInt(b[3], 10);
-            return new axs.color.Color(a, c, d, 1);
-        }
-        return (b = a.match(/^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/)) ? (a = parseInt(b[1], 10), c = parseInt(b[2], 10), d = parseInt(b[3], 10), b = parseFloat(b[4]), new axs.color.Color(a, c, d, b)) : null;
-    };
-
-    axs.color.flattenColors = function(a, b) {
-        var c = a.alpha;
-        return new axs.color.Color((1 - c) * b.red + c * a.red, (1 - c) * b.green + c * a.green, (1 - c) * b.blue + c * a.blue, a.alpha + b.alpha * (1 - a.alpha));
-    };
-
-    axs.utils.getParentBgColor = function(a) {
-        var b = a;
-        a = [];
-        for (var c = null;b = axs.dom.parentElement(b);) {
-            var d = window.getComputedStyle(b, null);
-            if (d) {
-                var e = axs.color.parseColor(d.backgroundColor);
-                if (e && (1 > d.opacity && (e.alpha *= d.opacity), 0 != e.alpha && (a.push(e), 1 == e.alpha))) {
-                    c = !0;
-                    break;
-                }
-            }
-        }
-        c || a.push(new axs.color.Color(255, 255, 255, 1));
-        for (b = a.pop();a.length;) {
-            c = a.pop(), b = axs.color.flattenColors(c, b);
-        }
-        return b;
-    };
-
-    axs.utils.getFgColor = function(a, b, c) {
-        var d = axs.color.parseColor(a.color);
-        if (!d) {
-            return null;
-        }
-        1 > d.alpha && (d = axs.color.flattenColors(d, c));
-        1 > a.opacity && (b = axs.utils.getParentBgColor(b), d.alpha *= a.opacity, d = axs.color.flattenColors(d, b));
-        return d;
-    };
-
-    axs.utils.getBgColor = function(a, b) {
-        var c = axs.color.parseColor(a.backgroundColor);
-        if (!c) {
-            return null;
-        }
-        1 > a.opacity && (c.alpha *= a.opacity);
-        if (1 > c.alpha) {
-            var d = axs.utils.getParentBgColor(b);
-            if (null == d) {
-                return null;
-            }
-            c = axs.color.flattenColors(c, d);
-        }
-        return c;
-    };
-
-    axs.color.colorChannelToString = function(a) {
-        a = Math.round(a);
-        return 15 >= a ? "0" + a.toString(16) : a.toString(16);
-    };
-
-    axs.color.colorToString = function(a) {
-        return 1 == a.alpha ? "#" + axs.color.colorChannelToString(a.red) + axs.color.colorChannelToString(a.green) + axs.color.colorChannelToString(a.blue) : "rgba(" + [a.red, a.green, a.blue, a.alpha].join() + ")";
-    };
-
-    var Cursor = function(node, index, text) {
-        this.node = node;
-        this.index = index;
-        this.text = text;
-    };
-
-    /**
-     * @return {Cursor} A new cursor pointing to the same location.
-     */
-    Cursor.prototype.clone = function() {
-        return new Cursor(this.node, this.index, this.text);
-    };
-
-    /**
-     * Modify this cursor to point to the location that another cursor points to.
-     * @param {Cursor} otherCursor The cursor to copy from.
-     */
-    Cursor.prototype.copyFrom = function(otherCursor) {
-        this.node = otherCursor.node;
-        this.index = otherCursor.index;
-        this.text = otherCursor.text;
-    };
-
-    var TraverseUtil = function() {};
-
-    TraverseUtil.getNodeText = function(node) {
-        if (node.constructor == Text) {
-            return node.data;
-        } else {
-            return '';
-        }
-    };
-
-    /**
-     * Return true if a node should be treated as a leaf node, because
-     * its children are properties of the object that shouldn't be traversed.
-     *
-     * TODO(dmazzoni): replace this with a predicate that detects nodes with
-     * ARIA roles and other objects that have their own description.
-     * For now we just detect a couple of common cases.
-     *
-     * @param {Node} node A DOM node.
-     * @return {boolean} True if the node should be treated as a leaf node.
-     */
-    TraverseUtil.treatAsLeafNode = function(node) {
-        return node.childNodes.length == 0 ||
-            node.nodeName == 'SELECT' ||
-            node.nodeName == 'OBJECT';
-    };
-
-    /**
-     * Return true only if a single character is whitespace.
-     * From https://developer.mozilla.org/en/Whitespace_in_the_DOM,
-     * whitespace is defined as one of the characters
-     *  "\t" TAB \u0009
-     *  "\n" LF  \u000A
-     *  "\r" CR  \u000D
-     *  " "  SPC \u0020.
-     *
-     * @param {string} c A string containing a single character.
-     * @return {boolean} True if the character is whitespace, otherwise false.
-     */
-    TraverseUtil.isWhitespace = function(c) {
-        return (c == ' ' || c == '\n' || c == '\r' || c == '\t');
-    };
-
-    /**
-     * Use the computed CSS style to figure out if this DOM node is currently
-     * visible.
-     * @param {Node} node A HTML DOM node.
-     * @return {boolean} Whether or not the html node is visible.
-     */
-    TraverseUtil.isVisible = function(node) {
-        if (!node.style)
-            return true;
-        var style = window.getComputedStyle(/** @type {Element} */(node), null);
-        return (!!style && style.display != 'none' && style.visibility != 'hidden');
-    };
-
-    /**
-     * Use the class name to figure out if this DOM node should be traversed.
-     * @param {Node} node A HTML DOM node.
-     * @return {boolean} Whether or not the html node should be traversed.
-     */
-    TraverseUtil.isSkipped = function(node) {
-        if (node.constructor == Text)
-            node = node.parentElement;
-        if (node.className == 'CaretBrowsing_Caret' ||
-            node.className == 'CaretBrowsing_AnimateCaret') {
-            return true;
-        }
-        return false;
-    };
-
-    /**
-     * Moves the cursor forwards until it has crossed exactly one character.
-     * @param {Cursor} cursor The cursor location where the search should start.
-     *     On exit, the cursor will be immediately to the right of the
-     *     character returned.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @return {?string} The character found, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.forwardsChar = function(cursor, nodesCrossed) {
-        while (true) {
-            // Move down until we get to a leaf node.
-            var childNode = null;
-            if (!TraverseUtil.treatAsLeafNode(cursor.node)) {
-                for (var i = cursor.index; i < cursor.node.childNodes.length; i++) {
-                    var node = cursor.node.childNodes[i];
-                    if (TraverseUtil.isSkipped(node)) {
-                        nodesCrossed.push(node);
-                        continue;
-                    }
-                    if (TraverseUtil.isVisible(node)) {
-                        childNode = node;
-                        break;
-                    }
-                }
-            }
-            if (childNode) {
-                cursor.node = childNode;
-                cursor.index = 0;
-                cursor.text = TraverseUtil.getNodeText(cursor.node);
-                if (cursor.node.constructor != Text) {
-                    nodesCrossed.push(cursor.node);
-                }
-                continue;
-            }
-
-            // Return the next character from this leaf node.
-            if (cursor.index < cursor.text.length)
-                return cursor.text[cursor.index++];
-
-            // Move to the next sibling, going up the tree as necessary.
-            while (cursor.node != null) {
-                // Try to move to the next sibling.
-                var siblingNode = null;
-                for (var node = cursor.node.nextSibling;
-                    node != null;
-                    node = node.nextSibling) {
-                    if (TraverseUtil.isSkipped(node)) {
-                        nodesCrossed.push(node);
-                        continue;
-                    }
-                    if (TraverseUtil.isVisible(node)) {
-                        siblingNode = node;
-                        break;
-                    }
-                }
-                if (siblingNode) {
-                    cursor.node = siblingNode;
-                    cursor.text = TraverseUtil.getNodeText(siblingNode);
-                    cursor.index = 0;
-
-                    if (cursor.node.constructor != Text) {
-                        nodesCrossed.push(cursor.node);
-                    }
-
-                    break;
-                }
-
-                // Otherwise, move to the parent.
-                if (cursor.node.parentNode &&
-                    cursor.node.parentNode.constructor != HTMLBodyElement) {
-                    cursor.node = cursor.node.parentNode;
-                    cursor.text = null;
-                    cursor.index = 0;
-                } else {
-                    return null;
-                }
-            }
-        }
-    };
-
-    /**
-     * Finds the next character, starting from endCursor.  Upon exit, startCursor
-     * and endCursor will surround the next character. If skipWhitespace is
-     * true, will skip until a real character is found. Otherwise, it will
-     * attempt to select all of the whitespace between the initial position
-     * of endCursor and the next non-whitespace character.
-     * @param {Cursor} startCursor On exit, points to the position before
-     *     the char.
-     * @param {Cursor} endCursor The position to start searching for the next
-     *     char.  On exit, will point to the position past the char.
-     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
-     *     initial and final cursor position will be pushed onto this array.
-     * @param {boolean} skipWhitespace If true, will keep scanning until a
-     *     non-whitespace character is found.
-     * @return {?string} The next char, or null if the bottom of the
-     *     document has been reached.
-     */
-    TraverseUtil.getNextChar = function(
-        startCursor, endCursor, nodesCrossed, skipWhitespace) {
-
-        // Save the starting position and get the first character.
-        startCursor.copyFrom(endCursor);
-        var c = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
-        if (c == null)
-        return null;
-
-        // Keep track of whether the first character was whitespace.
-        var initialWhitespace = TraverseUtil.isWhitespace(c);
-
-        // Keep scanning until we find a non-whitespace or non-skipped character.
-        while ((TraverseUtil.isWhitespace(c)) ||
-            (TraverseUtil.isSkipped(endCursor.node))) {
-            c = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
-            if (c == null)
-            return null;
-        }
-        if (skipWhitespace || !initialWhitespace) {
-            // If skipWhitepace is true, or if the first character we encountered
-            // was not whitespace, return that non-whitespace character.
-            startCursor.copyFrom(endCursor);
-            startCursor.index--;
-            return c;
-        }
-        else {
-            for (var i = 0; i < nodesCrossed.length; i++) {
-                if (TraverseUtil.isSkipped(nodesCrossed[i])) {
-                    // We need to make sure that startCursor and endCursor aren't
-                    // surrounding a skippable node.
-                    endCursor.index--;
-                    startCursor.copyFrom(endCursor);
-                    startCursor.index--;
-                    return ' ';
-                }
-            }
-            // Otherwise, return all of the whitespace before that last character.
-            endCursor.index--;
-            return ' ';
-        }
-    };
-
-    var CaretBrowsing = function() {};
-
-    /**
-     * Is caret browsing enabled?
-     * @type {boolean}
-     */
-    CaretBrowsing.isEnabled = false;
-
-    /**
-     * Keep it enabled even when flipped off (for the options page)?
-     * @type {boolean}
-     */
-    CaretBrowsing.forceEnabled = false;
-
-    /**
-     * What to do when the caret appears?
-     * @type {string}
-     */
-    CaretBrowsing.onEnable;
-
-    /**
-     * What to do when the caret jumps?
-     * @type {string}
-     */
-    CaretBrowsing.onJump;
-
-    /**
-     * Is this window / iframe focused? We won't show the caret if not,
-     * especially so that carets aren't shown in two iframes of the same
-     * tab.
-     * @type {boolean}
-     */
-    CaretBrowsing.isWindowFocused = false;
-
-    /**
-     * Is the caret actually visible? This is true only if isEnabled and
-     * isWindowFocused are both true.
-     * @type {boolean}
-     */
-    CaretBrowsing.isCaretVisible = false;
-
-    /**
-     * The actual caret element, an absolute-positioned flashing line.
-     * @type {Element}
-     */
-    CaretBrowsing.caretElement;
-
-    /**
-     * The x-position of the caret, in absolute pixels.
-     * @type {number}
-     */
-    CaretBrowsing.caretX = 0;
-
-    /**
-     * The y-position of the caret, in absolute pixels.
-     * @type {number}
-     */
-    CaretBrowsing.caretY = 0;
-
-    /**
-     * The width of the caret in pixels.
-     * @type {number}
-     */
-    CaretBrowsing.caretWidth = 0;
-
-    /**
-     * The height of the caret in pixels.
-     * @type {number}
-     */
-    CaretBrowsing.caretHeight = 0;
-
-    /**
-     * The foregroundc color.
-     * @type {string}
-     */
-    CaretBrowsing.caretForeground = '#000';
-
-    /**
-     * The backgroundc color.
-     * @type {string}
-     */
-    CaretBrowsing.caretBackground = '#fff';
-
-    /**
-     * Is the selection collapsed, i.e. are the start and end locations
-     * the same? If so, our blinking caret image is shown; otherwise
-     * the Chrome selection is shown.
-     * @type {boolean}
-     */
-    CaretBrowsing.isSelectionCollapsed = false;
-
-    /**
-     * The id returned by window.setInterval for our blink function, so
-     * we can cancel it when caret browsing is disabled.
-     * @type {number?}
-     */
-    CaretBrowsing.blinkFunctionId = null;
-
-    /**
-     * The desired x-coordinate to match when moving the caret up and down.
-     * To match the behavior as documented in Mozilla's caret browsing spec
-     * (http://www.mozilla.org/access/keyboard/proposal), we keep track of the
-     * initial x position when the user starts moving the caret up and down,
-     * so that the x position doesn't drift as you move throughout lines, but
-     * stays as close as possible to the initial position. This is reset when
-     * moving left or right or clicking.
-     * @type {number?}
-     */
-    CaretBrowsing.targetX = null;
-
-    /**
-     * A flag that flips on or off as the caret blinks.
-     * @type {boolean}
-     */
-    CaretBrowsing.blinkFlag = true;
-
-    /**
-     * Check if a node is a control that normally allows the user to interact
-     * with it using arrow keys. We won't override the arrow keys when such a
-     * control has focus, the user must press Escape to do caret browsing outside
-     * that control.
-     * @param {Node} node A node to check.
-     * @return {boolean} True if this node is a control that the user can
-     *     interact with using arrow keys.
-     */
-    CaretBrowsing.isControlThatNeedsArrowKeys = function(node) {
-        if (!node) {
-            return false;
-        }
-
-        if (node == document.body || node != document.activeElement) {
-            return false;
-        }
-
-        if (node.constructor == HTMLSelectElement) {
-            return true;
-        }
-
-        if (node.constructor == HTMLInputElement) {
-            switch (node.type) {
-                case 'email':
-                case 'number':
-                case 'password':
-                case 'search':
-                case 'text':
-                case 'tel':
-                case 'url':
-                case '':
-                    return true;  // All of these are text boxes.
-                case 'datetime':
-                case 'datetime-local':
-                case 'date':
-                case 'month':
-                case 'radio':
-                case 'range':
-                case 'week':
-                    return true;  // These are other input elements that use arrows.
-            }
-        }
-
-        // Handle focusable ARIA controls.
-        if (node.getAttribute && isFocusable(node)) {
-            var role = node.getAttribute('role');
-            switch (role) {
-                case 'combobox':
-                case 'grid':
-                case 'gridcell':
-                case 'listbox':
-                case 'menu':
-                case 'menubar':
-                case 'menuitem':
-                case 'menuitemcheckbox':
-                case 'menuitemradio':
-                case 'option':
-                case 'radiogroup':
-                case 'scrollbar':
-                case 'slider':
-                case 'spinbutton':
-                case 'tab':
-                case 'tablist':
-                case 'textbox':
-                case 'tree':
-                case 'treegrid':
-                case 'treeitem':
-                    return true;
-            }
-        }
-
-        return false;
-    };
-
-    CaretBrowsing.injectCaretStyles = function() {
-        var style = '.CaretBrowsing_Caret {' +
-            '  position: absolute;' +
-            '  z-index: 2147483647;' +
-            '  min-height: 10px;' +
-            '  background-color: #000;' +
-            '}' +
-            '.CaretBrowsing_AnimateCaret {' +
-            '  position: absolute;' +
-            '  z-index: 2147483647;' +
-            '  min-height: 10px;' +
-            '}' +
-            '.CaretBrowsing_FlashVert {' +
-            '  position: absolute;' +
-            '  z-index: 2147483647;' +
-            '  background: linear-gradient(' +
-            '      270deg,' +
-            '      rgba(128, 128, 255, 0) 0%,' +
-            '      rgba(128, 128, 255, 0.3) 45%,' +
-            '      rgba(128, 128, 255, 0.8) 50%,' +
-            '      rgba(128, 128, 255, 0.3) 65%,' +
-            '      rgba(128, 128, 255, 0) 100%);' +
-            '}';
-        var node = document.createElement('style');
-        node.innerHTML = style;
-        document.body.appendChild(node);
-    }
-
-    CaretBrowsing.setInitialCursor = function() {
-        var sel = window.getSelection();
-        if (sel.rangeCount > 0) {
-            return;
-        }
-
-        positionCaret();
-        CaretBrowsing.injectCaretStyles();
-        CaretBrowsing.toggle();
-        CaretBrowsing.initiated = true;
-        CaretBrowsing.selectionEnabled = false;
-    };
-
-    /**
-     * Try to set the window's selection to be between the given start and end
-     * cursors, and return whether or not it was successful.
-     * @param {Cursor} start The start position.
-     * @param {Cursor} end The end position.
-     * @return {boolean} True if the selection was successfully set.
-     */
-    CaretBrowsing.setAndValidateSelection = function(start, end) {
-        var sel = window.getSelection();
-        sel.setBaseAndExtent(start.node, start.index, end.node, end.index);
-
-        if (sel.rangeCount != 1) {
-            return false;
-        }
-
-        return (sel.anchorNode == start.node &&
-            sel.anchorOffset == start.index &&
-            sel.focusNode == end.node &&
-            sel.focusOffset == end.index);
-    };
-
-
-    CaretBrowsing.setFocusToNode = function(node) {
-        while (node && node != document.body) {
-            if (isFocusable(node) && node.constructor != HTMLIFrameElement) {
-                node.focus();
-                if (node.constructor == HTMLInputElement && node.select) {
-                    node.select();
-                }
-                return true;
-            }
-            node = node.parentNode;
-        }
-
-        return false;
-    };
-
-    /**
-     * Set the caret element's normal style, i.e. not when animating.
-     */
-    CaretBrowsing.setCaretElementNormalStyle = function() {
-        var element = CaretBrowsing.caretElement;
-        element.className = 'CaretBrowsing_Caret';
-        element.style.opacity = CaretBrowsing.isSelectionCollapsed ? '1.0' : '0.0';
-        element.style.left = CaretBrowsing.caretX + 'px';
-        element.style.top = CaretBrowsing.caretY + 'px';
-        element.style.width = CaretBrowsing.caretWidth + 'px';
-        element.style.height = CaretBrowsing.caretHeight + 'px';
-        element.style.color = CaretBrowsing.caretForeground;
-    };
-
-    /**
-     * Animate the caret element into the normal style.
-     */
-    CaretBrowsing.animateCaretElement = function() {
-        var element = CaretBrowsing.caretElement;
-        element.style.left = (CaretBrowsing.caretX - 50) + 'px';
-        element.style.top = (CaretBrowsing.caretY - 100) + 'px';
-        element.style.width = (CaretBrowsing.caretWidth + 100) + 'px';
-        element.style.height = (CaretBrowsing.caretHeight + 200) + 'px';
-        element.className = 'CaretBrowsing_AnimateCaret';
-
-        // Start the animation. The setTimeout is so that the old values will get
-        // applied first, so we can animate to the new values.
-        window.setTimeout(function() {
-            if (!CaretBrowsing.caretElement) {
-                return;
-            }
-            CaretBrowsing.setCaretElementNormalStyle();
-            element.style['transition'] = 'all 0.8s ease-in';
-            function listener() {
-                element.removeEventListener(
-                    'transitionend', listener, false);
-                element.style['transition'] = 'none';
-            }
-            element.addEventListener(
-                'transitionend', listener, false);
-        }, 0);
-    };
-
-    /**
-     * Quick flash and then show the normal caret style.
-     */
-    CaretBrowsing.flashCaretElement = function() {
-        var x = CaretBrowsing.caretX;
-        var y = CaretBrowsing.caretY;
-        var height = CaretBrowsing.caretHeight;
-
-        var vert = document.createElement('div');
-        vert.className = 'CaretBrowsing_FlashVert';
-        vert.style.left = (x - 6) + 'px';
-        vert.style.top = (y - 100) + 'px';
-        vert.style.width = '11px';
-        vert.style.height = (200) + 'px';
-        document.body.appendChild(vert);
-
-        window.setTimeout(function() {
-            document.body.removeChild(vert);
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.setCaretElementNormalStyle();
-            }
-        }, 250);
-    };
-
-    /**
-     * Create the caret element. This assumes that caretX, caretY,
-     * caretWidth, and caretHeight have all been set. The caret is
-     * animated in so the user can find it when it first appears.
-     */
-    CaretBrowsing.createCaretElement = function() {
-        var element = document.createElement('div');
-        element.className = 'CaretBrowsing_Caret';
-        document.body.appendChild(element);
-        CaretBrowsing.caretElement = element;
-
-        if (CaretBrowsing.onEnable == 'anim') {
-            CaretBrowsing.animateCaretElement();
-        } else if (CaretBrowsing.onEnable == 'flash') {
-            CaretBrowsing.flashCaretElement();
-        } else {
-            CaretBrowsing.setCaretElementNormalStyle();
-        }
-    };
-
-    /**
-     * Recreate the caret element, triggering any intro animation.
-     */
-    CaretBrowsing.recreateCaretElement = function() {
-        if (CaretBrowsing.caretElement) {
-            window.clearInterval(CaretBrowsing.blinkFunctionId);
-            CaretBrowsing.caretElement.parentElement.removeChild(
-                CaretBrowsing.caretElement);
-            CaretBrowsing.caretElement = null;
-            CaretBrowsing.updateIsCaretVisible();
-        }
-    };
-
-    /**
-     * Get the rectangle for a cursor position. This is tricky because
-     * you can't get the bounding rectangle of an empty range, so this function
-     * computes the rect by trying a range including one character earlier or
-     * later than the cursor position.
-     * @param {Cursor} cursor A single cursor position.
-     * @return {{left: number, top: number, width: number, height: number}}
-     *     The bounding rectangle of the cursor.
-     */
-    CaretBrowsing.getCursorRect = function(cursor) {
-        var node = cursor.node;
-        var index = cursor.index;
-        var rect = {
-            left: 0,
-            top: 0,
-            width: 1,
-            height: 0
-        };
-        if (node.constructor == Text) {
-            var left = index;
-            var right = index;
-            var max = node.data.length;
-            var newRange = document.createRange();
-            while (left > 0 || right < max) {
-                if (left > 0) {
-                    left--;
-                    newRange.setStart(node, left);
-                    newRange.setEnd(node, index);
-                    var rangeRect = newRange.getBoundingClientRect();
-                    if (rangeRect && rangeRect.width && rangeRect.height) {
-                        rect.left = rangeRect.right;
-                        rect.top = rangeRect.top;
-                        rect.height = rangeRect.height;
-                        break;
-                    }
-                }
-                if (right < max) {
-                    right++;
-                    newRange.setStart(node, index);
-                    newRange.setEnd(node, right);
-                    var rangeRect = newRange.getBoundingClientRect();
-                    if (rangeRect && rangeRect.width && rangeRect.height) {
-                        rect.left = rangeRect.left;
-                        rect.top = rangeRect.top;
-                        rect.height = rangeRect.height;
-                        break;
-                    }
-                }
-            }
-        } else {
-            rect.height = node.offsetHeight;
-            while (node !== null) {
-                rect.left += node.offsetLeft;
-                rect.top += node.offsetTop;
-                node = node.offsetParent;
-            }
-        }
-        rect.left += window.pageXOffset;
-        rect.top += window.pageYOffset;
-        return rect;
-    };
-
-    /**
-     * Compute the new location of the caret or selection and update
-     * the element as needed.
-     * @param {boolean} scrollToSelection If true, will also scroll the page
-     *     to the caret / selection location.
-     */
-    CaretBrowsing.updateCaretOrSelection = function(scrollToSelection) {
-        var previousX = CaretBrowsing.caretX;
-        var previousY = CaretBrowsing.caretY;
-
-        var sel = window.getSelection();
-        if (sel.rangeCount == 0) {
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.isSelectionCollapsed = false;
-                CaretBrowsing.caretElement.style.opacity = '0.0';
-            }
-            return;
-        }
-
-        var range = sel.getRangeAt(0);
-        if (!range) {
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.isSelectionCollapsed = false;
-                CaretBrowsing.caretElement.style.opacity = '0.0';
-            }
-            return;
-        }
-
-        if (CaretBrowsing.isControlThatNeedsArrowKeys(document.activeElement)) {
-            var node = document.activeElement;
-            CaretBrowsing.caretWidth = node.offsetWidth;
-            CaretBrowsing.caretHeight = node.offsetHeight;
-            CaretBrowsing.caretX = 0;
-            CaretBrowsing.caretY = 0;
-            while (node.offsetParent) {
-                CaretBrowsing.caretX += node.offsetLeft;
-                CaretBrowsing.caretY += node.offsetTop;
-                node = node.offsetParent;
-            }
-            CaretBrowsing.isSelectionCollapsed = false;
-        } else if (range.startOffset != range.endOffset ||
-            range.startContainer != range.endContainer) {
-            var rect = range.getBoundingClientRect();
-            if (!rect) {
-                return;
-            }
-            CaretBrowsing.caretX = rect.left + window.pageXOffset;
-            CaretBrowsing.caretY = rect.top + window.pageYOffset;
-            CaretBrowsing.caretWidth = rect.width;
-            CaretBrowsing.caretHeight = rect.height;
-            CaretBrowsing.isSelectionCollapsed = false;
-        } else {
-            var rect = CaretBrowsing.getCursorRect(
-                new Cursor(range.startContainer,
-                    range.startOffset,
-                    TraverseUtil.getNodeText(range.startContainer)));
-            CaretBrowsing.caretX = rect.left;
-            CaretBrowsing.caretY = rect.top;
-            CaretBrowsing.caretWidth = rect.width;
-            CaretBrowsing.caretHeight = rect.height;
-            CaretBrowsing.isSelectionCollapsed = true;
-        }
-
-        if (!CaretBrowsing.caretElement) {
-            CaretBrowsing.createCaretElement();
-        } else {
-            var element = CaretBrowsing.caretElement;
-            if (CaretBrowsing.isSelectionCollapsed) {
-                element.style.opacity = '1.0';
-                element.style.left = CaretBrowsing.caretX + 'px';
-                element.style.top = CaretBrowsing.caretY + 'px';
-                element.style.width = CaretBrowsing.caretWidth + 'px';
-                element.style.height = CaretBrowsing.caretHeight + 'px';
-            } else {
-                element.style.opacity = '0.0';
-            }
-        }
-
-        var elem = range.startContainer;
-        if (elem.constructor == Text)
-            elem = elem.parentElement;
-        var style = window.getComputedStyle(elem);
-        var bg = axs.utils.getBgColor(style, elem);
-        var fg = axs.utils.getFgColor(style, elem, bg);
-        CaretBrowsing.caretBackground = axs.color.colorToString(bg);
-        CaretBrowsing.caretForeground = axs.color.colorToString(fg);
-
-        if (scrollToSelection) {
-            // Scroll just to the "focus" position of the selection,
-            // the part the user is manipulating.
-            var rect = CaretBrowsing.getCursorRect(
-                new Cursor(sel.focusNode, sel.focusOffset,
-                    TraverseUtil.getNodeText(sel.focusNode)));
-
-            var yscroll = window.pageYOffset;
-            var pageHeight = window.innerHeight;
-            var caretY = rect.top;
-            var caretHeight = Math.min(rect.height, 30);
-            if (yscroll + pageHeight < caretY + caretHeight) {
-                window.scroll(0, (caretY + caretHeight - pageHeight + 100));
-            } else if (caretY < yscroll) {
-                window.scroll(0, (caretY - 100));
-            }
-        }
-
-        if (Math.abs(previousX - CaretBrowsing.caretX) > 500 ||
-            Math.abs(previousY - CaretBrowsing.caretY) > 100) {
-            if (CaretBrowsing.onJump == 'anim') {
-                CaretBrowsing.animateCaretElement();
-            } else if (CaretBrowsing.onJump == 'flash') {
-                CaretBrowsing.flashCaretElement();
-            }
-        }
-    };
-
-    CaretBrowsing.move = function(direction, granularity) {
-        window
-            .getSelection()
-            .modify(
-                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
-                direction,
-                granularity);
-
-        window.setTimeout(function() {
-            CaretBrowsing.updateCaretOrSelection(true);
-        }, 0);
-    }
-
-    CaretBrowsing.moveToBlock = function(paragraph, boundary) {
-        window
-            .getSelection()
-            .modify(
-                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
-                paragraph, 
-                'paragraph');
-
-        window
-            .getSelection()
-            .modify(
-                CaretBrowsing.selectionEnabled ? 'extend' : 'move', 
-                boundary, 
-                'paragraphboundary');
-
-        window.setTimeout(function() {
-            CaretBrowsing.updateCaretOrSelection(true);
-        }, 0);
-
-    }
-
-    /**
-     * Toggle whether caret browsing is enabled or not.
-     */
-    CaretBrowsing.toggle = function() {
-        if (CaretBrowsing.forceEnabled) {
-            CaretBrowsing.recreateCaretElement();
-            return;
-        }
-
-        CaretBrowsing.isEnabled = !CaretBrowsing.isEnabled;
-        var obj = {};
-        obj['enabled'] = CaretBrowsing.isEnabled;
-        CaretBrowsing.updateIsCaretVisible();
-    };
-
-    /**
-     * Event handler, called when the mouse is clicked. Chrome already
-     * sets the selection when the mouse is clicked, all we need to do is
-     * update our cursor.
-     * @param {Event} evt The DOM event.
-     * @return {boolean} True if the default action should be performed.
-     */
-    CaretBrowsing.onClick = function(evt) {
-        if (!CaretBrowsing.isEnabled) {
-            return true;
-        }
-        window.setTimeout(function() {
-            CaretBrowsing.targetX = null;
-            CaretBrowsing.updateCaretOrSelection(false);
-        }, 0);
-        return true;
-    };
-
-    /**
-     * Called at a regular interval. Blink the cursor by changing its visibility.
-     */
-    CaretBrowsing.caretBlinkFunction = function() {
-        if (CaretBrowsing.caretElement) {
-            if (CaretBrowsing.blinkFlag) {
-                CaretBrowsing.caretElement.style.backgroundColor =
-                    CaretBrowsing.caretForeground;
-                CaretBrowsing.blinkFlag = false;
-            } else {
-                CaretBrowsing.caretElement.style.backgroundColor =
-                    CaretBrowsing.caretBackground;
-                CaretBrowsing.blinkFlag = true;
-            }
-        }
-    };
-
-    /**
-     * Update whether or not the caret is visible, based on whether caret browsing
-     * is enabled and whether this window / iframe has focus.
-     */
-    CaretBrowsing.updateIsCaretVisible = function() {
-        CaretBrowsing.isCaretVisible =
-            (CaretBrowsing.isEnabled && CaretBrowsing.isWindowFocused);
-        if (CaretBrowsing.isCaretVisible && !CaretBrowsing.caretElement) {
-            CaretBrowsing.setInitialCursor();
-            CaretBrowsing.updateCaretOrSelection(true);
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.blinkFunctionId = window.setInterval(
-                    CaretBrowsing.caretBlinkFunction, 500);
-            }
-        } else if (!CaretBrowsing.isCaretVisible &&
-            CaretBrowsing.caretElement) {
-            window.clearInterval(CaretBrowsing.blinkFunctionId);
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.isSelectionCollapsed = false;
-                CaretBrowsing.caretElement.parentElement.removeChild(
-                    CaretBrowsing.caretElement);
-                CaretBrowsing.caretElement = null;
-            }
-        }
-    };
-
-    /**
-     * Called when the prefs get updated.
-     */
-    /**
-     * Called when this window / iframe gains focus.
-     */
-    CaretBrowsing.onWindowFocus = function() {
-        CaretBrowsing.isWindowFocused = true;
-        CaretBrowsing.updateIsCaretVisible();
-    };
-
-    /**
-     * Called when this window / iframe loses focus.
-     */
-    CaretBrowsing.onWindowBlur = function() {
-        CaretBrowsing.isWindowFocused = false;
-        CaretBrowsing.updateIsCaretVisible();
-    };
-
-    /**
-     * Initializes caret browsing by adding event listeners and extension
-     * message listeners.
-     */
-    CaretBrowsing.init = function() {
-        CaretBrowsing.isWindowFocused = document.hasFocus();
-
-        document.addEventListener('click', CaretBrowsing.onClick, false);
-        window.addEventListener('focus', CaretBrowsing.onWindowFocus, false);
-        window.addEventListener('blur', CaretBrowsing.onWindowBlur, false);
-    };
-
-    window.setTimeout(function() {
-
-        // Make sure the script only loads once.
-        if (!window['caretBrowsingLoaded']) {
-            window['caretBrowsingLoaded'] = true;
-            CaretBrowsing.init();
-
-            if (document.body.getAttribute('caretbrowsing') == 'on') {
-                CaretBrowsing.forceEnabled = true;
-                CaretBrowsing.isEnabled = true;
-                CaretBrowsing.updateIsCaretVisible();
-            }
-
-        }
-
-    }, 0);
+"use strict"; // eslint-disable-line max-lines
 
+window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,max-len
     function isElementInViewport(node) {  // eslint-disable-line complexity
         let i;
         let boundingRect = (node.getClientRects()[0] ||
@@ -1138,19 +69,20 @@ window._qutebrowser.caret = (function() {
             }
         }
         if (el !== undefined) {
-            var start = new Cursor(el, 0, '');
-            var end = new Cursor(el, 0, '');
-            var nodesCrossed = [];
-            var result = TraverseUtil.getNextChar(start, end, nodesCrossed, true);
-            if (result == null) {
+            const start = new Cursor(el, 0, ""); // eslint-disable-line no-use-before-define,max-len
+            const end = new Cursor(el, 0, ""); // eslint-disable-line no-use-before-define,max-len
+            const nodesCrossed = [];
+            const result = TraverseUtil.getNextChar( // eslint-disable-line no-use-before-define,max-len
+                start, end, nodesCrossed, true);
+            if (result === null) {
                 return;
             }
-            CaretBrowsing.setAndValidateSelection(start, start);
+            CaretBrowsing.setAndValidateSelection(start, start); // eslint-disable-line no-use-before-define,max-len
         }
     }
 
     function isFocusable(targetNode) {
-        if (!targetNode || typeof(targetNode.tabIndex) != 'number') {
+        if (!targetNode || typeof (targetNode.tabIndex) !== "number") {
             return false;
         }
 
@@ -1159,104 +91,977 @@ window._qutebrowser.caret = (function() {
         }
 
         if (targetNode.hasAttribute &&
-            targetNode.hasAttribute('tabindex') &&
-            targetNode.getAttribute('tabindex') == '-1') {
+            targetNode.hasAttribute("tabindex") &&
+            targetNode.getAttribute("tabindex") === "-1") {
             return true;
         }
 
         return false;
     }
 
+    const axs = {};
+
+    axs.dom = {};
+
+    axs.color = {};
+
+    axs.utils = {};
+
+    axs.dom.parentElement = function(node) {
+        if (!node) {
+            return null;
+        }
+        const composedNode = axs.dom.composedParentNode(node);
+        if (!composedNode) {
+            return null;
+        }
+        switch (composedNode.nodeType) {
+        case Node.ELEMENT_NODE:
+            return composedNode;
+        default:
+            return axs.dom.parentElement(composedNode);
+        }
+    };
+
+    axs.dom.shadowHost = function(node) {
+        if ("host" in node) {
+            return node.host;
+        }
+        return null;
+    };
+
+    axs.dom.composedParentNode = function(node) {
+        if (!node) {
+            return null;
+        }
+        if (node.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+            return axs.dom.shadowHost(node);
+        }
+        const parentNode = node.parentNode;
+        if (!parentNode) {
+            return null;
+        }
+        if (parentNode.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
+            return axs.dom.shadowHost(parentNode);
+        }
+        if (!parentNode.shadowRoot) {
+            return parentNode;
+        }
+        const points = node.getDestinationInsertionPoints();
+        if (points.length > 0) {
+            return axs.dom.composedParentNode(points[points.length - 1]);
+        }
+        return null;
+    };
+
+    axs.color.Color = function(red, green, blue, alpha) { // eslint-disable-line max-params,max-len
+        this.red = red;
+        this.green = green;
+        this.blue = blue;
+        this.alpha = alpha;
+    };
+
+    axs.color.parseColor = function(colorText) {
+        if (colorText === "transparent") {
+            return new axs.color.Color(0, 0, 0, 0);
+        }
+        let match = colorText.match(/^rgb\((\d+), (\d+), (\d+)\)$/);
+        if (match) {
+            const blue = parseInt(match[3], 10);
+            const green = parseInt(match[2], 10);
+            const red = parseInt(match[1], 10);
+            return new axs.color.Color(red, green, blue, 1);
+        }
+        match = colorText.match(/^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/);
+        if (match) {
+            const red = parseInt(match[1], 10);
+            const green = parseInt(match[2], 10);
+            const blue = parseInt(match[3], 10);
+            const alpha = parseFloat(match[4]);
+            return new axs.color.Color(red, green, blue, alpha);
+        }
+        return null;
+    };
+
+    axs.color.flattenColors = function(color1, color2) {
+        const colorAlpha = color1.alpha;
+        return new axs.color.Color(
+            ((1 - colorAlpha) * color2.red) + (colorAlpha * color1.red),
+            ((1 - colorAlpha) * color2.green) + (colorAlpha * color1.green),
+            ((1 - colorAlpha) * color2.blue) + (colorAlpha * color2.blue),
+            color1.alpha + (color2.alpha * (1 - color1.alpha)));
+    };
+
+    axs.utils.getParentBgColor = function(_el) {
+        let el = _el;
+        let el2 = el;
+        let iter = null;
+        el = [];
+        for (iter = null; (el2 = axs.dom.parentElement(el2));) {
+            const style = window.getComputedStyle(el2, null);
+            if (style) {
+                const color = axs.color.parseColor(style.backgroundColor);
+                if (color &&
+                    (style.opacity < 1 &&
+                        (color.alpha *= style.opacity),
+                        color.alpha !== 0 &&
+                        (el.push(color), color.alpha === 1))) {
+                    iter = !0;
+                    break;
+                }
+            }
+        }
+        if (!iter) {
+            el.push(new axs.color.Color(255, 255, 255, 1));
+        }
+        for (el2 = el.pop(); el.length;) {
+            iter = el.pop();
+            el2 = axs.color.flattenColors(iter, el2);
+        }
+        return el2;
+    };
+
+    axs.utils.getFgColor = function(el, el2, color) {
+        let color2 = axs.color.parseColor(el.color);
+        if (!color2) {
+            return null;
+        }
+        if (color2.alpha < 1) {
+            color2 = axs.color.flattenColors(color2, color);
+        }
+        if (el.opacity < 1) {
+            const el3 = axs.utils.getParentBgColor(el2);
+            color2.alpha *= el.opacity;
+            color2 = axs.color.flattenColors(color2, el3);
+        }
+        return color2;
+    };
+
+    axs.utils.getBgColor = function(el, elParent) {
+        let color = axs.color.parseColor(el.backgroundColor);
+        if (!color) {
+            return null;
+        }
+        if (el.opacity < 1) {
+            color.alpha *= el.opacity;
+        }
+        if (color.alpha < 1) {
+            const bgColor = axs.utils.getParentBgColor(elParent);
+            if (bgColor === null) {
+                return null;
+            }
+            color = axs.color.flattenColors(color, bgColor);
+        }
+        return color;
+    };
+
+    axs.color.colorChannelToString = function(_color) {
+        const color = Math.round(_color);
+        if (color < 15) {
+            return `0${color.toString(16)}`;
+        }
+        return color.toString(16);
+    };
+
+    axs.color.colorToString = function(color) {
+        if (color.alpha === 1) {
+            const red = axs.color.colorChannelToString(color.red);
+            const green = axs.color.colorChannelToString(color.green);
+            const blue = axs.color.colorChannelToString(color.blue);
+            return `#${red}${green}${blue}`;
+        }
+        const arr = [color.red, color.green, color.blue, color.alpha].join();
+        return `rgba(${arr})`;
+    };
+
+    const Cursor = function(node, index, text) { // eslint-disable-line func-style,max-len
+        this.node = node;
+        this.index = index;
+        this.text = text;
+    };
+
+    Cursor.prototype.clone = function() {
+        return new Cursor(this.node, this.index, this.text);
+    };
+
+    Cursor.prototype.copyFrom = function(otherCursor) {
+        this.node = otherCursor.node;
+        this.index = otherCursor.index;
+        this.text = otherCursor.text;
+    };
+
+    const TraverseUtil = {};
+
+    TraverseUtil.getNodeText = function(node) {
+        if (node.constructor === Text) {
+            return node.data;
+        }
+        return "";
+    };
+
+    TraverseUtil.treatAsLeafNode = function(node) {
+        return node.childNodes.length === 0 ||
+            node.nodeName === "SELECT" ||
+            node.nodeName === "OBJECT";
+    };
+
+    TraverseUtil.isWhitespace = function(ch) {
+        return (ch === " " || ch === "\n" || ch === "\r" || ch === "\t");
+    };
+
+    TraverseUtil.isVisible = function(node) {
+        if (!node.style) {
+            return true;
+        }
+        const style = window.getComputedStyle(node, null);
+        return (Boolean(style) &&
+            style.display !== "none" &&
+            style.visibility !== "hidden");
+    };
+
+    TraverseUtil.isSkipped = function(_node) {
+        let node = _node;
+        if (node.constructor === Text) {
+            node = node.parentElement;
+        }
+        if (node.className === "CaretBrowsing_Caret" ||
+            node.className === "CaretBrowsing_AnimateCaret") {
+            return true;
+        }
+        return false;
+    };
+
+    TraverseUtil.forwardsChar = function(cursor, nodesCrossed) { // eslint-disable-line max-statements,max-len
+        for (;;) {
+            let childNode = null;
+            if (!TraverseUtil.treatAsLeafNode(cursor.node)) {
+                for (let i = cursor.index;
+                    i < cursor.node.childNodes.length;
+                    i++) {
+                    const node = cursor.node.childNodes[i];
+                    if (TraverseUtil.isSkipped(node)) {
+                        nodesCrossed.push(node);
+                    } else if (TraverseUtil.isVisible(node)) {
+                        childNode = node;
+                        break;
+                    }
+                }
+            }
+            if (childNode) {
+                cursor.node = childNode;
+                cursor.index = 0;
+                cursor.text = TraverseUtil.getNodeText(cursor.node);
+                if (cursor.node.constructor !== Text) {
+                    nodesCrossed.push(cursor.node);
+                }
+            } else {
+                if (cursor.index < cursor.text.length) {
+                    return cursor.text[cursor.index++];
+                }
+
+                while (cursor.node !== null) {
+                    let siblingNode = null;
+                    for (let node = cursor.node.nextSibling;
+                        node !== null;
+                        node = node.nextSibling) {
+                        if (TraverseUtil.isSkipped(node)) {
+                            nodesCrossed.push(node);
+                        } else if (TraverseUtil.isVisible(node)) {
+                            siblingNode = node;
+                            break;
+                        }
+                    }
+                    if (siblingNode) {
+                        cursor.node = siblingNode;
+                        cursor.text = TraverseUtil.getNodeText(siblingNode);
+                        cursor.index = 0;
+
+                        if (cursor.node.constructor !== Text) {
+                            nodesCrossed.push(cursor.node);
+                        }
+
+                        break;
+                    }
+
+                    const parentNode = cursor.node.parentNode;
+                    if (parentNode &&
+                        parentNode.constructor !== HTMLBodyElement) {
+                        cursor.node = cursor.node.parentNode;
+                        cursor.text = null;
+                        cursor.index = 0;
+                    } else {
+                        return null;
+                    }
+                }
+            }
+        }
+    };
+
+    TraverseUtil.getNextChar = function( // eslint-disable-line max-params
+        startCursor, endCursor, nodesCrossed, skipWhitespace) {
+        startCursor.copyFrom(endCursor);
+        let fChar = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
+        if (fChar === null) {
+            return null;
+        }
+
+        const initialWhitespace = TraverseUtil.isWhitespace(fChar);
+
+        while ((TraverseUtil.isWhitespace(fChar)) ||
+            (TraverseUtil.isSkipped(endCursor.node))) {
+            fChar = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
+            if (fChar === null) {
+                return null;
+            }
+        }
+        if (skipWhitespace || !initialWhitespace) {
+            startCursor.copyFrom(endCursor);
+            startCursor.index--;
+            return fChar;
+        }
+
+        for (let i = 0; i < nodesCrossed.length; i++) {
+            if (TraverseUtil.isSkipped(nodesCrossed[i])) {
+                endCursor.index--;
+                startCursor.copyFrom(endCursor);
+                startCursor.index--;
+                return " ";
+            }
+        }
+        endCursor.index--;
+        return " ";
+    };
+
+    const CaretBrowsing = {};
+
+    CaretBrowsing.isEnabled = false;
+
+    CaretBrowsing.forceEnabled = false;
+
+    CaretBrowsing.onEnable = undefined;
+
+    CaretBrowsing.onJump = undefined;
+
+    CaretBrowsing.isWindowFocused = false;
+
+    CaretBrowsing.isCaretVisible = false;
+
+    CaretBrowsing.caretElement = undefined;
+
+    CaretBrowsing.caretX = 0;
+
+    CaretBrowsing.caretY = 0;
+
+    CaretBrowsing.caretWidth = 0;
+
+    CaretBrowsing.caretHeight = 0;
+
+    CaretBrowsing.caretForeground = "#000";
+
+    CaretBrowsing.caretBackground = "#fff";
+
+    CaretBrowsing.isSelectionCollapsed = false;
+
+    CaretBrowsing.blinkFunctionId = null;
+
+    CaretBrowsing.targetX = null;
+
+    CaretBrowsing.blinkFlag = true;
+
+    CaretBrowsing.isControlThatNeedsArrowKeys = function(node) { // eslint-disable-line complexity,max-len
+        if (!node) {
+            return false;
+        }
+
+        if (node === document.body || node !== document.activeElement) {
+            return false;
+        }
+
+        if (node.constructor === HTMLSelectElement) {
+            return true;
+        }
+
+        if (node.constructor === HTMLInputElement) {
+            switch (node.type) { // eslint-disable-line default-case
+            case "email":
+            case "number":
+            case "password":
+            case "search":
+            case "text":
+            case "tel":
+            case "url":
+            case "":
+                return true;
+            case "datetime":
+            case "datetime-local":
+            case "date":
+            case "month":
+            case "radio":
+            case "range":
+            case "week":
+                return true;
+            }
+        }
+
+        if (node.getAttribute && isFocusable(node)) {
+            const role = node.getAttribute("role");
+            switch (role) { // eslint-disable-line default-case
+            case "combobox":
+            case "grid":
+            case "gridcell":
+            case "listbox":
+            case "menu":
+            case "menubar":
+            case "menuitem":
+            case "menuitemcheckbox":
+            case "menuitemradio":
+            case "option":
+            case "radiogroup":
+            case "scrollbar":
+            case "slider":
+            case "spinbutton":
+            case "tab":
+            case "tablist":
+            case "textbox":
+            case "tree":
+            case "treegrid":
+            case "treeitem":
+                return true;
+            }
+        }
+
+        return false;
+    };
+
+    CaretBrowsing.injectCaretStyles = function() {
+        const style = ".CaretBrowsing_Caret {" +
+            "  position: absolute;" +
+            "  z-index: 2147483647;" +
+            "  min-height: 10px;" +
+            "  background-color: #000;" +
+            "}" +
+            ".CaretBrowsing_AnimateCaret {" +
+            "  position: absolute;" +
+            "  z-index: 2147483647;" +
+            "  min-height: 10px;" +
+            "}" +
+            ".CaretBrowsing_FlashVert {" +
+            "  position: absolute;" +
+            "  z-index: 2147483647;" +
+            "  background: linear-gradient(" +
+            "      270deg," +
+            "      rgba(128, 128, 255, 0) 0%," +
+            "      rgba(128, 128, 255, 0.3) 45%," +
+            "      rgba(128, 128, 255, 0.8) 50%," +
+            "      rgba(128, 128, 255, 0.3) 65%," +
+            "      rgba(128, 128, 255, 0) 100%);" +
+            "}";
+        const node = document.createElement("style");
+        node.innerHTML = style;
+        document.body.appendChild(node);
+    };
+
+    CaretBrowsing.setInitialCursor = function() {
+        const sel = window.getSelection();
+        if (sel.rangeCount > 0) {
+            return;
+        }
+
+        positionCaret();
+        CaretBrowsing.injectCaretStyles();
+        CaretBrowsing.toggle();
+        CaretBrowsing.initiated = true;
+        CaretBrowsing.selectionEnabled = false;
+    };
+
+    CaretBrowsing.setAndValidateSelection = function(start, end) {
+        const sel = window.getSelection();
+        sel.setBaseAndExtent(start.node, start.index, end.node, end.index);
+
+        if (sel.rangeCount !== 1) {
+            return false;
+        }
+
+        return (sel.anchorNode === start.node &&
+            sel.anchorOffset === start.index &&
+            sel.focusNode === end.node &&
+            sel.focusOffset === end.index);
+    };
+
+    CaretBrowsing.setFocusToNode = function(nodeArg) {
+        let node = nodeArg;
+        while (node && node !== document.body) {
+            if (isFocusable(node) && node.constructor !== HTMLIFrameElement) {
+                node.focus();
+                if (node.constructor === HTMLInputElement && node.select) {
+                    node.select();
+                }
+                return true;
+            }
+            node = node.parentNode;
+        }
+
+        return false;
+    };
+
+    CaretBrowsing.setCaretElementNormalStyle = function() {
+        const element = CaretBrowsing.caretElement;
+        element.className = "CaretBrowsing_Caret";
+        if (CaretBrowsing.isSelectionCollapsed) {
+            element.style.opacity = "1.0";
+        } else {
+            element.style.opacity = "0.0";
+        }
+        element.style.left = `${CaretBrowsing.caretX}px`;
+        element.style.top = `${CaretBrowsing.caretY}px`;
+        element.style.width = `${CaretBrowsing.caretWidth}px`;
+        element.style.height = `${CaretBrowsing.caretHeight}px`;
+        element.style.color = CaretBrowsing.caretForeground;
+    };
+
+    CaretBrowsing.animateCaretElement = function() {
+        const element = CaretBrowsing.caretElement;
+        element.style.left = `${CaretBrowsing.caretX - 50}px`;
+        element.style.top = `${CaretBrowsing.caretY - 100}px`;
+        element.style.width = `${CaretBrowsing.caretWidth + 100}px`;
+        element.style.height = `${CaretBrowsing.caretHeight + 200}px`;
+        element.className = "CaretBrowsing_AnimateCaret";
+
+        window.setTimeout(() => {
+            if (!CaretBrowsing.caretElement) {
+                return;
+            }
+            CaretBrowsing.setCaretElementNormalStyle();
+            element.style.transition = "all 0.8s ease-in";
+            function listener() {
+                element.removeEventListener(
+                    "transitionend", listener, false);
+                element.style.transition = "none";
+            }
+            element.addEventListener(
+                "transitionend", listener, false);
+        }, 0);
+    };
+
+    CaretBrowsing.flashCaretElement = function() {
+        const x = CaretBrowsing.caretX;
+        const y = CaretBrowsing.caretY;
+
+        const vert = document.createElement("div");
+        vert.className = "CaretBrowsing_FlashVert";
+        vert.style.left = `${x - 6}px`;
+        vert.style.top = `${y - 100}px`;
+        vert.style.width = "11px";
+        vert.style.height = `${200}px`;
+        document.body.appendChild(vert);
+
+        window.setTimeout(() => {
+            document.body.removeChild(vert);
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.setCaretElementNormalStyle();
+            }
+        }, 250);
+    };
+
+    CaretBrowsing.createCaretElement = function() {
+        const element = document.createElement("div");
+        element.className = "CaretBrowsing_Caret";
+        document.body.appendChild(element);
+        CaretBrowsing.caretElement = element;
+
+        if (CaretBrowsing.onEnable === "anim") {
+            CaretBrowsing.animateCaretElement();
+        } else if (CaretBrowsing.onEnable === "flash") {
+            CaretBrowsing.flashCaretElement();
+        } else {
+            CaretBrowsing.setCaretElementNormalStyle();
+        }
+    };
+
+    CaretBrowsing.recreateCaretElement = function() {
+        if (CaretBrowsing.caretElement) {
+            window.clearInterval(CaretBrowsing.blinkFunctionId);
+            CaretBrowsing.caretElement.parentElement.removeChild(
+                CaretBrowsing.caretElement);
+            CaretBrowsing.caretElement = null;
+            CaretBrowsing.updateIsCaretVisible();
+        }
+    };
+
+    CaretBrowsing.getCursorRect = function(cursor) { // eslint-disable-line max-statements,max-len
+        let node = cursor.node;
+        const index = cursor.index;
+        const rect = {
+            "left": 0,
+            "top": 0,
+            "width": 1,
+            "height": 0,
+        };
+        if (node.constructor === Text) {
+            let left = index;
+            let right = index;
+            const max = node.data.length;
+            const newRange = document.createRange();
+            while (left > 0 || right < max) {
+                if (left > 0) {
+                    left--;
+                    newRange.setStart(node, left);
+                    newRange.setEnd(node, index);
+                    const rangeRect = newRange.getBoundingClientRect();
+                    if (rangeRect && rangeRect.width && rangeRect.height) {
+                        rect.left = rangeRect.right;
+                        rect.top = rangeRect.top;
+                        rect.height = rangeRect.height;
+                        break;
+                    }
+                }
+                if (right < max) {
+                    right++;
+                    newRange.setStart(node, index);
+                    newRange.setEnd(node, right);
+                    const rangeRect = newRange.getBoundingClientRect();
+                    if (rangeRect && rangeRect.width && rangeRect.height) {
+                        rect.left = rangeRect.left;
+                        rect.top = rangeRect.top;
+                        rect.height = rangeRect.height;
+                        break;
+                    }
+                }
+            }
+        } else {
+            rect.height = node.offsetHeight;
+            while (node !== null) {
+                rect.left += node.offsetLeft;
+                rect.top += node.offsetTop;
+                node = node.offsetParent;
+            }
+        }
+        rect.left += window.pageXOffset;
+        rect.top += window.pageYOffset;
+        return rect;
+    };
+
+    CaretBrowsing.updateCaretOrSelection =
+        function(scrollToSelection) { // eslint-disable-line max-statements
+            const previousX = CaretBrowsing.caretX;
+            const previousY = CaretBrowsing.caretY;
+
+            const sel = window.getSelection();
+            if (sel.rangeCount === 0) {
+                if (CaretBrowsing.caretElement) {
+                    CaretBrowsing.isSelectionCollapsed = false;
+                    CaretBrowsing.caretElement.style.opacity = "0.0";
+                }
+                return;
+            }
+
+            const range = sel.getRangeAt(0);
+            if (!range) {
+                if (CaretBrowsing.caretElement) {
+                    CaretBrowsing.isSelectionCollapsed = false;
+                    CaretBrowsing.caretElement.style.opacity = "0.0";
+                }
+                return;
+            }
+
+            if (CaretBrowsing.isControlThatNeedsArrowKeys(
+                document.activeElement)) {
+                let node = document.activeElement;
+                CaretBrowsing.caretWidth = node.offsetWidth;
+                CaretBrowsing.caretHeight = node.offsetHeight;
+                CaretBrowsing.caretX = 0;
+                CaretBrowsing.caretY = 0;
+                while (node.offsetParent) {
+                    CaretBrowsing.caretX += node.offsetLeft;
+                    CaretBrowsing.caretY += node.offsetTop;
+                    node = node.offsetParent;
+                }
+                CaretBrowsing.isSelectionCollapsed = false;
+            } else if (range.startOffset !== range.endOffset ||
+                range.startContainer !== range.endContainer) {
+                const rect = range.getBoundingClientRect();
+                if (!rect) {
+                    return;
+                }
+                CaretBrowsing.caretX = rect.left + window.pageXOffset;
+                CaretBrowsing.caretY = rect.top + window.pageYOffset;
+                CaretBrowsing.caretWidth = rect.width;
+                CaretBrowsing.caretHeight = rect.height;
+                CaretBrowsing.isSelectionCollapsed = false;
+            } else {
+                const rect = CaretBrowsing.getCursorRect(
+                    new Cursor(range.startContainer,
+                        range.startOffset,
+                        TraverseUtil.getNodeText(range.startContainer)));
+                CaretBrowsing.caretX = rect.left;
+                CaretBrowsing.caretY = rect.top;
+                CaretBrowsing.caretWidth = rect.width;
+                CaretBrowsing.caretHeight = rect.height;
+                CaretBrowsing.isSelectionCollapsed = true;
+            }
+
+            if (CaretBrowsing.caretElement) {
+                const element = CaretBrowsing.caretElement;
+                if (CaretBrowsing.isSelectionCollapsed) {
+                    element.style.opacity = "1.0";
+                    element.style.left = `${CaretBrowsing.caretX}px`;
+                    element.style.top = `${CaretBrowsing.caretY}px`;
+                    element.style.width = `${CaretBrowsing.caretWidth}px`;
+                    element.style.height = `${CaretBrowsing.caretHeight}px`;
+                } else {
+                    element.style.opacity = "0.0";
+                }
+            } else {
+                CaretBrowsing.createCaretElement();
+            }
+
+            let elem = range.startContainer;
+            if (elem.constructor === Text) {
+                elem = elem.parentElement;
+            }
+            const style = window.getComputedStyle(elem);
+            const bg = axs.utils.getBgColor(style, elem);
+            const fg = axs.utils.getFgColor(style, elem, bg);
+            CaretBrowsing.caretBackground = axs.color.colorToString(bg);
+            CaretBrowsing.caretForeground = axs.color.colorToString(fg);
+
+            if (scrollToSelection) {
+                const rect = CaretBrowsing.getCursorRect(
+                    new Cursor(sel.focusNode, sel.focusOffset,
+                        TraverseUtil.getNodeText(sel.focusNode)));
+
+                const yscroll = window.pageYOffset;
+                const pageHeight = window.innerHeight;
+                const caretY = rect.top;
+                const caretHeight = Math.min(rect.height, 30);
+                if (yscroll + pageHeight < caretY + caretHeight) {
+                    window.scroll(0, (caretY + caretHeight - pageHeight + 100));
+                } else if (caretY < yscroll) {
+                    window.scroll(0, (caretY - 100));
+                }
+            }
+
+            if (Math.abs(previousX - CaretBrowsing.caretX) > 500 ||
+                Math.abs(previousY - CaretBrowsing.caretY) > 100) {
+                if (CaretBrowsing.onJump === "anim") {
+                    CaretBrowsing.animateCaretElement();
+                } else if (CaretBrowsing.onJump === "flash") {
+                    CaretBrowsing.flashCaretElement();
+                }
+            }
+        };
+
+    CaretBrowsing.move = function(direction, granularity) {
+        let action = "move";
+        if (CaretBrowsing.selectionEnabled) {
+            action = "extend";
+        }
+        window.
+            getSelection().
+            modify(action, direction, granularity);
+
+        window.setTimeout(() => {
+            CaretBrowsing.updateCaretOrSelection(true);
+        }, 0);
+    };
+
+    CaretBrowsing.moveToBlock = function(paragraph, boundary) {
+        let action = "move";
+        if (CaretBrowsing.selectionEnabled) {
+            action = "extend";
+        }
+        window.
+            getSelection().
+            modify(action, paragraph, "paragraph");
+
+        window.
+            getSelection().
+            modify(action, boundary, "paragraphboundary");
+
+        window.setTimeout(() => {
+            CaretBrowsing.updateCaretOrSelection(true);
+        }, 0);
+    };
+
+    CaretBrowsing.toggle = function() {
+        if (CaretBrowsing.forceEnabled) {
+            CaretBrowsing.recreateCaretElement();
+            return;
+        }
+
+        CaretBrowsing.isEnabled = !CaretBrowsing.isEnabled;
+        const obj = {};
+        obj.enabled = CaretBrowsing.isEnabled;
+        CaretBrowsing.updateIsCaretVisible();
+    };
+
+    CaretBrowsing.onClick = function() {
+        if (!CaretBrowsing.isEnabled) {
+            return true;
+        }
+        window.setTimeout(() => {
+            CaretBrowsing.targetX = null;
+            CaretBrowsing.updateCaretOrSelection(false);
+        }, 0);
+        return true;
+    };
+
+    CaretBrowsing.caretBlinkFunction = function() {
+        if (CaretBrowsing.caretElement) {
+            if (CaretBrowsing.blinkFlag) {
+                CaretBrowsing.caretElement.style.backgroundColor =
+                    CaretBrowsing.caretForeground;
+                CaretBrowsing.blinkFlag = false;
+            } else {
+                CaretBrowsing.caretElement.style.backgroundColor =
+                    CaretBrowsing.caretBackground;
+                CaretBrowsing.blinkFlag = true;
+            }
+        }
+    };
+
+    CaretBrowsing.updateIsCaretVisible = function() {
+        CaretBrowsing.isCaretVisible =
+            (CaretBrowsing.isEnabled && CaretBrowsing.isWindowFocused);
+        if (CaretBrowsing.isCaretVisible && !CaretBrowsing.caretElement) {
+            CaretBrowsing.setInitialCursor();
+            CaretBrowsing.updateCaretOrSelection(true);
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.blinkFunctionId = window.setInterval(
+                    CaretBrowsing.caretBlinkFunction, 500);
+            }
+        } else if (!CaretBrowsing.isCaretVisible &&
+            CaretBrowsing.caretElement) {
+            window.clearInterval(CaretBrowsing.blinkFunctionId);
+            if (CaretBrowsing.caretElement) {
+                CaretBrowsing.isSelectionCollapsed = false;
+                CaretBrowsing.caretElement.parentElement.removeChild(
+                    CaretBrowsing.caretElement);
+                CaretBrowsing.caretElement = null;
+            }
+        }
+    };
+
+    CaretBrowsing.onWindowFocus = function() {
+        CaretBrowsing.isWindowFocused = true;
+        CaretBrowsing.updateIsCaretVisible();
+    };
+
+    CaretBrowsing.onWindowBlur = function() {
+        CaretBrowsing.isWindowFocused = false;
+        CaretBrowsing.updateIsCaretVisible();
+    };
+
+    CaretBrowsing.init = function() {
+        CaretBrowsing.isWindowFocused = document.hasFocus();
+
+        document.addEventListener("click", CaretBrowsing.onClick, false);
+        window.addEventListener("focus", CaretBrowsing.onWindowFocus, false);
+        window.addEventListener("blur", CaretBrowsing.onWindowBlur, false);
+    };
+
+    window.setTimeout(() => {
+        if (!window.caretBrowsingLoaded) {
+            window.caretBrowsingLoaded = true;
+            CaretBrowsing.init();
+
+            if (document.body.getAttribute("caretbrowsing") === "on") {
+                CaretBrowsing.forceEnabled = true;
+                CaretBrowsing.isEnabled = true;
+                CaretBrowsing.updateIsCaretVisible();
+            }
+        }
+    }, 0);
+
     const funcs = {};
 
     funcs.setInitialCursor = () => {
         if (!CaretBrowsing.initiated) {
             CaretBrowsing.setInitialCursor();
-        } else {
-            if (!window.getSelection().toString()) {
-                positionCaret();
-            }
-            CaretBrowsing.toggle();
+            return;
         }
-    }
+
+        if (!window.getSelection().toString()) {
+            positionCaret();
+        }
+        CaretBrowsing.toggle();
+    };
 
     funcs.toggle = () => {
         CaretBrowsing.toggle();
-    }
+    };
 
     funcs.moveRight = () => {
-        CaretBrowsing.move('right', 'character');
-    }
+        CaretBrowsing.move("right", "character");
+    };
 
     funcs.moveLeft = () => {
-        CaretBrowsing.move('left', 'character');
-    }
+        CaretBrowsing.move("left", "character");
+    };
 
     funcs.moveDown = () => {
-        CaretBrowsing.move('forward', 'line');
-    }
+        CaretBrowsing.move("forward", "line");
+    };
 
     funcs.moveUp = () => {
-        CaretBrowsing.move('backward', 'line');
-    }
+        CaretBrowsing.move("backward", "line");
+    };
 
     funcs.moveToEndOfWord = () => {
         funcs.moveToNextWord();
         funcs.moveLeft();
-    }
+    };
 
     funcs.moveToNextWord = () => {
-        CaretBrowsing.move('forward', 'word');
+        CaretBrowsing.move("forward", "word");
         funcs.moveRight();
-    }
+    };
 
     funcs.moveToPreviousWord = () => {
-        CaretBrowsing.move('backward', 'word');
-    }
+        CaretBrowsing.move("backward", "word");
+    };
 
     funcs.moveToStartOfLine = () => {
-        CaretBrowsing.move('left', 'lineboundary');
-    }
+        CaretBrowsing.move("left", "lineboundary");
+    };
 
     funcs.moveToEndOfLine = () => {
-        CaretBrowsing.move('right', 'lineboundary');
-    }
+        CaretBrowsing.move("right", "lineboundary");
+    };
 
     funcs.moveToStartOfNextBlock = () => {
-        CaretBrowsing.moveToBlock('forward', 'backward');
-    }
+        CaretBrowsing.moveToBlock("forward", "backward");
+    };
 
     funcs.moveToStartOfPrevBlock = () => {
-        CaretBrowsing.moveToBlock('backward', 'backward');
-    }
+        CaretBrowsing.moveToBlock("backward", "backward");
+    };
 
     funcs.moveToEndOfNextBlock = () => {
-        CaretBrowsing.moveToBlock('forward', 'forward');
-    }
+        CaretBrowsing.moveToBlock("forward", "forward");
+    };
 
     funcs.moveToEndOfPrevBlock = () => {
-        CaretBrowsing.moveToBlock('backward', 'forward');
-    }
+        CaretBrowsing.moveToBlock("backward", "forward");
+    };
 
     funcs.moveToStartOfDocument = () => {
-        CaretBrowsing.move('backward', 'documentboundary');
-    }
+        CaretBrowsing.move("backward", "documentboundary");
+    };
 
     funcs.moveToEndOfDocument = () => {
-        CaretBrowsing.move('forward', 'documentboundary');
-    }
+        CaretBrowsing.move("forward", "documentboundary");
+    };
 
     funcs.dropSelection = () => {
         window.getSelection().removeAllRanges();
-    }
+    };
 
-    funcs.getSelection = () => {
-        return window.getSelection().toString();
-    }
+    funcs.getSelection = () => window.getSelection().toString();
 
     funcs.toggleSelection = () => {
         CaretBrowsing.selectionEnabled = !CaretBrowsing.selectionEnabled;
-    }
+    };
 
     return funcs;
 })();

From 890e26b2b5fe39dd68f0117ab5d75103c2622d3e Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Wed, 6 Dec 2017 13:58:23 +0600
Subject: [PATCH 012/229] Additional fixes

---
 qutebrowser/browser/commands.py               | 3 +++
 qutebrowser/browser/webengine/webenginetab.py | 2 +-
 qutebrowser/browser/webkit/webkittab.py       | 3 ++-
 qutebrowser/javascript/webengine_caret.js     | 1 +
 tests/end2end/features/test_caret_bdd.py      | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 476bf1693..09da845f0 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -65,6 +65,8 @@ class CommandDispatcher:
     def __init__(self, win_id, tabbed_browser):
         self._win_id = win_id
         self._tabbed_browser = tabbed_browser
+        self.yank_object = {}
+        self.userscript_object = {}
 
     def __repr__(self):
         return utils.get_repr(self)
@@ -883,6 +885,7 @@ class CommandDispatcher:
             message.info("{} {} yanked to {}".format(
                 len(s), "char" if len(s) == 1 else "chars", target))
             if not self.yank_object['keep']:
+                log.procs.debug(self.yank_object['keep'])
                 modeman.leave(self._win_id, KeyMode.caret, "yank selected",
                               maybe=True)
         self.yank_object = None
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 8f71d5b1c..977e3a2c1 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -184,6 +184,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
+        self.drop_selection()
         self._tab.run_js_async(
             javascript.assemble('caret', 'toggle'))
 
@@ -284,7 +285,6 @@ class WebEngineCaret(browsertab.AbstractCaret):
             # https://bugreports.qt.io/browse/QTBUG-53134
             self._tab.run_js_async(
                 'window.getSelection().toString()', callback)
-            self.drop_selection()
 
     def _follow_selected_cb(self, js_elem, tab=False):
         """Callback for javascript which clicks the selected element.
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index a1aeee698..fa77627f9 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -338,7 +338,8 @@ class WebKitCaret(browsertab.AbstractCaret):
     def selection(self, html=False, callback=False):
         if html:
             callback(self._widget.selectedHtml())
-        callback(self._widget.selectedText())
+        else:
+            callback(self._widget.selectedText())
 
     def follow_selected(self, *, tab=False):
         if not self.has_selection():
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index e6f71d44f..d4d7e5a96 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1051,6 +1051,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     funcs.moveToEndOfDocument = () => {
         CaretBrowsing.move("forward", "documentboundary");
+        window.scrollTo(0, document.body.scrollHeight);
     };
 
     funcs.dropSelection = () => {
diff --git a/tests/end2end/features/test_caret_bdd.py b/tests/end2end/features/test_caret_bdd.py
index 97b18434b..ee6cda82c 100644
--- a/tests/end2end/features/test_caret_bdd.py
+++ b/tests/end2end/features/test_caret_bdd.py
@@ -17,10 +17,10 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
+# pylint: disable=unused-import
 import pytest
 import pytest_bdd as bdd
 
-# pylint: disable=unused-import
 from end2end.features.test_yankpaste_bdd import init_fake_clipboard
 
 bdd.scenarios('caret.feature')

From d4001a4a982d05af102cfa9a5a6427d19f91198e Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Wed, 6 Dec 2017 22:37:00 -0500
Subject: [PATCH 013/229] Add support for hinting elements from within
 same-origin frames

---
 qutebrowser/javascript/webelem.js    | 46 +++++++++++++++++++++++-----
 tests/end2end/features/hints.feature |  2 --
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index b5fd936b2..f8aed2983 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -40,7 +40,7 @@ window._qutebrowser.webelem = (function() {
     const funcs = {};
     const elements = [];
 
-    function serialize_elem(elem) {
+    function serialize_elem(elem, frame = null) {
         if (!elem) {
             return null;
         }
@@ -55,7 +55,7 @@ window._qutebrowser.webelem = (function() {
         try {
             caret_position = elem.selectionStart;
         } catch (err) {
-            if (err instanceof DOMException &&
+            if (err.constructor.name === "DOMException" &&
                     err.name === "InvalidStateError") {
                 // nothing to do, caret_position is already null
             } else {
@@ -102,15 +102,25 @@ window._qutebrowser.webelem = (function() {
         out.attributes = attributes;
 
         const client_rects = elem.getClientRects();
+
+        // Get location of frame and add it to element
+        // TODO How to generate a 0 object without this
+        let frame_offset_rect = null;
+        if (frame === null) {
+            frame_offset_rect = document.head.getBoundingClientRect();
+        } else {
+            frame_offset_rect = frame.getBoundingClientRect();
+        }
+
         for (let k = 0; k < client_rects.length; ++k) {
             const rect = client_rects[k];
             out.rects.push({
-                "top": rect.top,
-                "right": rect.right,
-                "bottom": rect.bottom,
-                "left": rect.left,
-                "height": rect.height,
-                "width": rect.width,
+                "top": rect.top + frame_offset_rect.top,
+                "right": rect.right + frame_offset_rect.right,
+                "bottom": rect.bottom + frame_offset_rect.bottom,
+                "left": rect.left + frame_offset_rect.left,
+                "height": rect.height + frame_offset_rect.height,
+                "width": rect.width + frame_offset_rect.width,
             });
         }
 
@@ -163,6 +173,7 @@ window._qutebrowser.webelem = (function() {
 
     funcs.find_css = (selector, only_visible) => {
         const elems = document.querySelectorAll(selector);
+        const subelem_frames = window.frames;
         const out = [];
 
         for (let i = 0; i < elems.length; ++i) {
@@ -171,6 +182,25 @@ window._qutebrowser.webelem = (function() {
             }
         }
 
+        // Recurse into frames and add them
+        for (let i = 0; i < subelem_frames.length; i++) {
+            try {
+                subelem_frames[i].document;
+            } catch (err) {
+                // If we have a cross-origin frame, skip it.
+                continue;
+            }
+
+            const subelems = subelem_frames[i].document.
+                querySelectorAll(selector);
+            const frame = subelem_frames[i].frameElement;
+            for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
+                if (!only_visible || is_visible(subelems[elem_num])) {
+                    out.push(serialize_elem(subelems[elem_num], frame));
+                }
+            }
+        }
+
         return out;
     };
 
diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 0151a14ad..0f7868e31 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -204,8 +204,6 @@ Feature: Using hints
         Then the javascript message "contents: existingnew" should be logged
 
     ### iframes
-
-    @qtwebengine_todo: Hinting in iframes is not implemented yet
     Scenario: Using :follow-hint inside an iframe
         When I open data/hints/iframe.html
         And I hint with args "links normal" and follow a

From 5f1e0224a981e06e06d9611275b5b4b2f685f944 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 7 Dec 2017 17:30:32 +0600
Subject: [PATCH 014/229] Pass caret tests

---
 qutebrowser/browser/commands.py               | 1 -
 qutebrowser/browser/webengine/webenginetab.py | 2 +-
 qutebrowser/javascript/webengine_caret.js     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 09da845f0..cb744b23d 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -885,7 +885,6 @@ class CommandDispatcher:
             message.info("{} {} yanked to {}".format(
                 len(s), "char" if len(s) == 1 else "chars", target))
             if not self.yank_object['keep']:
-                log.procs.debug(self.yank_object['keep'])
                 modeman.leave(self._win_id, KeyMode.caret, "yank selected",
                               maybe=True)
         self.yank_object = None
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 977e3a2c1..2e300296b 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -284,7 +284,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
             # WORKAROUND for
             # https://bugreports.qt.io/browse/QTBUG-53134
             self._tab.run_js_async(
-                'window.getSelection().toString()', callback)
+                javascript.assemble('caret', 'getSelection'), callback)
 
     def _follow_selected_cb(self, js_elem, tab=False):
         """Callback for javascript which clicks the selected element.
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index d4d7e5a96..7235c9772 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1051,7 +1051,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     funcs.moveToEndOfDocument = () => {
         CaretBrowsing.move("forward", "documentboundary");
-        window.scrollTo(0, document.body.scrollHeight);
+        funcs.moveLeft();
     };
 
     funcs.dropSelection = () => {

From a8d79fedf381b89114bafa78334971e6e432c2ec Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 7 Dec 2017 17:45:05 +0600
Subject: [PATCH 015/229] Fix fetching selection

---
 qutebrowser/browser/webkit/webkittab.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index fa77627f9..8c63c9ef8 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -160,7 +160,7 @@ class WebKitCaret(browsertab.AbstractCaret):
 
         settings = self._widget.settings()
         settings.setAttribute(QWebSettings.CaretBrowsingEnabled, True)
-        self.selection_enabled = bool(self.selection())
+        self.selection_enabled = bool(self._selection())
 
         if self._widget.isVisible():
             # Sometimes the caret isn't immediately visible, but unfocusing
@@ -173,7 +173,7 @@ class WebKitCaret(browsertab.AbstractCaret):
             #
             # Note: We can't use hasSelection() here, as that's always
             # true in caret mode.
-            if not self.selection():
+            if not self.selection_enabled:
                 self._widget.page().currentFrame().evaluateJavaScript(
                     utils.read_file('javascript/position_caret.js'))
 
@@ -336,10 +336,13 @@ class WebKitCaret(browsertab.AbstractCaret):
         return self._widget.hasSelection()
 
     def selection(self, html=False, callback=False):
+        callback(self._selection(html))
+
+    def _selection(self, html=False):
         if html:
-            callback(self._widget.selectedHtml())
+            return self._widget.selectedHtml()
         else:
-            callback(self._widget.selectedText())
+            return self._widget.selectedText()
 
     def follow_selected(self, *, tab=False):
         if not self.has_selection():
@@ -351,7 +354,7 @@ class WebKitCaret(browsertab.AbstractCaret):
             self._tab.run_js_async(
                 'window.getSelection().anchorNode.parentNode.click()')
         else:
-            selection = self.selection(html=True)
+            selection = self._selection(html=True)
             try:
                 selected_element = xml.etree.ElementTree.fromstring(
                     '<html>{}</html>'.format(selection)).find('a')

From c737d7ab2237f9fb768367fd55090e870ab1c22b Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 7 Dec 2017 12:47:51 -0500
Subject: [PATCH 016/229] Fix various js problems with frame support

---
 qutebrowser/javascript/webelem.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index f8aed2983..51005f882 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -55,7 +55,9 @@ window._qutebrowser.webelem = (function() {
         try {
             caret_position = elem.selectionStart;
         } catch (err) {
-            if (err.constructor.name === "DOMException" &&
+            if ((err instanceof DOMException ||
+                 (frame !== null &&
+                  err instanceof frame.DOMException)) &&
                     err.name === "InvalidStateError") {
                 // nothing to do, caret_position is already null
             } else {
@@ -107,9 +109,17 @@ window._qutebrowser.webelem = (function() {
         // TODO How to generate a 0 object without this
         let frame_offset_rect = null;
         if (frame === null) {
-            frame_offset_rect = document.head.getBoundingClientRect();
+            // Dummy object with zero offset
+            frame_offset_rect = {
+                "top": 0,
+                "right": 0,
+                "bottom": 0,
+                "left": 0,
+                "height": 0,
+                "width": 0,
+            };
         } else {
-            frame_offset_rect = frame.getBoundingClientRect();
+            frame_offset_rect = frame.frameElement.getBoundingClientRect();
         }
 
         for (let k = 0; k < client_rects.length; ++k) {
@@ -193,7 +203,7 @@ window._qutebrowser.webelem = (function() {
 
             const subelems = subelem_frames[i].document.
                 querySelectorAll(selector);
-            const frame = subelem_frames[i].frameElement;
+            const frame = subelem_frames[i];
             for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
                 if (!only_visible || is_visible(subelems[elem_num])) {
                     out.push(serialize_elem(subelems[elem_num], frame));

From 052823b74cacb06db9edd6c67be919801aa7640c Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 7 Dec 2017 13:03:06 -0500
Subject: [PATCH 017/229] Fix broken width and height location in frames

---
 qutebrowser/javascript/webelem.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 51005f882..eeded152d 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -129,8 +129,8 @@ window._qutebrowser.webelem = (function() {
                 "right": rect.right + frame_offset_rect.right,
                 "bottom": rect.bottom + frame_offset_rect.bottom,
                 "left": rect.left + frame_offset_rect.left,
-                "height": rect.height + frame_offset_rect.height,
-                "width": rect.width + frame_offset_rect.width,
+                "height": rect.height,
+                "width": rect.width,
             });
         }
 

From 0fc99108bf57ce568d2dd91636779e0b133f2bb4 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 7 Dec 2017 14:21:44 -0500
Subject: [PATCH 018/229] Implement iframe support for clicking elements

---
 qutebrowser/javascript/webelem.js | 78 +++++++++++++++++++++++--------
 1 file changed, 58 insertions(+), 20 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index eeded152d..8fb5ae1ea 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -181,6 +181,17 @@ window._qutebrowser.webelem = (function() {
         return true;
     }
 
+    // Returns true if the iframe is accessible without
+    // cross domain errors, else false.
+    function iframe_same_domain(frame) {
+        try {
+            frame.document;
+            return true;
+        } catch (err) {
+            return false;
+        }
+    }
+
     funcs.find_css = (selector, only_visible) => {
         const elems = document.querySelectorAll(selector);
         const subelem_frames = window.frames;
@@ -194,19 +205,14 @@ window._qutebrowser.webelem = (function() {
 
         // Recurse into frames and add them
         for (let i = 0; i < subelem_frames.length; i++) {
-            try {
-                subelem_frames[i].document;
-            } catch (err) {
-                // If we have a cross-origin frame, skip it.
-                continue;
-            }
-
-            const subelems = subelem_frames[i].document.
-                querySelectorAll(selector);
-            const frame = subelem_frames[i];
-            for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
-                if (!only_visible || is_visible(subelems[elem_num])) {
-                    out.push(serialize_elem(subelems[elem_num], frame));
+            if (iframe_same_domain(subelem_frames[i])) {
+                const subelems = subelem_frames[i].document.
+                    querySelectorAll(selector);
+                const frame = subelem_frames[i];
+                for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
+                    if (!only_visible || is_visible(subelems[elem_num])) {
+                        out.push(serialize_elem(subelems[elem_num], frame));
+                    }
                 }
             }
         }
@@ -219,6 +225,20 @@ window._qutebrowser.webelem = (function() {
         return serialize_elem(elem);
     };
 
+    // Check if elem is an iframe, and if so, run func on it.
+    // If no iframes match, return null
+    function run_in_iframes(elem, func) {
+        for (let i = 0; i < window.frames.length; ++i) {
+            if (iframe_same_domain(window.frames[i])) {
+                const frame = window.frames[i];
+                if (frame.frameElement === elem) {
+                    return func(frame);
+                }
+            }
+        }
+        return null;
+    }
+
     funcs.find_focused = () => {
         const elem = document.activeElement;
 
@@ -228,17 +248,35 @@ window._qutebrowser.webelem = (function() {
             return null;
         }
 
-        return serialize_elem(elem);
+        // Check if we got an iframe, and if so, recurse inside of it
+        const frame_elem = run_in_iframes(elem,
+            (frame) => serialize_elem(frame.document.activeElement, frame));
+
+        if (frame_elem === null) {
+            return serialize_elem(elem);
+        }
+        return frame_elem;
     };
 
     funcs.find_at_pos = (x, y) => {
-        // FIXME:qtwebengine
-        // If the element at the specified point belongs to another document
-        // (for example, an iframe's subdocument), the subdocument's parent
-        // element is returned (the iframe itself).
-
         const elem = document.elementFromPoint(x, y);
-        return serialize_elem(elem);
+
+
+        // Check if we got an iframe, and if so, recurse inside of it
+        const frame_elem = run_in_iframes(elem,
+            (frame) => {
+                // Subtract offsets due to being in an iframe
+                const frame_offset_rect =
+                      frame.frameElement.getBoundingClientRect();
+                return serialize_elem(frame.document.
+                    elementFromPoint(x - frame_offset_rect.left,
+                        y - frame_offset_rect.top), frame);
+            });
+
+        if (frame_elem === null) {
+            return serialize_elem(elem);
+        }
+        return frame_elem;
     };
 
     // Function for returning a selection to python (so we can click it)

From 825939633a8482beb7dd89f69d9c8585f2906244 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 7 Dec 2017 14:46:18 -0500
Subject: [PATCH 019/229] Implement follow_selected in frames

---
 qutebrowser/javascript/webelem.js | 38 ++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 8fb5ae1ea..8ce59d5e6 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -227,7 +227,7 @@ window._qutebrowser.webelem = (function() {
 
     // Check if elem is an iframe, and if so, run func on it.
     // If no iframes match, return null
-    function run_in_iframes(elem, func) {
+    function replace_elem_frame(elem, func) {
         for (let i = 0; i < window.frames.length; ++i) {
             if (iframe_same_domain(window.frames[i])) {
                 const frame = window.frames[i];
@@ -239,6 +239,20 @@ window._qutebrowser.webelem = (function() {
         return null;
     }
 
+    // Runs a function in a frame until the result is not null, then return
+    function run_frames(func) {
+        for (let i = 0; i < window.frames.length; ++i) {
+            if (iframe_same_domain(window.frames[i])) {
+                const frame = window.frames[i];
+                const result = func(frame);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        return null;
+    }
+
     funcs.find_focused = () => {
         const elem = document.activeElement;
 
@@ -249,7 +263,7 @@ window._qutebrowser.webelem = (function() {
         }
 
         // Check if we got an iframe, and if so, recurse inside of it
-        const frame_elem = run_in_iframes(elem,
+        const frame_elem = replace_elem_frame(elem,
             (frame) => serialize_elem(frame.document.activeElement, frame));
 
         if (frame_elem === null) {
@@ -263,7 +277,7 @@ window._qutebrowser.webelem = (function() {
 
 
         // Check if we got an iframe, and if so, recurse inside of it
-        const frame_elem = run_in_iframes(elem,
+        const frame_elem = replace_elem_frame(elem,
             (frame) => {
                 // Subtract offsets due to being in an iframe
                 const frame_offset_rect =
@@ -282,10 +296,22 @@ window._qutebrowser.webelem = (function() {
     // Function for returning a selection to python (so we can click it)
     funcs.find_selected_link = () => {
         const elem = window.getSelection().anchorNode;
-        if (!elem) {
-            return null;
+        if (elem) {
+            return serialize_elem(elem.parentNode);
         }
-        return serialize_elem(elem.parentNode);
+
+        const serialized_frame_elem = run_frames((frame) => {
+            const node = frame.window.getSelection().anchorNode;
+            if (node) {
+                return serialize_elem(node.parentNode, frame);
+            }
+            return null;
+        });
+
+        if (serialized_frame_elem) {
+            return serialized_frame_elem;
+        }
+        return null;
     };
 
     funcs.set_value = (id, value) => {

From 5c5f9928219f1d72942ed7ddd55c7a2e1549e406 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 7 Dec 2017 14:53:15 -0500
Subject: [PATCH 020/229] Implement find_id inside frames

Fixes :click-element
---
 qutebrowser/javascript/webelem.js | 46 +++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 8ce59d5e6..167634721 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -220,9 +220,39 @@ window._qutebrowser.webelem = (function() {
         return out;
     };
 
+    // Runs a function in a frame until the result is not null, then return
+    function run_frames(func) {
+        for (let i = 0; i < window.frames.length; ++i) {
+            if (iframe_same_domain(window.frames[i])) {
+                const frame = window.frames[i];
+                const result = func(frame);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        return null;
+    }
+
     funcs.find_id = (id) => {
         const elem = document.getElementById(id);
-        return serialize_elem(elem);
+        if (elem) {
+            return serialize_elem(elem);
+        }
+
+        const serialized_elem = run_frames((frame) => {
+            const element = frame.window.document.getElementById(id);
+            if (element) {
+                return serialize_elem(element, frame);
+            }
+            return null;
+        });
+
+        if (serialized_elem) {
+            return serialized_elem;
+        }
+
+        return null;
     };
 
     // Check if elem is an iframe, and if so, run func on it.
@@ -239,20 +269,6 @@ window._qutebrowser.webelem = (function() {
         return null;
     }
 
-    // Runs a function in a frame until the result is not null, then return
-    function run_frames(func) {
-        for (let i = 0; i < window.frames.length; ++i) {
-            if (iframe_same_domain(window.frames[i])) {
-                const frame = window.frames[i];
-                const result = func(frame);
-                if (result) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
     funcs.find_focused = () => {
         const elem = document.activeElement;
 

From 2898c416aa974eaed08da3af9d0f84b03c58b8b1 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Fri, 15 Dec 2017 15:16:18 -0500
Subject: [PATCH 021/229] Simplify and clean up frame logic

---
 qutebrowser/javascript/webelem.js | 34 ++++++++++++-------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 167634721..ae2e2ca5c 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -105,8 +105,7 @@ window._qutebrowser.webelem = (function() {
 
         const client_rects = elem.getClientRects();
 
-        // Get location of frame and add it to element
-        // TODO How to generate a 0 object without this
+        // Get location of frame if it exists and add it to element
         let frame_offset_rect = null;
         if (frame === null) {
             // Dummy object with zero offset
@@ -206,9 +205,9 @@ window._qutebrowser.webelem = (function() {
         // Recurse into frames and add them
         for (let i = 0; i < subelem_frames.length; i++) {
             if (iframe_same_domain(subelem_frames[i])) {
-                const subelems = subelem_frames[i].document.
-                    querySelectorAll(selector);
                 const frame = subelem_frames[i];
+                const subelems = frame.document.
+                    querySelectorAll(selector);
                 for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
                     if (!only_visible || is_visible(subelems[elem_num])) {
                         out.push(serialize_elem(subelems[elem_num], frame));
@@ -223,8 +222,8 @@ window._qutebrowser.webelem = (function() {
     // Runs a function in a frame until the result is not null, then return
     function run_frames(func) {
         for (let i = 0; i < window.frames.length; ++i) {
-            if (iframe_same_domain(window.frames[i])) {
-                const frame = window.frames[i];
+            const frame = window.frames[i];
+            if (iframe_same_domain(frame)) {
                 const result = func(frame);
                 if (result) {
                     return result;
@@ -242,10 +241,7 @@ window._qutebrowser.webelem = (function() {
 
         const serialized_elem = run_frames((frame) => {
             const element = frame.window.document.getElementById(id);
-            if (element) {
-                return serialize_elem(element, frame);
-            }
-            return null;
+            return serialize_elem(element, frame);
         });
 
         if (serialized_elem) {
@@ -255,12 +251,12 @@ window._qutebrowser.webelem = (function() {
         return null;
     };
 
-    // Check if elem is an iframe, and if so, run func on it.
+    // Check if elem is an iframe, and if so, return the result of func on it.
     // If no iframes match, return null
-    function replace_elem_frame(elem, func) {
+    function call_if_frame(elem, func) {
         for (let i = 0; i < window.frames.length; ++i) {
-            if (iframe_same_domain(window.frames[i])) {
-                const frame = window.frames[i];
+            const frame = window.frames[i];
+            if (iframe_same_domain(frame)) {
                 if (frame.frameElement === elem) {
                     return func(frame);
                 }
@@ -279,7 +275,7 @@ window._qutebrowser.webelem = (function() {
         }
 
         // Check if we got an iframe, and if so, recurse inside of it
-        const frame_elem = replace_elem_frame(elem,
+        const frame_elem = call_if_frame(elem,
             (frame) => serialize_elem(frame.document.activeElement, frame));
 
         if (frame_elem === null) {
@@ -293,7 +289,7 @@ window._qutebrowser.webelem = (function() {
 
 
         // Check if we got an iframe, and if so, recurse inside of it
-        const frame_elem = replace_elem_frame(elem,
+        const frame_elem = call_if_frame(elem,
             (frame) => {
                 // Subtract offsets due to being in an iframe
                 const frame_offset_rect =
@@ -323,11 +319,7 @@ window._qutebrowser.webelem = (function() {
             }
             return null;
         });
-
-        if (serialized_frame_elem) {
-            return serialized_frame_elem;
-        }
-        return null;
+        return serialized_frame_elem;
     };
 
     funcs.set_value = (id, value) => {

From 7f9d4888fd3370628b5038f8591424f8d822daf7 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Fri, 15 Dec 2017 15:42:48 -0500
Subject: [PATCH 022/229] Fix a couple eslint errors

Restructure serialize_elem into a bunch of smaller functions
---
 qutebrowser/javascript/.eslintrc.yaml |  1 +
 qutebrowser/javascript/webelem.js     | 73 ++++++++++++++-------------
 2 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/qutebrowser/javascript/.eslintrc.yaml b/qutebrowser/javascript/.eslintrc.yaml
index b29deaa75..d46fec8ee 100644
--- a/qutebrowser/javascript/.eslintrc.yaml
+++ b/qutebrowser/javascript/.eslintrc.yaml
@@ -42,3 +42,4 @@ rules:
      function-paren-newline: "off"
      multiline-comment-style: "off"
      no-bitwise: "off"
+     no-ternary: "off"
diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index ae2e2ca5c..12459f148 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -40,6 +40,41 @@ window._qutebrowser.webelem = (function() {
     const funcs = {};
     const elements = [];
 
+    function get_frame_offset(frame) {
+        if (frame === null) {
+            // Dummy object with zero offset
+            return {
+                "top": 0,
+                "right": 0,
+                "bottom": 0,
+                "left": 0,
+                "height": 0,
+                "width": 0,
+            };
+        }
+        return frame.frameElement.getBoundingClientRect();
+    }
+
+    function get_caret_position(elem, frame) {
+        // With older Chromium versions (and QtWebKit), InvalidStateError will
+        // be thrown if elem doesn't have selectionStart.
+        // With newer Chromium versions (>= Qt 5.10), we get null.
+        try {
+            return elem.selectionStart;
+        } catch (err) {
+            if (err instanceof (frame
+                ? frame.DOMException
+                : DOMException) &&
+                err.name === "InvalidStateError") {
+                // nothing to do, caret_position is already null
+            } else {
+                // not the droid we're looking for
+                throw err;
+            }
+        }
+        return null;
+    }
+
     function serialize_elem(elem, frame = null) {
         if (!elem) {
             return null;
@@ -48,23 +83,7 @@ window._qutebrowser.webelem = (function() {
         const id = elements.length;
         elements[id] = elem;
 
-        // With older Chromium versions (and QtWebKit), InvalidStateError will
-        // be thrown if elem doesn't have selectionStart.
-        // With newer Chromium versions (>= Qt 5.10), we get null.
-        let caret_position = null;
-        try {
-            caret_position = elem.selectionStart;
-        } catch (err) {
-            if ((err instanceof DOMException ||
-                 (frame !== null &&
-                  err instanceof frame.DOMException)) &&
-                    err.name === "InvalidStateError") {
-                // nothing to do, caret_position is already null
-            } else {
-                // not the droid we're looking for
-                throw err;
-            }
-        }
+        const caret_position = get_caret_position(elem, frame);
 
         const out = {
             "id": id,
@@ -73,7 +92,6 @@ window._qutebrowser.webelem = (function() {
             "rects": [],  // Gets filled up later
             "caret_position": caret_position,
         };
-
         // https://github.com/qutebrowser/qutebrowser/issues/2569
         if (typeof elem.tagName === "string") {
             out.tag_name = elem.tagName;
@@ -104,22 +122,7 @@ window._qutebrowser.webelem = (function() {
         out.attributes = attributes;
 
         const client_rects = elem.getClientRects();
-
-        // Get location of frame if it exists and add it to element
-        let frame_offset_rect = null;
-        if (frame === null) {
-            // Dummy object with zero offset
-            frame_offset_rect = {
-                "top": 0,
-                "right": 0,
-                "bottom": 0,
-                "left": 0,
-                "height": 0,
-                "width": 0,
-            };
-        } else {
-            frame_offset_rect = frame.frameElement.getBoundingClientRect();
-        }
+        const frame_offset_rect = get_frame_offset(frame);
 
         for (let k = 0; k < client_rects.length; ++k) {
             const rect = client_rects[k];
@@ -184,7 +187,7 @@ window._qutebrowser.webelem = (function() {
     // cross domain errors, else false.
     function iframe_same_domain(frame) {
         try {
-            frame.document;
+            frame.document; // eslint-disable-line no-unused-expressions
             return true;
         } catch (err) {
             return false;

From 6433096611cd99477f730312282da4711bc8b6e3 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Fri, 15 Dec 2017 21:30:08 -0500
Subject: [PATCH 023/229] Disable max-lines in eslint

---
 qutebrowser/javascript/.eslintrc.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/javascript/.eslintrc.yaml b/qutebrowser/javascript/.eslintrc.yaml
index d46fec8ee..5382f053e 100644
--- a/qutebrowser/javascript/.eslintrc.yaml
+++ b/qutebrowser/javascript/.eslintrc.yaml
@@ -43,3 +43,4 @@ rules:
      multiline-comment-style: "off"
      no-bitwise: "off"
      no-ternary: "off"
+     max-lines: "off"

From 344ebed6ad2894b7152b0fc4f71a7c4eda00a0db Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Mon, 18 Dec 2017 11:00:03 -0800
Subject: [PATCH 024/229] Add iframe tests for insert on click and
 follow-selected

---
 tests/end2end/data/hints/html/wrapped.html    |  1 -
 .../data/hints/html/wrapped_button.html       | 23 +++++++++++++++++++
 tests/end2end/data/hints/iframe_button.html   | 11 +++++++++
 tests/end2end/data/hints/iframe_input.html    | 11 +++++++++
 tests/end2end/data/iframe_search.html         | 11 +++++++++
 tests/end2end/features/hints.feature          | 14 ++++++++++-
 tests/end2end/features/search.feature         | 19 +++++++++++++++
 7 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 tests/end2end/data/hints/html/wrapped_button.html
 create mode 100644 tests/end2end/data/hints/iframe_button.html
 create mode 100644 tests/end2end/data/hints/iframe_input.html
 create mode 100644 tests/end2end/data/iframe_search.html

diff --git a/tests/end2end/data/hints/html/wrapped.html b/tests/end2end/data/hints/html/wrapped.html
index 2ebde1a24..2af1a28c1 100644
--- a/tests/end2end/data/hints/html/wrapped.html
+++ b/tests/end2end/data/hints/html/wrapped.html
@@ -2,7 +2,6 @@
 
 <!--
 target: hello.txt
-qtwebengine_todo: Doesn't seem to work?
 -->
 
 <html>
diff --git a/tests/end2end/data/hints/html/wrapped_button.html b/tests/end2end/data/hints/html/wrapped_button.html
new file mode 100644
index 000000000..dc96bd1d5
--- /dev/null
+++ b/tests/end2end/data/hints/html/wrapped_button.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+
+<!--
+target: hello.txt
+-->
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Link wrapped across multiple lines</title>
+    </head>
+    <body>
+        <div style="width: 20em;">
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis <button id="myButton" class="float-left submit-button" >nostrud exercitation</button> ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+        </div>
+
+        <script type="text/javascript">
+            document.getElementById("myButton").onclick = function () {
+                location.href = "/data/hello.txt";
+            };
+        </script>
+    </body>
+</html>
diff --git a/tests/end2end/data/hints/iframe_button.html b/tests/end2end/data/hints/iframe_button.html
new file mode 100644
index 000000000..cd7bf203c
--- /dev/null
+++ b/tests/end2end/data/hints/iframe_button.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Hinting inside an iframe</title>
+    </head>
+    <body>
+        <iframe style="margin: 50px;" src="/data/hints/html/wrapped_button.html"></iframe>
+    </body>
+</html>
diff --git a/tests/end2end/data/hints/iframe_input.html b/tests/end2end/data/hints/iframe_input.html
new file mode 100644
index 000000000..143577747
--- /dev/null
+++ b/tests/end2end/data/hints/iframe_input.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Hinting inside an iframe</title>
+    </head>
+    <body>
+        <iframe style="margin: 50px;" src="/data/hints/input.html"></iframe>
+    </body>
+</html>
diff --git a/tests/end2end/data/iframe_search.html b/tests/end2end/data/iframe_search.html
new file mode 100644
index 000000000..a06c0ef3e
--- /dev/null
+++ b/tests/end2end/data/iframe_search.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Hinting inside an iframe</title>
+    </head>
+    <body>
+        <iframe style="margin: 50px;" src="/data/search.html"></iframe>
+    </body>
+</html>
diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 0f7868e31..f575d0423 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -209,6 +209,19 @@ Feature: Using hints
         And I hint with args "links normal" and follow a
         Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, *" should be logged
 
+    Scenario: Using :follow-hint inside an iframe button
+        When I open data/hints/iframe_button.html
+        And I hint with args "all normal" and follow s
+        Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, *" should be logged
+
+    Scenario: Hinting inputs in an iframe without type
+        When I open data/hints/iframe_input.html
+        And I hint with args "inputs" and follow a
+        And I wait for "Entering mode KeyMode.insert (reason: clicking input)" in the log
+        And I run :leave-mode
+        # The actual check is already done above
+        Then no crash should happen
+
     ### FIXME currenly skipped, see https://github.com/qutebrowser/qutebrowser/issues/1525
     @xfail_norun
     Scenario: Using :follow-hint inside a scrolled iframe
@@ -218,7 +231,6 @@ Feature: Using hints
         And I hint wht args "links normal" and follow a
         Then "navigation request: url http://localhost:*/data/hello2.txt, type NavigationTypeLinkClicked, *" should be logged
 
-    @qtwebengine_skip: Opens in new tab due to Chromium bug
     Scenario: Opening a link inside a specific iframe
         When I open data/hints/iframe_target.html
         And I hint with args "links normal" and follow a
diff --git a/tests/end2end/features/search.feature b/tests/end2end/features/search.feature
index 3778f963d..483bcc29f 100644
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -238,3 +238,22 @@ Feature: Searching on a page
         Then the following tabs should be open:
             - data/search.html
             - data/hello.txt (active)
+
+    Scenario: Follow a searched link in an iframe
+        When I open data/iframe_search.html
+        And I run :tab-only
+        And I run :search follow
+        And I wait for "search found follow" in the log
+        And I run :follow-selected
+        Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, is_main_frame False" should be logged
+
+    Scenario: Follow a tabbed searched link in an iframe
+        When I open data/iframe_search.html
+        And I run :tab-only
+        And I run :search follow
+        And I wait for "search found follow" in the log
+        And I run :follow-selected -t
+        And I wait until data/hello.txt is loaded
+        Then the following tabs should be open:
+            - data/iframe_search.html
+            - data/hello.txt (active)

From b87f0b6f65d5ca7d05426ee3397fb724e667834a Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Mon, 18 Dec 2017 17:04:50 -0800
Subject: [PATCH 025/229] Add support for non-link buttons to test_hints

---
 tests/end2end/test_hints_html.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/end2end/test_hints_html.py b/tests/end2end/test_hints_html.py
index abc106505..ff4837020 100644
--- a/tests/end2end/test_hints_html.py
+++ b/tests/end2end/test_hints_html.py
@@ -106,7 +106,11 @@ def test_hints(test_name, zoom_text_only, zoom_level, find_implementation,
         quteproc.set_setting('hints.find_implementation', find_implementation)
     quteproc.send_cmd(':zoom {}'.format(zoom_level))
     # follow hint
-    quteproc.send_cmd(':hint links normal')
+    if 'button' in test_name:
+        # We are hinting buttons, link hinting will not work
+        quteproc.send_cmd(':hint all normal')
+    else:
+        quteproc.send_cmd(':hint links normal')
     quteproc.wait_for(message='hints: a', category='hints')
     quteproc.send_cmd(':follow-hint a')
     quteproc.wait_for_load_finished('data/' + parsed.target)

From 012e63520f5ba90b9ab8c91754aa160010825954 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Mon, 18 Dec 2017 18:20:25 -0800
Subject: [PATCH 026/229] Blacklist non-implemented qtwebkit frame features

---
 tests/end2end/features/hints.feature  | 3 ++-
 tests/end2end/features/search.feature | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index f575d0423..5da03a085 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -212,7 +212,7 @@ Feature: Using hints
     Scenario: Using :follow-hint inside an iframe button
         When I open data/hints/iframe_button.html
         And I hint with args "all normal" and follow s
-        Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, *" should be logged
+        Then "navigation request: url http://localhost:*/data/hello.txt, *" should be logged
 
     Scenario: Hinting inputs in an iframe without type
         When I open data/hints/iframe_input.html
@@ -241,6 +241,7 @@ Feature: Using hints
         And I run :tab-only
         And I hint with args "links tab" and follow a
         And I wait until data/hello.txt is loaded
+        And I wait 0.5s
         Then the following tabs should be open:
             - data/hints/iframe_target.html
             - data/hello.txt (active)
diff --git a/tests/end2end/features/search.feature b/tests/end2end/features/search.feature
index 483bcc29f..7779ff28e 100644
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -239,6 +239,7 @@ Feature: Searching on a page
             - data/search.html
             - data/hello.txt (active)
 
+    @qtwebkit_skip: Not supported in qtwebkit
     Scenario: Follow a searched link in an iframe
         When I open data/iframe_search.html
         And I run :tab-only
@@ -247,6 +248,7 @@ Feature: Searching on a page
         And I run :follow-selected
         Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, is_main_frame False" should be logged
 
+    @qtwebkit_skip: Not supported in qtwebkit
     Scenario: Follow a tabbed searched link in an iframe
         When I open data/iframe_search.html
         And I run :tab-only

From a01566ed15f3f93ff034810e3d74d36d0d3657a1 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 28 Dec 2017 19:17:25 +0600
Subject: [PATCH 027/229] Fix loosed variable

---
 qutebrowser/browser/commands.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index cb744b23d..5c051a3ff 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -862,6 +862,7 @@ class CommandDispatcher:
         else:  # pragma: no cover
             raise ValueError("Invalid value {!r} for `what'.".format(what))
 
+        self.yank_object['what'] = what
         self._yank_to_target(s)
 
     def _yank_callback(self, s):

From 9728e90401a884a45de7f1bd72441f7ee5a63f37 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 28 Dec 2017 20:05:10 +0600
Subject: [PATCH 028/229] Enable test in webengine

---
 tests/end2end/features/editor.feature | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/end2end/features/editor.feature b/tests/end2end/features/editor.feature
index d3c634b0d..f1b53e90d 100644
--- a/tests/end2end/features/editor.feature
+++ b/tests/end2end/features/editor.feature
@@ -115,7 +115,6 @@ Feature: Opening external editors
         And I run :click-element id qute-button
         Then the javascript message "text: foobar" should be logged
 
-    @qtwebengine_todo: Caret mode is not implemented yet
     Scenario: Spawning an editor in caret mode
         When I set up a fake editor returning "foobar"
         And I open data/editor.html

From 63658d3a1e618e81687827d68961e7829aa3bd7b Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 28 Dec 2017 20:40:37 +0600
Subject: [PATCH 029/229] Catch userscript exception and show error message

---
 qutebrowser/browser/commands.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 5c051a3ff..53fb03830 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1247,7 +1247,10 @@ class CommandDispatcher:
         self.openurl(config.val.url.start_pages[0])
 
     def _selection_callback(self, s):
-        self._run_userscript(s)
+        try:
+            self._run_userscript(s)
+        except cmdexc.CommandError as e:
+            message.error(str(e))
 
     def _run_userscript(self, selection):
         """Run a userscript given as argument.

From 83f8d840128248231a98cd3776d4436c4e58cfbf Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 28 Dec 2017 22:27:47 +0600
Subject: [PATCH 030/229] Finally enable webengine test

---
 tests/end2end/features/editor.feature | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/end2end/features/editor.feature b/tests/end2end/features/editor.feature
index 15da4a6cd..d01e3d229 100644
--- a/tests/end2end/features/editor.feature
+++ b/tests/end2end/features/editor.feature
@@ -129,7 +129,6 @@ Feature: Opening external editors
         And I kill the waiting editor
         Then the error "Edited element vanished" should be shown
 
-    @qtwebengine_todo: Caret mode is not implemented yet
     Scenario: Spawning an editor in caret mode
         When I set up a fake editor returning "foobar"
         And I open data/editor.html

From 7d181ee4b53edb6064778802f427b52fe91004d5 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Thu, 28 Dec 2017 23:04:04 +0600
Subject: [PATCH 031/229] Check if document body exists

---
 qutebrowser/javascript/webengine_caret.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 7235c9772..af381f529 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -965,7 +965,8 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
             window.caretBrowsingLoaded = true;
             CaretBrowsing.init();
 
-            if (document.body.getAttribute("caretbrowsing") === "on") {
+            if (document.body && 
+                document.body.getAttribute("caretbrowsing") === "on") {
                 CaretBrowsing.forceEnabled = true;
                 CaretBrowsing.isEnabled = true;
                 CaretBrowsing.updateIsCaretVisible();

From 3b836d34836e90d4cdf7ddbadc91c89c27ea51fa Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 29 Dec 2017 17:56:16 +0600
Subject: [PATCH 032/229] Fix lint warnings

---
 qutebrowser/browser/commands.py           | 6 ++++--
 qutebrowser/javascript/webengine_caret.js | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index d3f865a52..653d70014 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1293,9 +1293,11 @@ class CommandDispatcher:
             env['QUTE_URL'] = url.toString(QUrl.FullyEncoded)
 
         try:
+            args = self.userscript_object['args']
+            verbose = self.userscript_object['verbose']
             userscripts.run_async(tab, self.userscript_object['cmd'],
-                *self.userscript_object['args'], win_id=self._win_id,
-                env=env, verbose=self.userscript_object['verbose'])
+                                  *args, win_id=self._win_id,
+                                  env=env, verbose=verbose)
         except userscripts.Error as e:
             raise cmdexc.CommandError(e)
         finally:
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index af381f529..be0d6eaa5 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -965,7 +965,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
             window.caretBrowsingLoaded = true;
             CaretBrowsing.init();
 
-            if (document.body && 
+            if (document.body &&
                 document.body.getAttribute("caretbrowsing") === "on") {
                 CaretBrowsing.forceEnabled = true;
                 CaretBrowsing.isEnabled = true;

From db16a87e68ca10cac2fcf17e8d4481b7999e7a26 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 29 Dec 2017 18:39:29 +0600
Subject: [PATCH 033/229] Removed unused import

---
 qutebrowser/keyinput/modeman.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index 719d29863..2c21908de 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -29,7 +29,6 @@ from qutebrowser.keyinput import modeparsers, keyparser
 from qutebrowser.config import config
 from qutebrowser.commands import cmdexc, cmdutils
 from qutebrowser.utils import usertypes, log, objreg, utils
-from qutebrowser.misc import objects
 
 
 @attr.s(frozen=True)

From 882beab3f244ef67742fb8285905af880444cf37 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 29 Dec 2017 19:01:12 +0600
Subject: [PATCH 034/229] Try to fix Windows caret ussues

---
 qutebrowser/javascript/webengine_caret.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index be0d6eaa5..4c2771451 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -468,6 +468,9 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     CaretBrowsing.blinkFlag = true;
 
+    CaretBrowsing.isWindows =
+        window.navigator.userAgent.indexOf("Windows") !== -1;
+
     CaretBrowsing.isControlThatNeedsArrowKeys = function(node) { // eslint-disable-line complexity,max-len
         if (!node) {
             return false;
@@ -860,9 +863,15 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
             getSelection().
             modify(action, direction, granularity);
 
-        window.setTimeout(() => {
-            CaretBrowsing.updateCaretOrSelection(true);
-        }, 0);
+        if (CaretBrowsing.isWindows &&
+                (direction === "forward" ||
+                    direction === "right")) {
+            CaretBrowsing.move("left", "character");
+        } else {
+            window.setTimeout(() => {
+                CaretBrowsing.updateCaretOrSelection(true);
+            }, 0);
+        }
     };
 
     CaretBrowsing.moveToBlock = function(paragraph, boundary) {

From d04a087c2bd9132603b704ed0c5edfefe3f43e02 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 29 Dec 2017 20:10:18 +0600
Subject: [PATCH 035/229] Try fix Windows caret issues 2

---
 qutebrowser/javascript/webengine_caret.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 4c2771451..79fb01dcb 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -865,7 +865,8 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
         if (CaretBrowsing.isWindows &&
                 (direction === "forward" ||
-                    direction === "right")) {
+                    direction === "right") &&
+                granularity === "word") {
             CaretBrowsing.move("left", "character");
         } else {
             window.setTimeout(() => {

From e254ea2fa7e617432c656ad7f9055c72af64e2bc Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 29 Dec 2017 23:43:39 +0600
Subject: [PATCH 036/229] Add license and description

---
 qutebrowser/javascript/webengine_caret.js | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 79fb01dcb..e7075cd33 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,3 +1,28 @@
+/**
+ * Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+ *
+ * This file is part of qutebrowser.
+ *
+ * qutebrowser is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * qutebrowser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Ported chrome-caretbrowsing extension.
+ * Create and control div caret, which listen commands from qutebrowser,
+ * change document selection model and div caret position.
+ */
+
 "use strict"; // eslint-disable-line max-lines
 
 window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,max-len

From 25436e2544d8224e3422efb7952180e732de122e Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 30 Dec 2017 09:43:16 +0600
Subject: [PATCH 037/229] Fix eslint warnings

---
 qutebrowser/javascript/webengine_caret.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index e7075cd33..001afa8a7 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,3 +1,4 @@
+// eslint-disable-line max-lines
 /**
  * Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
  *
@@ -23,7 +24,7 @@
  * change document selection model and div caret position.
  */
 
-"use strict"; // eslint-disable-line max-lines
+"use strict";
 
 window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,max-len
     function isElementInViewport(node) {  // eslint-disable-line complexity

From 981f5fd09b93a194f2e768697e6d260dfa078ece Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 30 Dec 2017 23:20:29 +0600
Subject: [PATCH 038/229] Remove unused import

---
 tests/end2end/features/test_caret_bdd.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/end2end/features/test_caret_bdd.py b/tests/end2end/features/test_caret_bdd.py
index ee6cda82c..abd1821d8 100644
--- a/tests/end2end/features/test_caret_bdd.py
+++ b/tests/end2end/features/test_caret_bdd.py
@@ -17,8 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-# pylint: disable=unused-import
-import pytest
 import pytest_bdd as bdd
 
 from end2end.features.test_yankpaste_bdd import init_fake_clipboard

From 6dc31087477e496d3be9b4cf8fc7d6b81adb994b Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 30 Dec 2017 23:35:12 +0600
Subject: [PATCH 039/229] Get OS name using python

---
 qutebrowser/browser/webengine/webenginetab.py |  3 ++-
 qutebrowser/javascript/webengine_caret.js     | 15 ++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index b816e8f2a..42cbc3d2a 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -21,6 +21,7 @@
 
 import math
 import functools
+import platform
 import html as html_utils
 
 import sip
@@ -202,7 +203,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_entered(self, mode):
         self._tab.run_js_async(
-            javascript.assemble('caret', 'setInitialCursor'))
+            javascript.assemble('caret', 'setInitialCursor', platform.platform()))
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 001afa8a7..89eb9969f 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -494,9 +494,6 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     CaretBrowsing.blinkFlag = true;
 
-    CaretBrowsing.isWindows =
-        window.navigator.userAgent.indexOf("Windows") !== -1;
-
     CaretBrowsing.isControlThatNeedsArrowKeys = function(node) { // eslint-disable-line complexity,max-len
         if (!node) {
             return false;
@@ -590,9 +587,9 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         document.body.appendChild(node);
     };
 
-    CaretBrowsing.setInitialCursor = function() {
-        const sel = window.getSelection();
-        if (sel.rangeCount > 0) {
+    CaretBrowsing.setInitialCursor = function(platform) {
+        CaretBrowsing.isWindows = platform === "Windows";
+        if (window.getSelection().rangeCount > 0) {
             return;
         }
 
@@ -960,7 +957,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         CaretBrowsing.isCaretVisible =
             (CaretBrowsing.isEnabled && CaretBrowsing.isWindowFocused);
         if (CaretBrowsing.isCaretVisible && !CaretBrowsing.caretElement) {
-            CaretBrowsing.setInitialCursor();
+            CaretBrowsing.setInitialCursor(CaretBrowsing.isWindows);
             CaretBrowsing.updateCaretOrSelection(true);
             if (CaretBrowsing.caretElement) {
                 CaretBrowsing.blinkFunctionId = window.setInterval(
@@ -1012,9 +1009,9 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     const funcs = {};
 
-    funcs.setInitialCursor = () => {
+    funcs.setInitialCursor = (platform) => {
         if (!CaretBrowsing.initiated) {
-            CaretBrowsing.setInitialCursor();
+            CaretBrowsing.setInitialCursor(platform);
             return;
         }
 

From fe4eb19ecfa43badf9c39cdeebff1ddbe0a38058 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 30 Dec 2017 23:37:17 +0600
Subject: [PATCH 040/229] Add link to chrome-caretbrowsing extension

---
 qutebrowser/javascript/webengine_caret.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 89eb9969f..9e217fe36 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -20,6 +20,8 @@
 
 /**
  * Ported chrome-caretbrowsing extension.
+ * https://cs.chromium.org/chromium/src/ui/accessibility/extensions/caretbrowsing/
+ *
  * Create and control div caret, which listen commands from qutebrowser,
  * change document selection model and div caret position.
  */

From e22dc1b5c6cd8720fde7bfd60762988a157c196a Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 30 Dec 2017 23:37:57 +0600
Subject: [PATCH 041/229] Update copyright year

---
 qutebrowser/javascript/webengine_caret.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 9e217fe36..99f6bd76a 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,6 +1,6 @@
 // eslint-disable-line max-lines
 /**
- * Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+ * Copyright 2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
  *
  * This file is part of qutebrowser.
  *

From 695f7341429b2b4e68b8aeb08051363f0261af82 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 30 Dec 2017 23:46:04 +0600
Subject: [PATCH 042/229] Extract js call method

---
 qutebrowser/browser/webengine/webenginetab.py | 58 +++++++------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 42cbc3d2a..38a16b323 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -208,87 +208,69 @@ class WebEngineCaret(browsertab.AbstractCaret):
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
         self.drop_selection()
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'toggle'))
+        self._js_call('toggle')
 
     def move_to_next_line(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveDown'))
+            self._js_call('moveDown')
 
     def move_to_prev_line(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveUp'))
+            self._js_call('moveUp')
 
     def move_to_next_char(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveRight'))
+            self._js_call('moveRight')
 
     def move_to_prev_char(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveLeft'))
+            self._js_call('moveLeft')
 
     def move_to_end_of_word(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfWord'))
+            self._js_call('moveToEndOfWord')
 
     def move_to_next_word(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToNextWord'))
+            self._js_call('moveToNextWord')
 
     def move_to_prev_word(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToPreviousWord'))
+            self._js_call('moveToPreviousWord')
 
     def move_to_start_of_line(self):
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'moveToStartOfLine'))
+        self._js_call('moveToStartOfLine')
 
     def move_to_end_of_line(self):
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'moveToEndOfLine'))
+        self._js_call('moveToEndOfLine')
 
     def move_to_start_of_next_block(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToStartOfNextBlock'))
+            self._js_call('moveToStartOfNextBlock')
 
     def move_to_start_of_prev_block(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToStartOfPrevBlock'))
+            self._js_call('moveToStartOfPrevBlock')
 
     def move_to_end_of_next_block(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfNextBlock'))
+            self._js_call('moveToEndOfNextBlock')
 
     def move_to_end_of_prev_block(self, count=1):
         for _ in range(count):
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'moveToEndOfPrevBlock'))
+            self._js_call('moveToEndOfPrevBlock')
 
     def move_to_start_of_document(self):
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'moveToStartOfDocument'))
+        self._js_call('moveToStartOfDocument')
 
     def move_to_end_of_document(self):
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'moveToEndOfDocument'))
+        self._js_call('moveToEndOfDocument')
 
     def toggle_selection(self):
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'toggleSelection'))
+        self._js_call('toggleSelection')
 
     def drop_selection(self):
-        self._tab.run_js_async(
-            javascript.assemble('caret', 'dropSelection'))
+        self._js_call('dropSelection')
 
     def has_selection(self):
         if qtutils.version_check('5.10'):
@@ -351,6 +333,10 @@ class WebEngineCaret(browsertab.AbstractCaret):
             self._tab.run_js_async(js_code, lambda jsret:
                                    self._follow_selected_cb(jsret, tab))
 
+    def _js_call(self, command):
+        self._tab.run_js_async(
+            javascript.assemble('caret', command))
+
 
 class WebEngineScroller(browsertab.AbstractScroller):
 

From e989d948edd81a7e6afd45592fe6764d35124ae0 Mon Sep 17 00:00:00 2001
From: Slackhead <slackhead@gmail.com>
Date: Sun, 31 Dec 2017 14:47:42 +0000
Subject: [PATCH 043/229] Add cycle-inputs.js to userscripts

---
 misc/userscripts/cycle-inputs.js | 43 ++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 misc/userscripts/cycle-inputs.js

diff --git a/misc/userscripts/cycle-inputs.js b/misc/userscripts/cycle-inputs.js
new file mode 100644
index 000000000..c395f6de2
--- /dev/null
+++ b/misc/userscripts/cycle-inputs.js
@@ -0,0 +1,43 @@
+/* Cycle <input> text boxes.
+ * works with the types defined in 'types'.
+ * Note: Does not work for <textarea>.
+ * 
+ * Example keybind: 
+ * CYCLE_INPUTS = "jseval -q -f ~/.config/qutebrowser/cycle-inputs.js"
+ * config.bind('gi', CYCLE_INPUTS)
+ *
+ * By dive on freenode <dave@dawoodfall.net>
+ */
+
+var inputs = document.getElementsByTagName("input");
+var found = false;
+var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
+var hidden = /hidden/;
+
+function ishidden(el) {
+	return hidden.test(el.attributes.value) || el.offsetParent === null;
+}
+
+for (var i = 0; i < inputs.length; i++) {
+	if (inputs[i] == document.activeElement) {
+		for (var j = i+1; j < inputs.length; j++) {
+			if (! ishidden(inputs[j]) && types.test(inputs[j].type)) {
+				inputs[j].focus();
+				found = true;
+				break;
+			}
+		}
+		break;
+	}
+}
+
+if (! found) {
+	for (i = 0; i < inputs.length; i++) {
+		if (! ishidden(inputs[i]) && types.test(inputs[i].type)) {
+			inputs[i].focus();
+			break;
+		}
+	}
+}
+
+// vim: tw=0

From 7aecebf028413750004b2e7bb3952f6aee66ca0d Mon Sep 17 00:00:00 2001
From: Slackhead <slackhead@gmail.com>
Date: Sun, 31 Dec 2017 15:08:36 +0000
Subject: [PATCH 044/229] Add cycle-inputs.js to scripts

---
 {misc/userscripts => scripts}/cycle-inputs.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {misc/userscripts => scripts}/cycle-inputs.js (100%)

diff --git a/misc/userscripts/cycle-inputs.js b/scripts/cycle-inputs.js
similarity index 100%
rename from misc/userscripts/cycle-inputs.js
rename to scripts/cycle-inputs.js

From b6662fd243c1180ac3f920b5e9f4e43365586f9e Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 5 Jan 2018 18:31:53 +0600
Subject: [PATCH 045/229] Use inner functions for callbacks

---
 qutebrowser/browser/commands.py | 68 ++++++++++++---------------------
 1 file changed, 24 insertions(+), 44 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 653d70014..724699c0b 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -65,8 +65,6 @@ class CommandDispatcher:
     def __init__(self, win_id, tabbed_browser):
         self._win_id = win_id
         self._tabbed_browser = tabbed_browser
-        self.yank_object = {}
-        self.userscript_object = {}
 
     def __repr__(self):
         return utils.get_repr(self)
@@ -840,11 +838,6 @@ class CommandDispatcher:
             sel: Use the primary selection instead of the clipboard.
             keep: Stay in visual mode after yanking the selection.
         """
-        self.yank_object = {
-            'sel': sel,
-            'what': what,
-            'keep': keep
-        }
         if what == 'title':
             s = self._tabbed_browser.page_title(self._current_index())
         elif what == 'domain':
@@ -856,39 +849,36 @@ class CommandDispatcher:
             s = self._yank_url(what)
             what = 'URL'  # For printing
         elif what == 'selection':
+            def yank_callback(s):
+                if not self._current_widget().caret.has_selection() or not s:
+                    message.info("Nothing to yank")
+                    return
+                self._yank_to_target(s, sel, what, keep)
+
             caret = self._current_widget().caret
-            caret.selection(False, self._yank_callback)
+            caret.selection(callback=yank_callback)
             return
         else:  # pragma: no cover
             raise ValueError("Invalid value {!r} for `what'.".format(what))
 
-        self.yank_object['what'] = what
-        self._yank_to_target(s)
+        self._yank_to_target(s, sel, what, keep)
 
-    def _yank_callback(self, s):
-        if not self._current_widget().caret.has_selection() or not s:
-            message.info("Nothing to yank")
-            return
-        self._yank_to_target(s)
-
-    def _yank_to_target(self, s):
-        if self.yank_object['sel'] and utils.supports_selection():
+    def _yank_to_target(self, s, sel, what, keep):
+        if sel and utils.supports_selection():
             target = "primary selection"
         else:
-            self.yank_object['sel'] = False
+            sel = False
             target = "clipboard"
 
-        utils.set_clipboard(s, selection=self.yank_object['sel'])
-        if self.yank_object['what'] != 'selection':
-            message.info("Yanked {} to {}: {}".format(
-                self.yank_object['what'], target, s))
+        utils.set_clipboard(s, selection=sel)
+        if what != 'selection':
+            message.info("Yanked {} to {}: {}".format(what, target, s))
         else:
             message.info("{} {} yanked to {}".format(
                 len(s), "char" if len(s) == 1 else "chars", target))
-            if not self.yank_object['keep']:
+            if not keep:
                 modeman.leave(self._win_id, KeyMode.caret, "yank selected",
                               maybe=True)
-        self.yank_object = None
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     @cmdutils.argument('count', count=True)
@@ -1222,18 +1212,19 @@ class CommandDispatcher:
         log.procs.debug("Executing {} with args {}, userscript={}".format(
             cmd, args, userscript))
         if userscript:
+            def selection_callback(s):
+                try:
+                    self._run_userscript(s, cmd, args, verbose)
+                except cmdexc.CommandError as e:
+                    message.error(str(e))
+
             # ~ expansion is handled by the userscript module.
             # dirty hack for async call because of:
             # https://bugreports.qt.io/browse/QTBUG-53134
             # until it fixed or blocked async call implemented:
             # https://github.com/qutebrowser/qutebrowser/issues/3327
-            self.userscript_object = {
-                'cmd': cmd,
-                'args': args,
-                'verbose': verbose
-            }
             caret = self._current_widget().caret
-            caret.selection(False, self._selection_callback)
+            caret.selection(callback=selection_callback)
         else:
             cmd = os.path.expanduser(cmd)
             proc = guiprocess.GUIProcess(what='command', verbose=verbose,
@@ -1253,13 +1244,7 @@ class CommandDispatcher:
         """Open main startpage in current tab."""
         self.openurl(config.val.url.start_pages[0])
 
-    def _selection_callback(self, s):
-        try:
-            self._run_userscript(s)
-        except cmdexc.CommandError as e:
-            message.error(str(e))
-
-    def _run_userscript(self, selection):
+    def _run_userscript(self, selection, cmd, args, verbose):
         """Run a userscript given as argument.
 
         Args:
@@ -1293,15 +1278,10 @@ class CommandDispatcher:
             env['QUTE_URL'] = url.toString(QUrl.FullyEncoded)
 
         try:
-            args = self.userscript_object['args']
-            verbose = self.userscript_object['verbose']
-            userscripts.run_async(tab, self.userscript_object['cmd'],
-                                  *args, win_id=self._win_id,
+            userscripts.run_async(tab, cmd, *args, win_id=self._win_id,
                                   env=env, verbose=verbose)
         except userscripts.Error as e:
             raise cmdexc.CommandError(e)
-        finally:
-            self.userscript_object = None
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def quickmark_save(self):

From 8268c1d7ffb2640410718e08eeb08ae29f5ef053 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 5 Jan 2018 19:02:19 +0600
Subject: [PATCH 046/229] Disable eslint rules globally

---
 qutebrowser/javascript/webengine_caret.js | 35 ++++++++++++-----------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 99f6bd76a..dc9b8194f 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,4 +1,4 @@
-// eslint-disable-line max-lines
+/* eslint-disable max-lines, max-len, max-statements, complexity, max-params, default-case */
 /**
  * Copyright 2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
  *
@@ -28,8 +28,8 @@
 
 "use strict";
 
-window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,max-len
-    function isElementInViewport(node) {  // eslint-disable-line complexity
+window._qutebrowser.caret = (function() {
+    function isElementInViewport(node) {
         let i;
         let boundingRect = (node.getClientRects()[0] ||
             node.getBoundingClientRect());
@@ -97,15 +97,17 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
             }
         }
         if (el !== undefined) {
-            const start = new Cursor(el, 0, ""); // eslint-disable-line no-use-before-define,max-len
-            const end = new Cursor(el, 0, ""); // eslint-disable-line no-use-before-define,max-len
+            /* eslint-disable no-use-before-define */
+            const start = new Cursor(el, 0, "");
+            const end = new Cursor(el, 0, "");
             const nodesCrossed = [];
-            const result = TraverseUtil.getNextChar( // eslint-disable-line no-use-before-define,max-len
+            const result = TraverseUtil.getNextChar(
                 start, end, nodesCrossed, true);
             if (result === null) {
                 return;
             }
-            CaretBrowsing.setAndValidateSelection(start, start); // eslint-disable-line no-use-before-define,max-len
+            CaretBrowsing.setAndValidateSelection(start, start);
+            /* eslint-enable no-use-before-define */
         }
     }
 
@@ -182,7 +184,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         return null;
     };
 
-    axs.color.Color = function(red, green, blue, alpha) { // eslint-disable-line max-params,max-len
+    axs.color.Color = function(red, green, blue, alpha) {
         this.red = red;
         this.green = green;
         this.blue = blue;
@@ -302,7 +304,8 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         return `rgba(${arr})`;
     };
 
-    const Cursor = function(node, index, text) { // eslint-disable-line func-style,max-len
+    // eslint-disable-next-line func-style
+    const Cursor = function(node, index, text) {
         this.node = node;
         this.index = index;
         this.text = text;
@@ -359,7 +362,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         return false;
     };
 
-    TraverseUtil.forwardsChar = function(cursor, nodesCrossed) { // eslint-disable-line max-statements,max-len
+    TraverseUtil.forwardsChar = function(cursor, nodesCrossed) {
         for (;;) {
             let childNode = null;
             if (!TraverseUtil.treatAsLeafNode(cursor.node)) {
@@ -425,7 +428,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         }
     };
 
-    TraverseUtil.getNextChar = function( // eslint-disable-line max-params
+    TraverseUtil.getNextChar = function(
         startCursor, endCursor, nodesCrossed, skipWhitespace) {
         startCursor.copyFrom(endCursor);
         let fChar = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
@@ -496,7 +499,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     CaretBrowsing.blinkFlag = true;
 
-    CaretBrowsing.isControlThatNeedsArrowKeys = function(node) { // eslint-disable-line complexity,max-len
+    CaretBrowsing.isControlThatNeedsArrowKeys = function(node) {
         if (!node) {
             return false;
         }
@@ -510,7 +513,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         }
 
         if (node.constructor === HTMLInputElement) {
-            switch (node.type) { // eslint-disable-line default-case
+            switch (node.type) {
             case "email":
             case "number":
             case "password":
@@ -533,7 +536,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
         if (node.getAttribute && isFocusable(node)) {
             const role = node.getAttribute("role");
-            switch (role) { // eslint-disable-line default-case
+            switch (role) {
             case "combobox":
             case "grid":
             case "gridcell":
@@ -716,7 +719,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         }
     };
 
-    CaretBrowsing.getCursorRect = function(cursor) { // eslint-disable-line max-statements,max-len
+    CaretBrowsing.getCursorRect = function(cursor) {
         let node = cursor.node;
         const index = cursor.index;
         const rect = {
@@ -770,7 +773,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
     };
 
     CaretBrowsing.updateCaretOrSelection =
-        function(scrollToSelection) { // eslint-disable-line max-statements
+        function(scrollToSelection) {
             const previousX = CaretBrowsing.caretX;
             const previousY = CaretBrowsing.caretY;
 

From 5553e64a75c835c27b637e1e86f0431ce5b4b9b7 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 5 Jan 2018 19:21:55 +0600
Subject: [PATCH 047/229] Restore chrome-caretbrowsing extension comments

---
 qutebrowser/javascript/webengine_caret.js | 292 +++++++++++++++++++++-
 1 file changed, 289 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index dc9b8194f..aeca235c9 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -1,4 +1,5 @@
-/* eslint-disable max-lines, max-len, max-statements, complexity, max-params, default-case */
+/* eslint-disable max-lines, max-len, max-statements, complexity,
+max-params, default-case, valid-jsdoc */
 /**
  * Copyright 2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
  *
@@ -111,6 +112,19 @@ window._qutebrowser.caret = (function() {
         }
     }
 
+    /**
+     * Return whether a node is focusable. This includes nodes whose tabindex
+     * attribute is set to "-1" explicitly - these nodes are not in the tab
+     * order, but they should still be focused if the user navigates to them
+     * using linear or smart DOM navigation.
+     *
+     * Note that when the tabIndex property of an Element is -1, that doesn't
+     * tell us whether the tabIndex attribute is missing or set to "-1" explicitly,
+     * so we have to check the attribute.
+     *
+     * @param {Object} targetNode The node to check if it's focusable.
+     * @return {boolean} True if the node is focusable.
+     */
     function isFocusable(targetNode) {
         if (!targetNode || typeof (targetNode.tabIndex) !== "number") {
             return false;
@@ -304,6 +318,21 @@ window._qutebrowser.caret = (function() {
         return `rgba(${arr})`;
     };
 
+    /**
+     * A class to represent a cursor location in the document,
+     * like the start position or end position of a selection range.
+     *
+     * Later this may be extended to support "virtual text" for an object,
+     * like the ALT text for an image.
+     *
+     * Note: we cache the text of a particular node at the time we
+     * traverse into it. Later we should add support for dynamically
+     * reloading it.
+     * @param {Node} node The DOM node.
+     * @param {number} index The index of the character within the node.
+     * @param {string} text The cached text contents of the node.
+     * @constructor
+     */
     // eslint-disable-next-line func-style
     const Cursor = function(node, index, text) {
         this.node = node;
@@ -311,18 +340,35 @@ window._qutebrowser.caret = (function() {
         this.text = text;
     };
 
+    /**
+     * @return {Cursor} A new cursor pointing to the same location.
+     */
     Cursor.prototype.clone = function() {
         return new Cursor(this.node, this.index, this.text);
     };
 
+    /**
+     * Modify this cursor to point to the location that another cursor points to.
+     * @param {Cursor} otherCursor The cursor to copy from.
+     */
     Cursor.prototype.copyFrom = function(otherCursor) {
         this.node = otherCursor.node;
         this.index = otherCursor.index;
         this.text = otherCursor.text;
     };
 
+    /**
+     * Utility functions for stateless DOM traversal.
+     * @constructor
+     */
     const TraverseUtil = {};
 
+    /**
+     * Gets the text representation of a node. This allows us to substitute
+     * alt text, names, or titles for html elements that provide them.
+     * @param {Node} node A DOM node.
+     * @return {string} A text string representation of the node.
+     */
     TraverseUtil.getNodeText = function(node) {
         if (node.constructor === Text) {
             return node.data;
@@ -330,16 +376,45 @@ window._qutebrowser.caret = (function() {
         return "";
     };
 
+    /**
+     * Return true if a node should be treated as a leaf node, because
+     * its children are properties of the object that shouldn't be traversed.
+     *
+     * TODO(dmazzoni): replace this with a predicate that detects nodes with
+     * ARIA roles and other objects that have their own description.
+     * For now we just detect a couple of common cases.
+     *
+     * @param {Node} node A DOM node.
+     * @return {boolean} True if the node should be treated as a leaf node.
+     */
     TraverseUtil.treatAsLeafNode = function(node) {
         return node.childNodes.length === 0 ||
             node.nodeName === "SELECT" ||
             node.nodeName === "OBJECT";
     };
 
+    /**
+     * Return true only if a single character is whitespace.
+     * From https://developer.mozilla.org/en/Whitespace_in_the_DOM,
+     * whitespace is defined as one of the characters
+     *  "\t" TAB \u0009
+     *  "\n" LF  \u000A
+     *  "\r" CR  \u000D
+     *  " "  SPC \u0020.
+     *
+     * @param {string} c A string containing a single character.
+     * @return {boolean} True if the character is whitespace, otherwise false.
+     */
     TraverseUtil.isWhitespace = function(ch) {
         return (ch === " " || ch === "\n" || ch === "\r" || ch === "\t");
     };
 
+    /**
+     * Use the computed CSS style to figure out if this DOM node is currently
+     * visible.
+     * @param {Node} node A HTML DOM node.
+     * @return {boolean} Whether or not the html node is visible.
+     */
     TraverseUtil.isVisible = function(node) {
         if (!node.style) {
             return true;
@@ -350,6 +425,11 @@ window._qutebrowser.caret = (function() {
             style.visibility !== "hidden");
     };
 
+    /**
+     * Use the class name to figure out if this DOM node should be traversed.
+     * @param {Node} node A HTML DOM node.
+     * @return {boolean} Whether or not the html node should be traversed.
+     */
     TraverseUtil.isSkipped = function(_node) {
         let node = _node;
         if (node.constructor === Text) {
@@ -362,6 +442,16 @@ window._qutebrowser.caret = (function() {
         return false;
     };
 
+    /**
+     * Moves the cursor forwards until it has crossed exactly one character.
+     * @param {Cursor} cursor The cursor location where the search should start.
+     *     On exit, the cursor will be immediately to the right of the
+     *     character returned.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @return {?string} The character found, or null if the bottom of the
+     *     document has been reached.
+     */
     TraverseUtil.forwardsChar = function(cursor, nodesCrossed) {
         for (;;) {
             let childNode = null;
@@ -386,11 +476,14 @@ window._qutebrowser.caret = (function() {
                     nodesCrossed.push(cursor.node);
                 }
             } else {
+                // Return the next character from this leaf node.
                 if (cursor.index < cursor.text.length) {
                     return cursor.text[cursor.index++];
                 }
 
+                // Move to the next sibling, going up the tree as necessary.
                 while (cursor.node !== null) {
+                    // Try to move to the next sibling.
                     let siblingNode = null;
                     for (let node = cursor.node.nextSibling;
                         node !== null;
@@ -414,6 +507,7 @@ window._qutebrowser.caret = (function() {
                         break;
                     }
 
+                    // Otherwise, move to the parent.
                     const parentNode = cursor.node.parentNode;
                     if (parentNode &&
                         parentNode.constructor !== HTMLBodyElement) {
@@ -428,16 +522,36 @@ window._qutebrowser.caret = (function() {
         }
     };
 
+    /**
+     * Finds the next character, starting from endCursor.  Upon exit, startCursor
+     * and endCursor will surround the next character. If skipWhitespace is
+     * true, will skip until a real character is found. Otherwise, it will
+     * attempt to select all of the whitespace between the initial position
+     * of endCursor and the next non-whitespace character.
+     * @param {Cursor} startCursor On exit, points to the position before
+     *     the char.
+     * @param {Cursor} endCursor The position to start searching for the next
+     *     char.  On exit, will point to the position past the char.
+     * @param {Array<Node>} nodesCrossed Any HTML nodes crossed between the
+     *     initial and final cursor position will be pushed onto this array.
+     * @param {boolean} skipWhitespace If true, will keep scanning until a
+     *     non-whitespace character is found.
+     * @return {?string} The next char, or null if the bottom of the
+     *     document has been reached.
+     */
     TraverseUtil.getNextChar = function(
         startCursor, endCursor, nodesCrossed, skipWhitespace) {
+        // Save the starting position and get the first character.
         startCursor.copyFrom(endCursor);
         let fChar = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
         if (fChar === null) {
             return null;
         }
 
+        // Keep track of whether the first character was whitespace.
         const initialWhitespace = TraverseUtil.isWhitespace(fChar);
 
+        // Keep scanning until we find a non-whitespace or non-skipped character.
         while ((TraverseUtil.isWhitespace(fChar)) ||
             (TraverseUtil.isSkipped(endCursor.node))) {
             fChar = TraverseUtil.forwardsChar(endCursor, nodesCrossed);
@@ -446,6 +560,8 @@ window._qutebrowser.caret = (function() {
             }
         }
         if (skipWhitespace || !initialWhitespace) {
+            // If skipWhitepace is true, or if the first character we encountered
+            // was not whitespace, return that non-whitespace character.
             startCursor.copyFrom(endCursor);
             startCursor.index--;
             return fChar;
@@ -453,52 +569,153 @@ window._qutebrowser.caret = (function() {
 
         for (let i = 0; i < nodesCrossed.length; i++) {
             if (TraverseUtil.isSkipped(nodesCrossed[i])) {
+                // We need to make sure that startCursor and endCursor aren't
+                // surrounding a skippable node.
                 endCursor.index--;
                 startCursor.copyFrom(endCursor);
                 startCursor.index--;
                 return " ";
             }
         }
+        // Otherwise, return all of the whitespace before that last character.
         endCursor.index--;
         return " ";
     };
 
+    /**
+     * The class handling the Caret Browsing implementation in the page.
+     * Sets up communication with the background page, and then when caret
+     * browsing is enabled, response to various key events to move the caret
+     * or selection within the text content of the document. Uses the native
+     * Chrome selection wherever possible, but displays its own flashing
+     * caret using a DIV because there's no native caret available.
+     * @constructor
+     */
     const CaretBrowsing = {};
 
+    /**
+     * Is caret browsing enabled?
+     * @type {boolean}
+     */
     CaretBrowsing.isEnabled = false;
 
+    /**
+     * Keep it enabled even when flipped off (for the options page)?
+     * @type {boolean}
+     */
     CaretBrowsing.forceEnabled = false;
 
+    /**
+     * What to do when the caret appears?
+     * @type {string}
+     */
     CaretBrowsing.onEnable = undefined;
 
+    /**
+     * What to do when the caret jumps?
+     * @type {string}
+     */
     CaretBrowsing.onJump = undefined;
 
+    /**
+     * Is this window / iframe focused? We won't show the caret if not,
+     * especially so that carets aren't shown in two iframes of the same
+     * tab.
+     * @type {boolean}
+     */
     CaretBrowsing.isWindowFocused = false;
 
+    /**
+     * Is the caret actually visible? This is true only if isEnabled and
+     * isWindowFocused are both true.
+     * @type {boolean}
+     */
     CaretBrowsing.isCaretVisible = false;
 
+    /**
+     * The actual caret element, an absolute-positioned flashing line.
+     * @type {Element}
+     */
     CaretBrowsing.caretElement = undefined;
 
+    /**
+     * The x-position of the caret, in absolute pixels.
+     * @type {number}
+     */
     CaretBrowsing.caretX = 0;
 
+    /**
+     * The y-position of the caret, in absolute pixels.
+     * @type {number}
+     */
     CaretBrowsing.caretY = 0;
 
+    /**
+     * The width of the caret in pixels.
+     * @type {number}
+     */
     CaretBrowsing.caretWidth = 0;
 
+    /**
+     * The height of the caret in pixels.
+     * @type {number}
+     */
     CaretBrowsing.caretHeight = 0;
 
+    /**
+     * The foregroundc color.
+     * @type {string}
+     */
     CaretBrowsing.caretForeground = "#000";
 
+    /**
+     * The backgroundc color.
+     * @type {string}
+     */
     CaretBrowsing.caretBackground = "#fff";
 
+    /**
+     * Is the selection collapsed, i.e. are the start and end locations
+     * the same? If so, our blinking caret image is shown; otherwise
+     * the Chrome selection is shown.
+     * @type {boolean}
+     */
     CaretBrowsing.isSelectionCollapsed = false;
 
+    /**
+     * The id returned by window.setInterval for our blink function, so
+     * we can cancel it when caret browsing is disabled.
+     * @type {number?}
+     */
     CaretBrowsing.blinkFunctionId = null;
 
+    /**
+     * The desired x-coordinate to match when moving the caret up and down.
+     * To match the behavior as documented in Mozilla's caret browsing spec
+     * (http://www.mozilla.org/access/keyboard/proposal), we keep track of the
+     * initial x position when the user starts moving the caret up and down,
+     * so that the x position doesn't drift as you move throughout lines, but
+     * stays as close as possible to the initial position. This is reset when
+     * moving left or right or clicking.
+     * @type {number?}
+     */
     CaretBrowsing.targetX = null;
 
+    /**
+     * A flag that flips on or off as the caret blinks.
+     * @type {boolean}
+     */
     CaretBrowsing.blinkFlag = true;
 
+    /**
+     * Check if a node is a control that normally allows the user to interact
+     * with it using arrow keys. We won't override the arrow keys when such a
+     * control has focus, the user must press Escape to do caret browsing outside
+     * that control.
+     * @param {Node} node A node to check.
+     * @return {boolean} True if this node is a control that the user can
+     *     interact with using arrow keys.
+     */
     CaretBrowsing.isControlThatNeedsArrowKeys = function(node) {
         if (!node) {
             return false;
@@ -522,7 +739,7 @@ window._qutebrowser.caret = (function() {
             case "tel":
             case "url":
             case "":
-                return true;
+                return true;  // All of these are text boxes.
             case "datetime":
             case "datetime-local":
             case "date":
@@ -530,10 +747,11 @@ window._qutebrowser.caret = (function() {
             case "radio":
             case "range":
             case "week":
-                return true;
+                return true;  // These are other input elements that use arrows.
             }
         }
 
+        // Handle focusable ARIA controls.
         if (node.getAttribute && isFocusable(node)) {
             const role = node.getAttribute("role");
             switch (role) {
@@ -592,6 +810,10 @@ window._qutebrowser.caret = (function() {
         document.body.appendChild(node);
     };
 
+    /**
+     * If there's no initial selection, set the cursor just before the
+     * first text character in the document.
+     */
     CaretBrowsing.setInitialCursor = function(platform) {
         CaretBrowsing.isWindows = platform === "Windows";
         if (window.getSelection().rangeCount > 0) {
@@ -605,6 +827,13 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.selectionEnabled = false;
     };
 
+    /**
+     * Try to set the window's selection to be between the given start and end
+     * cursors, and return whether or not it was successful.
+     * @param {Cursor} start The start position.
+     * @param {Cursor} end The end position.
+     * @return {boolean} True if the selection was successfully set.
+     */
     CaretBrowsing.setAndValidateSelection = function(start, end) {
         const sel = window.getSelection();
         sel.setBaseAndExtent(start.node, start.index, end.node, end.index);
@@ -619,6 +848,13 @@ window._qutebrowser.caret = (function() {
             sel.focusOffset === end.index);
     };
 
+    /**
+     * Set focus to a node if it's focusable. If it's an input element,
+     * select the text, otherwise it doesn't appear focused to the user.
+     * Every other control behaves normally if you just call focus() on it.
+     * @param {Node} node The node to focus.
+     * @return {boolean} True if the node was focused.
+     */
     CaretBrowsing.setFocusToNode = function(nodeArg) {
         let node = nodeArg;
         while (node && node !== document.body) {
@@ -635,6 +871,9 @@ window._qutebrowser.caret = (function() {
         return false;
     };
 
+    /**
+     * Set the caret element's normal style, i.e. not when animating.
+     */
     CaretBrowsing.setCaretElementNormalStyle = function() {
         const element = CaretBrowsing.caretElement;
         element.className = "CaretBrowsing_Caret";
@@ -650,6 +889,9 @@ window._qutebrowser.caret = (function() {
         element.style.color = CaretBrowsing.caretForeground;
     };
 
+    /**
+     * Animate the caret element into the normal style.
+     */
     CaretBrowsing.animateCaretElement = function() {
         const element = CaretBrowsing.caretElement;
         element.style.left = `${CaretBrowsing.caretX - 50}px`;
@@ -658,6 +900,8 @@ window._qutebrowser.caret = (function() {
         element.style.height = `${CaretBrowsing.caretHeight + 200}px`;
         element.className = "CaretBrowsing_AnimateCaret";
 
+        // Start the animation. The setTimeout is so that the old values will get
+        // applied first, so we can animate to the new values.
         window.setTimeout(() => {
             if (!CaretBrowsing.caretElement) {
                 return;
@@ -674,6 +918,9 @@ window._qutebrowser.caret = (function() {
         }, 0);
     };
 
+    /**
+     * Quick flash and then show the normal caret style.
+     */
     CaretBrowsing.flashCaretElement = function() {
         const x = CaretBrowsing.caretX;
         const y = CaretBrowsing.caretY;
@@ -694,6 +941,11 @@ window._qutebrowser.caret = (function() {
         }, 250);
     };
 
+    /**
+     * Create the caret element. This assumes that caretX, caretY,
+     * caretWidth, and caretHeight have all been set. The caret is
+     * animated in so the user can find it when it first appears.
+     */
     CaretBrowsing.createCaretElement = function() {
         const element = document.createElement("div");
         element.className = "CaretBrowsing_Caret";
@@ -709,6 +961,9 @@ window._qutebrowser.caret = (function() {
         }
     };
 
+    /**
+     * Recreate the caret element, triggering any intro animation.
+     */
     CaretBrowsing.recreateCaretElement = function() {
         if (CaretBrowsing.caretElement) {
             window.clearInterval(CaretBrowsing.blinkFunctionId);
@@ -719,6 +974,15 @@ window._qutebrowser.caret = (function() {
         }
     };
 
+    /**
+     * Get the rectangle for a cursor position. This is tricky because
+     * you can't get the bounding rectangle of an empty range, so this function
+     * computes the rect by trying a range including one character earlier or
+     * later than the cursor position.
+     * @param {Cursor} cursor A single cursor position.
+     * @return {{left: number, top: number, width: number, height: number}}
+     *     The bounding rectangle of the cursor.
+     */
     CaretBrowsing.getCursorRect = function(cursor) {
         let node = cursor.node;
         const index = cursor.index;
@@ -772,6 +1036,12 @@ window._qutebrowser.caret = (function() {
         return rect;
     };
 
+    /**
+     * Compute the new location of the caret or selection and update
+     * the element as needed.
+     * @param {boolean} scrollToSelection If true, will also scroll the page
+     *     to the caret / selection location.
+     */
     CaretBrowsing.updateCaretOrSelection =
         function(scrollToSelection) {
             const previousX = CaretBrowsing.caretX;
@@ -857,6 +1127,8 @@ window._qutebrowser.caret = (function() {
             CaretBrowsing.caretForeground = axs.color.colorToString(fg);
 
             if (scrollToSelection) {
+                // Scroll just to the "focus" position of the selection,
+                // the part the user is manipulating.
                 const rect = CaretBrowsing.getCursorRect(
                     new Cursor(sel.focusNode, sel.focusOffset,
                         TraverseUtil.getNodeText(sel.focusNode)));
@@ -933,6 +1205,13 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.updateIsCaretVisible();
     };
 
+    /**
+     * Event handler, called when the mouse is clicked. Chrome already
+     * sets the selection when the mouse is clicked, all we need to do is
+     * update our cursor.
+     * @param {Event} evt The DOM event.
+     * @return {boolean} True if the default action should be performed.
+     */
     CaretBrowsing.onClick = function() {
         if (!CaretBrowsing.isEnabled) {
             return true;
@@ -944,6 +1223,9 @@ window._qutebrowser.caret = (function() {
         return true;
     };
 
+    /**
+     * Called at a regular interval. Blink the cursor by changing its visibility.
+     */
     CaretBrowsing.caretBlinkFunction = function() {
         if (CaretBrowsing.caretElement) {
             if (CaretBrowsing.blinkFlag) {
@@ -958,6 +1240,10 @@ window._qutebrowser.caret = (function() {
         }
     };
 
+    /**
+     * Update whether or not the caret is visible, based on whether caret browsing
+     * is enabled and whether this window / iframe has focus.
+     */
     CaretBrowsing.updateIsCaretVisible = function() {
         CaretBrowsing.isCaretVisible =
             (CaretBrowsing.isEnabled && CaretBrowsing.isWindowFocused);

From dc8c919c30b52427ffdd2796d449eca9fbf7e1f9 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 5 Jan 2018 22:44:07 +0600
Subject: [PATCH 048/229] Fix pylint warnings

---
 qutebrowser/browser/commands.py               |  8 +++----
 qutebrowser/browser/webengine/webenginetab.py |  5 ++--
 qutebrowser/javascript/webengine_caret.js     | 24 ++++++++++++-------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 724699c0b..3fa6fd772 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -849,14 +849,14 @@ class CommandDispatcher:
             s = self._yank_url(what)
             what = 'URL'  # For printing
         elif what == 'selection':
-            def yank_callback(s):
+            def _selection_callback(s):
                 if not self._current_widget().caret.has_selection() or not s:
                     message.info("Nothing to yank")
                     return
                 self._yank_to_target(s, sel, what, keep)
 
             caret = self._current_widget().caret
-            caret.selection(callback=yank_callback)
+            caret.selection(callback=_selection_callback)
             return
         else:  # pragma: no cover
             raise ValueError("Invalid value {!r} for `what'.".format(what))
@@ -1212,7 +1212,7 @@ class CommandDispatcher:
         log.procs.debug("Executing {} with args {}, userscript={}".format(
             cmd, args, userscript))
         if userscript:
-            def selection_callback(s):
+            def _selection_callback(s):
                 try:
                     self._run_userscript(s, cmd, args, verbose)
                 except cmdexc.CommandError as e:
@@ -1224,7 +1224,7 @@ class CommandDispatcher:
             # until it fixed or blocked async call implemented:
             # https://github.com/qutebrowser/qutebrowser/issues/3327
             caret = self._current_widget().caret
-            caret.selection(callback=selection_callback)
+            caret.selection(callback=_selection_callback)
         else:
             cmd = os.path.expanduser(cmd)
             proc = guiprocess.GUIProcess(what='command', verbose=verbose,
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 38a16b323..efc4c3035 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -203,12 +203,13 @@ class WebEngineCaret(browsertab.AbstractCaret):
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_entered(self, mode):
         self._tab.run_js_async(
-            javascript.assemble('caret', 'setInitialCursor', platform.platform()))
+            javascript.assemble('caret', 'setInitialCursor',
+                                platform.platform()))
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
         self.drop_selection()
-        self._js_call('toggle')
+        self._js_call('disableCaret')
 
     def move_to_next_line(self, count=1):
         for _ in range(count):
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index aeca235c9..5daa4aae4 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -816,15 +816,15 @@ window._qutebrowser.caret = (function() {
      */
     CaretBrowsing.setInitialCursor = function(platform) {
         CaretBrowsing.isWindows = platform === "Windows";
-        if (window.getSelection().rangeCount > 0) {
-            return;
+        const selectionRange = window.getSelection().toString().length;
+        if (selectionRange === 0) {
+            positionCaret();
         }
 
-        positionCaret();
         CaretBrowsing.injectCaretStyles();
         CaretBrowsing.toggle();
         CaretBrowsing.initiated = true;
-        CaretBrowsing.selectionEnabled = false;
+        CaretBrowsing.selectionEnabled = selectionRange > 0;
     };
 
     /**
@@ -1193,15 +1193,17 @@ window._qutebrowser.caret = (function() {
         }, 0);
     };
 
-    CaretBrowsing.toggle = function() {
+    CaretBrowsing.toggle = function(value) {
         if (CaretBrowsing.forceEnabled) {
             CaretBrowsing.recreateCaretElement();
             return;
         }
 
-        CaretBrowsing.isEnabled = !CaretBrowsing.isEnabled;
-        const obj = {};
-        obj.enabled = CaretBrowsing.isEnabled;
+        if (value === undefined) {
+            CaretBrowsing.isEnabled = !CaretBrowsing.isEnabled;
+        } else {
+            CaretBrowsing.isEnabled = value;
+        }
         CaretBrowsing.updateIsCaretVisible();
     };
 
@@ -1306,12 +1308,16 @@ window._qutebrowser.caret = (function() {
             return;
         }
 
-        if (!window.getSelection().toString()) {
+        if (window.getSelection().toString().length === 0) {
             positionCaret();
         }
         CaretBrowsing.toggle();
     };
 
+    funcs.disableCaret = () => {
+        CaretBrowsing.toggle(false);
+    };
+
     funcs.toggle = () => {
         CaretBrowsing.toggle();
     };

From c4e50369e7a08f113f1ad6df64180ec7983aba16 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 6 Jan 2018 22:43:39 +0600
Subject: [PATCH 049/229] Enable caret only when mode is 'caret'

---
 qutebrowser/browser/webengine/webenginetab.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index efc4c3035..ea646cda3 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -202,6 +202,9 @@ class WebEngineCaret(browsertab.AbstractCaret):
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_entered(self, mode):
+        if mode != usertypes.KeyMode.caret:
+            return
+
         self._tab.run_js_async(
             javascript.assemble('caret', 'setInitialCursor',
                                 platform.platform()))

From aebd59247d85938aabce7848ceefdf33836545a0 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 6 Jan 2018 22:45:53 +0600
Subject: [PATCH 050/229] Check `platform` variable

---
 qutebrowser/javascript/webengine_caret.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 5daa4aae4..052d3a4c1 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -815,7 +815,9 @@ window._qutebrowser.caret = (function() {
      * first text character in the document.
      */
     CaretBrowsing.setInitialCursor = function(platform) {
-        CaretBrowsing.isWindows = platform === "Windows";
+        if (platform) {
+            CaretBrowsing.isWindows = platform.indexOf("Windows") !== -1;
+        }
         const selectionRange = window.getSelection().toString().length;
         if (selectionRange === 0) {
             positionCaret();

From 8500509532133a55130f4f40ca1baace0f6a97f7 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sat, 6 Jan 2018 11:13:54 -0800
Subject: [PATCH 051/229] Implement is_visible for same-origin frames

---
 qutebrowser/javascript/webelem.js | 33 +++++++++++++++++++------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 12459f148..c236a5b0a 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -55,6 +55,18 @@ window._qutebrowser.webelem = (function() {
         return frame.frameElement.getBoundingClientRect();
     }
 
+    // Add an offset rect to a base rect, for use with frames
+    function add_offset_rect(base, offset) {
+        return {
+            "top": base.top + offset.top,
+            "left": base.left + offset.left,
+            "bottom": base.bottom + offset.top,
+            "right": base.right + offset.left,
+            "height": base.height,
+            "width": base.width,
+        };
+    }
+
     function get_caret_position(elem, frame) {
         // With older Chromium versions (and QtWebKit), InvalidStateError will
         // be thrown if elem doesn't have selectionStart.
@@ -126,14 +138,9 @@ window._qutebrowser.webelem = (function() {
 
         for (let k = 0; k < client_rects.length; ++k) {
             const rect = client_rects[k];
-            out.rects.push({
-                "top": rect.top + frame_offset_rect.top,
-                "right": rect.right + frame_offset_rect.right,
-                "bottom": rect.bottom + frame_offset_rect.bottom,
-                "left": rect.left + frame_offset_rect.left,
-                "height": rect.height,
-                "width": rect.width,
-            });
+            out.rects.push(
+                add_offset_rect(rect, frame_offset_rect)
+            );
         }
 
         // console.log(JSON.stringify(out));
@@ -141,9 +148,7 @@ window._qutebrowser.webelem = (function() {
         return out;
     }
 
-    function is_visible(elem) {
-        // FIXME:qtwebengine Handle frames and iframes
-
+    function is_visible(elem, frame = null) {
         // Adopted from vimperator:
         // https://github.com/vimperator/vimperator-labs/blob/vimperator-3.14.0/common/content/hints.js#L259-L285
         // FIXME:qtwebengine we might need something more sophisticated like
@@ -151,7 +156,8 @@ window._qutebrowser.webelem = (function() {
         // https://github.com/1995eaton/chromium-vim/blob/1.2.85/content_scripts/dom.js#L74-L134
 
         const win = elem.ownerDocument.defaultView;
-        let rect = elem.getBoundingClientRect();
+        const offset_rect = get_frame_offset(frame);
+        let rect = add_offset_rect(elem.getBoundingClientRect(), offset_rect);
 
         if (!rect ||
                 rect.top > window.innerHeight ||
@@ -212,7 +218,8 @@ window._qutebrowser.webelem = (function() {
                 const subelems = frame.document.
                     querySelectorAll(selector);
                 for (let elem_num = 0; elem_num < subelems.length; ++elem_num) {
-                    if (!only_visible || is_visible(subelems[elem_num])) {
+                    if (!only_visible ||
+                        is_visible(subelems[elem_num], frame)) {
                         out.push(serialize_elem(subelems[elem_num], frame));
                     }
                 }

From 81a9ea58d6eedc24ab849f655adccfb15c65b457 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sun, 7 Jan 2018 09:25:29 +0600
Subject: [PATCH 052/229] Restore pylint rule

---
 tests/end2end/features/test_caret_bdd.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/end2end/features/test_caret_bdd.py b/tests/end2end/features/test_caret_bdd.py
index abd1821d8..ec9506859 100644
--- a/tests/end2end/features/test_caret_bdd.py
+++ b/tests/end2end/features/test_caret_bdd.py
@@ -19,6 +19,7 @@
 
 import pytest_bdd as bdd
 
+# pylint: disable=unused-import
 from end2end.features.test_yankpaste_bdd import init_fake_clipboard
 
 bdd.scenarios('caret.feature')

From f7a08dfd345659114d07e0e0bebe79523da82558 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 16:57:05 -0500
Subject: [PATCH 053/229] use tabs.mode_on_change to persist or restore mode

---
 qutebrowser/mainwindow/tabbedbrowser.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index c51a7aaff..9c140f8a7 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -649,17 +649,23 @@ class TabbedBrowser(tabwidget.TabWidget):
             log.webview.debug("on_current_changed got called with invalid "
                               "index {}".format(idx))
             return
+        if self._now_focused and config.val.tabs.mode_on_change == 'restore':
+            current_mode = modeman.instance(self._win_id).mode
+            if not current_mode in (usertypes.KeyMode.insert,usertypes.KeyMode.passthrough):
+                current_mode = usertypes.KeyMode.normal
+            self._now_focused.data.input_mode = current_mode
 
         log.modes.debug("Current tab changed, focusing {!r}".format(tab))
         tab.setFocus()
 
         modes_to_leave = [usertypes.KeyMode.hint, usertypes.KeyMode.caret]
-        if not config.val.tabs.persist_mode_on_change:
+        if not config.val.tabs.mode_on_change == 'persist':
             modes_to_leave += [usertypes.KeyMode.insert,
                                usertypes.KeyMode.passthrough]
         for mode in modes_to_leave:
             modeman.leave(self._win_id, mode, 'tab changed', maybe=True)
-
+        if config.val.tabs.mode_on_change == 'restore':
+            modeman.enter(self._win_id, tab.data.input_mode, 'restore input mode for tab')
         if self._now_focused is not None:
             objreg.register('last-focused-tab', self._now_focused, update=True,
                             scope='window', window=self._win_id)

From c87d8d0d8f6c2a383ee98500f28991ecca76ad4a Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 17:02:34 -0500
Subject: [PATCH 054/229] add propery to save tab input mode

---
 qutebrowser/browser/browsertab.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index eb0e55c4b..9b59f64fc 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -107,6 +107,7 @@ class TabData:
     override_target = attr.ib(None)
     pinned = attr.ib(False)
     fullscreen = attr.ib(False)
+    input_mode = usertypes.KeyMode.normal
 
 
 class AbstractAction:

From 5dbfff016e70941f86c3a2a95dd90e4bb644c2f4 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 17:05:47 -0500
Subject: [PATCH 055/229] replace persist_mode_on_change with mode_on_change

supports old persist_mode_on_change functionality or new save/restore mode
---
 qutebrowser/config/configdata.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index a118a8b59..ebe52b7ea 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1251,10 +1251,15 @@ tabs.padding:
   type: Padding
   desc: Padding (in pixels) around text for tabs.
 
-tabs.persist_mode_on_change:
-  default: false
-  type: Bool
-  desc: Stay in insert/passthrough mode when switching tabs.
+tabs.mode_on_change:
+  default: normal
+  type:
+    name: String
+    valid_values:
+      - persist: "retain the current mode."
+      - restore: "restore previously saved mode"
+      - normal:  "always revert to normal mode"
+  desc: When switching tabs, what input mode is applied.
 
 tabs.position:
   default: top

From 81b85994a12dd2cbf19b6b118496743eb6f7135b Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sun, 14 Jan 2018 13:29:51 -0500
Subject: [PATCH 056/229] document code a bit more

---
 qutebrowser/browser/browsertab.py       | 1 +
 qutebrowser/mainwindow/tabbedbrowser.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 9b59f64fc..c9d2f540a 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -99,6 +99,7 @@ class TabData:
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
         fullscreen: Whether the tab has a video shown fullscreen currently.
+        input_mode: current input mode for the tab. (insert, passthrough, normal)
     """
 
     keep_icon = attr.ib(False)
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 9c140f8a7..896e2f8ab 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -651,6 +651,7 @@ class TabbedBrowser(tabwidget.TabWidget):
             return
         if self._now_focused and config.val.tabs.mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
+            # only save insert & passthrough mode. otherwise default to normal
             if not current_mode in (usertypes.KeyMode.insert,usertypes.KeyMode.passthrough):
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode

From 05d076ba9f9c40e414ed0ca40326d35044d7005d Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 09:00:06 -0500
Subject: [PATCH 057/229] fix asciidoc for tabs.mode_on_change

---
 doc/help/settings.asciidoc        | 18 ++++++++++++------
 qutebrowser/config/configdata.yml |  6 +++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 53af8399d..6b5fe34c9 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -241,7 +241,7 @@
 |<<tabs.new_position.related,tabs.new_position.related>>|Position of new tabs opened from another tab.
 |<<tabs.new_position.unrelated,tabs.new_position.unrelated>>|Position of new tabs which aren't opened from another tab.
 |<<tabs.padding,tabs.padding>>|Padding (in pixels) around text for tabs.
-|<<tabs.persist_mode_on_change,tabs.persist_mode_on_change>>|Stay in insert/passthrough mode when switching tabs.
+|<<tabs.mode_on_change,tabs.mode_on_change>>|Set input mode behavior when switching tab.
 |<<tabs.pinned.shrink,tabs.pinned.shrink>>|Shrink pinned tabs down to their contents.
 |<<tabs.position,tabs.position>>|Position of the tab bar.
 |<<tabs.select_on_remove,tabs.select_on_remove>>|Which tab to select when the focused tab is removed.
@@ -2824,13 +2824,19 @@ Default:
 - +pass:[right]+: +pass:[5]+
 - +pass:[top]+: +pass:[0]+
 
-[[tabs.persist_mode_on_change]]
-=== tabs.persist_mode_on_change
-Stay in insert/passthrough mode when switching tabs.
+[[tabs.mode_on_change]]
+=== tabs.mode_on_change
+When switching tabs, what input mode is applied.
 
-Type: <<types,Bool>>
+Type: <<types,String>>
 
-Default: +pass:[false]+
+Valid values:
+
+ * +persist+: Retain the current mode.
+ * +restore+: Restore previously saved mode.
+ * +normal+: Always revert to normal mode.
+
+Default: +pass:[normal]+
 
 [[tabs.pinned.shrink]]
 === tabs.pinned.shrink
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index ebe52b7ea..921034288 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1256,9 +1256,9 @@ tabs.mode_on_change:
   type:
     name: String
     valid_values:
-      - persist: "retain the current mode."
-      - restore: "restore previously saved mode"
-      - normal:  "always revert to normal mode"
+      - persist: "Retain the current mode."
+      - restore: "Restore previously saved mode."
+      - normal:  "Always revert to normal mode."
   desc: When switching tabs, what input mode is applied.
 
 tabs.position:

From 7d620a4bfc80c3120071d91cb3492111621ed3de Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 13:39:42 -0500
Subject: [PATCH 058/229] fix pylint/flake8 errors

---
 qutebrowser/mainwindow/tabbedbrowser.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 896e2f8ab..b325b5e1c 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -652,7 +652,8 @@ class TabbedBrowser(tabwidget.TabWidget):
         if self._now_focused and config.val.tabs.mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
             # only save insert & passthrough mode. otherwise default to normal
-            if not current_mode in (usertypes.KeyMode.insert,usertypes.KeyMode.passthrough):
+            input_modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
+            if current_mode not in input_modes:
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode
 

From 9bb256b54502c1c463a1d631b9fccdd2d88bcc03 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 16:19:38 -0500
Subject: [PATCH 059/229] shorten lines

---
 qutebrowser/browser/browsertab.py       | 2 +-
 qutebrowser/mainwindow/tabbedbrowser.py | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index c9d2f540a..41e4f1eaf 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -99,7 +99,7 @@ class TabData:
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
         fullscreen: Whether the tab has a video shown fullscreen currently.
-        input_mode: current input mode for the tab. (insert, passthrough, normal)
+        input_mode: current input mode for the tab.
     """
 
     keep_icon = attr.ib(False)
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index b325b5e1c..0d1487f50 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -652,8 +652,8 @@ class TabbedBrowser(tabwidget.TabWidget):
         if self._now_focused and config.val.tabs.mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
             # only save insert & passthrough mode. otherwise default to normal
-            input_modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
-            if current_mode not in input_modes:
+            modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
+            if current_mode not in modes:
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode
 
@@ -667,7 +667,8 @@ class TabbedBrowser(tabwidget.TabWidget):
         for mode in modes_to_leave:
             modeman.leave(self._win_id, mode, 'tab changed', maybe=True)
         if config.val.tabs.mode_on_change == 'restore':
-            modeman.enter(self._win_id, tab.data.input_mode, 'restore input mode for tab')
+            modeman.enter(self._win_id, tab.data.input_mode,
+                          'restore input mode for tab')
         if self._now_focused is not None:
             objreg.register('last-focused-tab', self._now_focused, update=True,
                             scope='window', window=self._win_id)

From c5e688f26c825f1ff15d2f4bb154c0f457d54ff9 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Wed, 17 Jan 2018 13:08:04 -0500
Subject: [PATCH 060/229] Stop iterating over every frame to check if element
 is frame

---
 qutebrowser/javascript/webelem.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index c236a5b0a..72083a121 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -264,13 +264,10 @@ window._qutebrowser.webelem = (function() {
     // Check if elem is an iframe, and if so, return the result of func on it.
     // If no iframes match, return null
     function call_if_frame(elem, func) {
-        for (let i = 0; i < window.frames.length; ++i) {
-            const frame = window.frames[i];
-            if (iframe_same_domain(frame)) {
-                if (frame.frameElement === elem) {
-                    return func(frame);
-                }
-            }
+        const frame = elem.contentWindow;
+        // Check if elem is a frame, and if so, call func on the window
+        if (frame && iframe_same_domain(frame) && frame.frameElement) {
+            return func(frame);
         }
         return null;
     }

From 743aa86dfbde224702f6738d41ef72c07cdf84cc Mon Sep 17 00:00:00 2001
From: Slackhead <slackhead@gmail.com>
Date: Wed, 17 Jan 2018 19:32:05 +0000
Subject: [PATCH 061/229] run eslint on cycle-inputs.js

---
 qutebrowser/javascript/cycle-inputs.js | 46 ++++++++++++++++++++++++
 scripts/cycle-inputs.js                | 49 ++++++++++++++------------
 2 files changed, 72 insertions(+), 23 deletions(-)
 create mode 100644 qutebrowser/javascript/cycle-inputs.js

diff --git a/qutebrowser/javascript/cycle-inputs.js b/qutebrowser/javascript/cycle-inputs.js
new file mode 100644
index 000000000..9f4faaa78
--- /dev/null
+++ b/qutebrowser/javascript/cycle-inputs.js
@@ -0,0 +1,46 @@
+/* Cycle <input> text boxes.
+ * works with the types defined in 'types'.
+ * Note: Does not work for <textarea>.
+ *
+ * Example keybind:
+ * CYCLE_INPUTS = "jseval -q -f ~/.config/qutebrowser/cycle-inputs.js"
+ * config.bind('gi', CYCLE_INPUTS)
+ *
+ * By dive on freenode <dave@dawoodfall.net>
+ */
+
+"use strict";
+var inputs = document.getElementsByTagName("input");
+var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
+var hidden = /hidden/;
+var found = false;
+var ii = 0;
+var jj = 0;
+
+function ishidden(el) {
+    return hidden.test(el.attributes.value) || el.offsetParent === null;
+}
+
+for (ii = 0; ii < inputs.length; ii++) {
+    if (inputs[ii] === document.activeElement) {
+        for (jj = ii + 1; jj < inputs.length; jj++) {
+            if (!ishidden(inputs[jj]) && types.test(inputs[jj].type)) {
+                inputs[jj].focus();
+                found = true;
+                break;
+            }
+        }
+        break;
+    }
+}
+
+if (!found) {
+    for (ii = 0; ii < inputs.length; ii++) {
+        if (!ishidden(inputs[ii]) && types.test(inputs[ii].type)) {
+            inputs[ii].focus();
+            break;
+        }
+    }
+}
+
+// vim: tw=0 expandtab tabstop=4 softtabstop=4 shiftwidth=4
diff --git a/scripts/cycle-inputs.js b/scripts/cycle-inputs.js
index c395f6de2..9f4faaa78 100644
--- a/scripts/cycle-inputs.js
+++ b/scripts/cycle-inputs.js
@@ -1,43 +1,46 @@
 /* Cycle <input> text boxes.
  * works with the types defined in 'types'.
  * Note: Does not work for <textarea>.
- * 
- * Example keybind: 
+ *
+ * Example keybind:
  * CYCLE_INPUTS = "jseval -q -f ~/.config/qutebrowser/cycle-inputs.js"
  * config.bind('gi', CYCLE_INPUTS)
  *
  * By dive on freenode <dave@dawoodfall.net>
  */
 
+"use strict";
 var inputs = document.getElementsByTagName("input");
-var found = false;
 var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
 var hidden = /hidden/;
+var found = false;
+var ii = 0;
+var jj = 0;
 
 function ishidden(el) {
-	return hidden.test(el.attributes.value) || el.offsetParent === null;
+    return hidden.test(el.attributes.value) || el.offsetParent === null;
 }
 
-for (var i = 0; i < inputs.length; i++) {
-	if (inputs[i] == document.activeElement) {
-		for (var j = i+1; j < inputs.length; j++) {
-			if (! ishidden(inputs[j]) && types.test(inputs[j].type)) {
-				inputs[j].focus();
-				found = true;
-				break;
-			}
-		}
-		break;
-	}
+for (ii = 0; ii < inputs.length; ii++) {
+    if (inputs[ii] === document.activeElement) {
+        for (jj = ii + 1; jj < inputs.length; jj++) {
+            if (!ishidden(inputs[jj]) && types.test(inputs[jj].type)) {
+                inputs[jj].focus();
+                found = true;
+                break;
+            }
+        }
+        break;
+    }
 }
 
-if (! found) {
-	for (i = 0; i < inputs.length; i++) {
-		if (! ishidden(inputs[i]) && types.test(inputs[i].type)) {
-			inputs[i].focus();
-			break;
-		}
-	}
+if (!found) {
+    for (ii = 0; ii < inputs.length; ii++) {
+        if (!ishidden(inputs[ii]) && types.test(inputs[ii].type)) {
+            inputs[ii].focus();
+            break;
+        }
+    }
 }
 
-// vim: tw=0
+// vim: tw=0 expandtab tabstop=4 softtabstop=4 shiftwidth=4

From ef1de133ed9dfb8128277eccaf51452c83e8ad31 Mon Sep 17 00:00:00 2001
From: Slackhead <slackhead@gmail.com>
Date: Wed, 17 Jan 2018 19:41:54 +0000
Subject: [PATCH 062/229] remove old cycle-inputs.js

---
 qutebrowser/javascript/cycle-inputs.js | 46 --------------------------
 scripts/cycle-inputs.js                | 20 +++++------
 2 files changed, 10 insertions(+), 56 deletions(-)
 delete mode 100644 qutebrowser/javascript/cycle-inputs.js

diff --git a/qutebrowser/javascript/cycle-inputs.js b/qutebrowser/javascript/cycle-inputs.js
deleted file mode 100644
index 9f4faaa78..000000000
--- a/qutebrowser/javascript/cycle-inputs.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Cycle <input> text boxes.
- * works with the types defined in 'types'.
- * Note: Does not work for <textarea>.
- *
- * Example keybind:
- * CYCLE_INPUTS = "jseval -q -f ~/.config/qutebrowser/cycle-inputs.js"
- * config.bind('gi', CYCLE_INPUTS)
- *
- * By dive on freenode <dave@dawoodfall.net>
- */
-
-"use strict";
-var inputs = document.getElementsByTagName("input");
-var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
-var hidden = /hidden/;
-var found = false;
-var ii = 0;
-var jj = 0;
-
-function ishidden(el) {
-    return hidden.test(el.attributes.value) || el.offsetParent === null;
-}
-
-for (ii = 0; ii < inputs.length; ii++) {
-    if (inputs[ii] === document.activeElement) {
-        for (jj = ii + 1; jj < inputs.length; jj++) {
-            if (!ishidden(inputs[jj]) && types.test(inputs[jj].type)) {
-                inputs[jj].focus();
-                found = true;
-                break;
-            }
-        }
-        break;
-    }
-}
-
-if (!found) {
-    for (ii = 0; ii < inputs.length; ii++) {
-        if (!ishidden(inputs[ii]) && types.test(inputs[ii].type)) {
-            inputs[ii].focus();
-            break;
-        }
-    }
-}
-
-// vim: tw=0 expandtab tabstop=4 softtabstop=4 shiftwidth=4
diff --git a/scripts/cycle-inputs.js b/scripts/cycle-inputs.js
index 9f4faaa78..94c50fb72 100644
--- a/scripts/cycle-inputs.js
+++ b/scripts/cycle-inputs.js
@@ -14,18 +14,18 @@ var inputs = document.getElementsByTagName("input");
 var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
 var hidden = /hidden/;
 var found = false;
-var ii = 0;
-var jj = 0;
+var i = 0;
+var k = 0;
 
 function ishidden(el) {
     return hidden.test(el.attributes.value) || el.offsetParent === null;
 }
 
-for (ii = 0; ii < inputs.length; ii++) {
-    if (inputs[ii] === document.activeElement) {
-        for (jj = ii + 1; jj < inputs.length; jj++) {
-            if (!ishidden(inputs[jj]) && types.test(inputs[jj].type)) {
-                inputs[jj].focus();
+for (i = 0; i < inputs.length; i++) {
+    if (inputs[i] === document.activeElement) {
+        for (k = i + 1; k < inputs.length; k++) {
+            if (!ishidden(inputs[k]) && types.test(inputs[k].type)) {
+                inputs[k].focus();
                 found = true;
                 break;
             }
@@ -35,9 +35,9 @@ for (ii = 0; ii < inputs.length; ii++) {
 }
 
 if (!found) {
-    for (ii = 0; ii < inputs.length; ii++) {
-        if (!ishidden(inputs[ii]) && types.test(inputs[ii].type)) {
-            inputs[ii].focus();
+    for (i = 0; i < inputs.length; i++) {
+        if (!ishidden(inputs[i]) && types.test(inputs[i].type)) {
+            inputs[i].focus();
             break;
         }
     }

From ffda82170d32d525f44bf0a3e4ac64e706b527fa Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Wed, 17 Jan 2018 17:02:53 -0500
Subject: [PATCH 063/229] Fix several style issues

---
 qutebrowser/javascript/webelem.js                 | 12 ++++++------
 tests/end2end/data/hints/html/wrapped.html        |  4 +---
 tests/end2end/data/hints/html/wrapped_button.html |  6 ++----
 tests/end2end/data/hints/iframe_button.html       |  2 +-
 tests/end2end/data/hints/iframe_input.html        |  2 +-
 tests/end2end/data/iframe_search.html             |  2 +-
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 72083a121..c4da4031d 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -285,10 +285,10 @@ window._qutebrowser.webelem = (function() {
         const frame_elem = call_if_frame(elem,
             (frame) => serialize_elem(frame.document.activeElement, frame));
 
-        if (frame_elem === null) {
-            return serialize_elem(elem);
+        if (frame_elem !== null) {
+            return frame_elem;
         }
-        return frame_elem;
+        return serialize_elem(elem);
     };
 
     funcs.find_at_pos = (x, y) => {
@@ -306,10 +306,10 @@ window._qutebrowser.webelem = (function() {
                         y - frame_offset_rect.top), frame);
             });
 
-        if (frame_elem === null) {
-            return serialize_elem(elem);
+        if (frame_elem !== null) {
+            return frame_elem;
         }
-        return frame_elem;
+        return serialize_elem(elem);
     };
 
     // Function for returning a selection to python (so we can click it)
diff --git a/tests/end2end/data/hints/html/wrapped.html b/tests/end2end/data/hints/html/wrapped.html
index 2af1a28c1..dcc05c8c7 100644
--- a/tests/end2end/data/hints/html/wrapped.html
+++ b/tests/end2end/data/hints/html/wrapped.html
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 
-<!--
-target: hello.txt
--->
+<!-- target: hello.txt -->
 
 <html>
     <head>
diff --git a/tests/end2end/data/hints/html/wrapped_button.html b/tests/end2end/data/hints/html/wrapped_button.html
index dc96bd1d5..4d5fd81bb 100644
--- a/tests/end2end/data/hints/html/wrapped_button.html
+++ b/tests/end2end/data/hints/html/wrapped_button.html
@@ -1,13 +1,11 @@
 <!DOCTYPE html>
 
-<!--
-target: hello.txt
--->
+<!-- target: hello.txt -->
 
 <html>
     <head>
         <meta charset="utf-8">
-        <title>Link wrapped across multiple lines</title>
+        <title>Button link wrapped across multiple lines</title>
     </head>
     <body>
         <div style="width: 20em;">
diff --git a/tests/end2end/data/hints/iframe_button.html b/tests/end2end/data/hints/iframe_button.html
index cd7bf203c..610ed4c88 100644
--- a/tests/end2end/data/hints/iframe_button.html
+++ b/tests/end2end/data/hints/iframe_button.html
@@ -3,7 +3,7 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>Hinting inside an iframe</title>
+        <title>Hinting a button inside an iframe</title>
     </head>
     <body>
         <iframe style="margin: 50px;" src="/data/hints/html/wrapped_button.html"></iframe>
diff --git a/tests/end2end/data/hints/iframe_input.html b/tests/end2end/data/hints/iframe_input.html
index 143577747..903e9a6ee 100644
--- a/tests/end2end/data/hints/iframe_input.html
+++ b/tests/end2end/data/hints/iframe_input.html
@@ -3,7 +3,7 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>Hinting inside an iframe</title>
+        <title>Hinting an input field inside an iframe</title>
     </head>
     <body>
         <iframe style="margin: 50px;" src="/data/hints/input.html"></iframe>
diff --git a/tests/end2end/data/iframe_search.html b/tests/end2end/data/iframe_search.html
index a06c0ef3e..78f388eeb 100644
--- a/tests/end2end/data/iframe_search.html
+++ b/tests/end2end/data/iframe_search.html
@@ -3,7 +3,7 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>Hinting inside an iframe</title>
+        <title>Searching inside an iframe</title>
     </head>
     <body>
         <iframe style="margin: 50px;" src="/data/search.html"></iframe>

From aeb7bac886e5b4837d37ca778de1879d1a8b1aa6 Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Fri, 19 Jan 2018 02:33:42 +0100
Subject: [PATCH 064/229] added :session-load --delete

---
 qutebrowser/misc/sessions.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index b46b5a26a..cf6a7d0ee 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -457,7 +457,8 @@ class SessionManager(QObject):
 
     @cmdutils.register(instance='session-manager')
     @cmdutils.argument('name', completion=miscmodels.session)
-    def session_load(self, name, clear=False, temp=False, force=False):
+    def session_load(self, name, clear=False, temp=False, force=False,
+                     delete=False):
         """Load a session.
 
         Args:
@@ -466,6 +467,7 @@ class SessionManager(QObject):
             temp: Don't set the current session for :session-save.
             force: Force loading internal sessions (starting with an
                    underline).
+            delete: Delete the saved session once it has loaded.
         """
         if name.startswith('_') and not force:
             raise cmdexc.CommandError("{} is an internal session, use --force "
@@ -473,6 +475,8 @@ class SessionManager(QObject):
         old_windows = list(objreg.window_registry.values())
         try:
             self.load(name, temp=temp)
+            if delete:
+                self.session_delete(name)
         except SessionNotFoundError:
             raise cmdexc.CommandError("Session {} not found!".format(name))
         except SessionError as e:

From bd7054fa2e7fa5e3fd34c6b23b18737d23b4b949 Mon Sep 17 00:00:00 2001
From: Argn0 <Argn0@users.noreply.github.com>
Date: Fri, 19 Jan 2018 09:29:37 +0100
Subject: [PATCH 065/229] use self.delete and add test

---
 qutebrowser/misc/sessions.py            | 13 +++++++++++--
 tests/end2end/features/sessions.feature | 10 ++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index cf6a7d0ee..d18cebf32 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -475,8 +475,6 @@ class SessionManager(QObject):
         old_windows = list(objreg.window_registry.values())
         try:
             self.load(name, temp=temp)
-            if delete:
-                self.session_delete(name)
         except SessionNotFoundError:
             raise cmdexc.CommandError("Session {} not found!".format(name))
         except SessionError as e:
@@ -486,6 +484,17 @@ class SessionManager(QObject):
             if clear:
                 for win in old_windows:
                     win.close()
+            if delete:
+                try:
+                    self.delete(name)
+                except SessionError as e:
+                    log.sessions.exception("Error while deleting session!")
+                    raise cmdexc.CommandError(
+                        "Error while deleting session: {}"
+                        .format(e))
+                else:
+                    log.sessions.debug(
+                        "Loaded & deleted session {}.".format(name))
 
     @cmdutils.register(instance='session-manager')
     @cmdutils.argument('name', completion=miscmodels.session)
diff --git a/tests/end2end/features/sessions.feature b/tests/end2end/features/sessions.feature
index 50054c665..cb54e34cf 100644
--- a/tests/end2end/features/sessions.feature
+++ b/tests/end2end/features/sessions.feature
@@ -363,6 +363,16 @@ Feature: Saving and loading sessions
     And I replace "about:blank" by "http://localhost:(port)/data/numbers/2.txt" in the "loaded_session" session file
     And I run :session-load loaded_session
     Then data/numbers/2.txt should be loaded
+  
+  @qtwebengine_flaky
+  Scenario: Loading and deleting a session
+    When I open about:blank
+    And I run :session-save loaded_session
+    And I replace "about:blank" by "http://localhost:(port)/data/numbers/2.txt" in the "loaded_session" session file
+    And I run :session-load --delete loaded_session
+    And I wait for "Loaded & deleted session loaded_session." in the log
+    Then data/numbers/2.txt should be loaded
+    And the session loaded_session should not exist
 
   Scenario: Loading a session which doesn't exist
     When I run :session-load inexistent_session

From 4fde8ff204fd95ea08d8c5ee33f3008d6f43582c Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:13:47 +0600
Subject: [PATCH 066/229] Add separate function in js to set current platform

---
 qutebrowser/browser/webengine/webenginetab.py |  6 ++---
 qutebrowser/javascript/webengine_caret.js     | 22 ++++++++++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index ea646cda3..128b4c945 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -21,7 +21,7 @@
 
 import math
 import functools
-import platform
+import sys
 import html as html_utils
 
 import sip
@@ -206,8 +206,8 @@ class WebEngineCaret(browsertab.AbstractCaret):
             return
 
         self._tab.run_js_async(
-            javascript.assemble('caret', 'setInitialCursor',
-                                platform.platform()))
+            javascript.assemble('caret', 'setPlatform', sys.platform))
+        self._js_call('setInitialCursor')
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 052d3a4c1..7dafd9136 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -707,6 +707,12 @@ window._qutebrowser.caret = (function() {
      */
     CaretBrowsing.blinkFlag = true;
 
+    /**
+     * The os that user is using.
+     * @type {boolean}
+     */
+    CaretBrowsing.platform = null;
+
     /**
      * Check if a node is a control that normally allows the user to interact
      * with it using arrow keys. We won't override the arrow keys when such a
@@ -814,9 +820,9 @@ window._qutebrowser.caret = (function() {
      * If there's no initial selection, set the cursor just before the
      * first text character in the document.
      */
-    CaretBrowsing.setInitialCursor = function(platform) {
-        if (platform) {
-            CaretBrowsing.isWindows = platform.indexOf("Windows") !== -1;
+    CaretBrowsing.setInitialCursor = function() {
+        if (CaretBrowsing.platform) {
+            CaretBrowsing.isWindows = CaretBrowsing.platform.startsWith("win");
         }
         const selectionRange = window.getSelection().toString().length;
         if (selectionRange === 0) {
@@ -1252,7 +1258,7 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.isCaretVisible =
             (CaretBrowsing.isEnabled && CaretBrowsing.isWindowFocused);
         if (CaretBrowsing.isCaretVisible && !CaretBrowsing.caretElement) {
-            CaretBrowsing.setInitialCursor(CaretBrowsing.isWindows);
+            CaretBrowsing.setInitialCursor();
             CaretBrowsing.updateCaretOrSelection(true);
             if (CaretBrowsing.caretElement) {
                 CaretBrowsing.blinkFunctionId = window.setInterval(
@@ -1304,9 +1310,9 @@ window._qutebrowser.caret = (function() {
 
     const funcs = {};
 
-    funcs.setInitialCursor = (platform) => {
+    funcs.setInitialCursor = () => {
         if (!CaretBrowsing.initiated) {
-            CaretBrowsing.setInitialCursor(platform);
+            CaretBrowsing.setInitialCursor();
             return;
         }
 
@@ -1316,6 +1322,10 @@ window._qutebrowser.caret = (function() {
         CaretBrowsing.toggle();
     };
 
+    funcs.setPlatform = (platform) => {
+        CaretBrowsing.platform = platform;
+    }
+
     funcs.disableCaret = () => {
         CaretBrowsing.toggle(false);
     };

From 859469c600f5d4aa4735a419442672965487bb7b Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:15:54 +0600
Subject: [PATCH 067/229] Remove redundancy comment

---
 qutebrowser/javascript/webengine_caret.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 7dafd9136..e998c5fb8 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -586,9 +586,7 @@ window._qutebrowser.caret = (function() {
      * The class handling the Caret Browsing implementation in the page.
      * Sets up communication with the background page, and then when caret
      * browsing is enabled, response to various key events to move the caret
-     * or selection within the text content of the document. Uses the native
-     * Chrome selection wherever possible, but displays its own flashing
-     * caret using a DIV because there's no native caret available.
+     * or selection within the text content of the document.
      * @constructor
      */
     const CaretBrowsing = {};

From 6eb001fc34b075e06fa05b686b766744781eeddb Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:24:11 +0600
Subject: [PATCH 068/229] Rename js caret file

---
 qutebrowser/javascript/{webengine_caret.js => caret.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename qutebrowser/javascript/{webengine_caret.js => caret.js} (100%)

diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/caret.js
similarity index 100%
rename from qutebrowser/javascript/webengine_caret.js
rename to qutebrowser/javascript/caret.js

From 0e522d48ac7f50815fd010fb2ab6bcc08396711e Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:25:58 +0600
Subject: [PATCH 069/229] Add myself to `CODEOWNERS` to watch for caret code

---
 .github/CODEOWNERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e29d2678d..d7da20300 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,3 +8,5 @@ tests/unit/completion/*  @rcorre
 tests/unit/misc/test_sql.py  @rcorre
 
 qutebrowser/config/configdata.yml  @mschilli87
+
+qutebrowser/javascript/caret.js @artur-shaik

From 79766aa65bb4221b5ef95e6fee6f8c57ee489300 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:28:49 +0600
Subject: [PATCH 070/229] Add chromium license

---
 qutebrowser/javascript/caret.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index e998c5fb8..3cbefc77a 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -1,5 +1,34 @@
 /* eslint-disable max-lines, max-len, max-statements, complexity,
 max-params, default-case, valid-jsdoc */
+
+// Copyright 2014 The Chromium Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 /**
  * Copyright 2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
  *

From 2d2d71512f05507fe9c8a3a02c4629f24574f9c1 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:31:12 +0600
Subject: [PATCH 071/229] Add initial comment

---
 qutebrowser/javascript/caret.js | 52 +++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index 3cbefc77a..1c31d8cbc 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -52,8 +52,56 @@ max-params, default-case, valid-jsdoc */
  * Ported chrome-caretbrowsing extension.
  * https://cs.chromium.org/chromium/src/ui/accessibility/extensions/caretbrowsing/
  *
- * Create and control div caret, which listen commands from qutebrowser,
- * change document selection model and div caret position.
+ * The behavior is based on Mozilla's spec whenever possible:
+ *   http://www.mozilla.org/access/keyboard/proposal
+ *
+ * The one exception is that Esc is used to escape out of a form control,
+ * rather than their proposed key (which doesn't seem to work in the
+ * latest Firefox anyway).
+ *
+ * Some details about how Chrome selection works, which will help in
+ * understanding the code:
+ *
+ * The Selection object (window.getSelection()) has four components that
+ * completely describe the state of the caret or selection:
+ *
+ * base and anchor: this is the start of the selection, the fixed point.
+ * extent and focus: this is the end of the selection, the part that
+ *     moves when you hold down shift and press the left or right arrows.
+ *
+ * When the selection is a cursor, the base, anchor, extent, and focus are
+ * all the same.
+ *
+ * There's only one time when the base and anchor are not the same, or the
+ * extent and focus are not the same, and that's when the selection is in
+ * an ambiguous state - i.e. it's not clear which edge is the focus and which
+ * is the anchor. As an example, if you double-click to select a word, then
+ * the behavior is dependent on your next action. If you press Shift+Right,
+ * the right edge becomes the focus. But if you press Shift+Left, the left
+ * edge becomes the focus.
+ *
+ * When the selection is in an ambiguous state, the base and extent are set
+ * to the position where the mouse clicked, and the anchor and focus are set
+ * to the boundaries of the selection.
+ *
+ * The only way to set the selection and give it direction is to use
+ * the non-standard Selection.setBaseAndExtent method. If you try to use
+ * Selection.addRange(), the anchor will always be on the left and the focus
+ * will always be on the right, making it impossible to manipulate
+ * selections that move from right to left.
+ *
+ * Finally, Chrome will throw an exception if you try to set an invalid
+ * selection - a selection where the left and right edges are not the same,
+ * but it doesn't span any visible characters. A common example is that
+ * there are often many whitespace characters in the DOM that are not
+ * visible on the page; trying to select them will fail. Another example is
+ * any node that's invisible or not displayed.
+ *
+ * While there are probably many possible methods to determine what is
+ * selectable, this code uses the method of determining if there's a valid
+ * bounding box for the range or not - keep moving the cursor forwards until
+ * the range from the previous position and candidate next position has a
+ * valid bounding box.
  */
 
 "use strict";

From 22d77fadd736c5b89d49d53ff087a3f924aa8538 Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 22:40:47 +0600
Subject: [PATCH 072/229] Eliminate caret blinking

---
 qutebrowser/browser/webengine/webenginetab.py |   2 +-
 qutebrowser/javascript/caret.js               | 110 +-----------------
 2 files changed, 3 insertions(+), 109 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 128b4c945..136270238 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -610,7 +610,7 @@ class WebEngineTab(browsertab.AbstractTab):
             'window._qutebrowser = window._qutebrowser || {};',
             utils.read_file('javascript/scroll.js'),
             utils.read_file('javascript/webelem.js'),
-            utils.read_file('javascript/webengine_caret.js'),
+            utils.read_file('javascript/caret.js'),
         ])
         script = QWebEngineScript()
         script.setInjectionPoint(QWebEngineScript.DocumentCreation)
diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index 1c31d8cbc..90557a7af 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -512,8 +512,7 @@ window._qutebrowser.caret = (function() {
         if (node.constructor === Text) {
             node = node.parentElement;
         }
-        if (node.className === "CaretBrowsing_Caret" ||
-            node.className === "CaretBrowsing_AnimateCaret") {
+        if (node.className === "CaretBrowsing_Caret") {
             return true;
         }
         return false;
@@ -869,22 +868,6 @@ window._qutebrowser.caret = (function() {
             "  z-index: 2147483647;" +
             "  min-height: 10px;" +
             "  background-color: #000;" +
-            "}" +
-            ".CaretBrowsing_AnimateCaret {" +
-            "  position: absolute;" +
-            "  z-index: 2147483647;" +
-            "  min-height: 10px;" +
-            "}" +
-            ".CaretBrowsing_FlashVert {" +
-            "  position: absolute;" +
-            "  z-index: 2147483647;" +
-            "  background: linear-gradient(" +
-            "      270deg," +
-            "      rgba(128, 128, 255, 0) 0%," +
-            "      rgba(128, 128, 255, 0.3) 45%," +
-            "      rgba(128, 128, 255, 0.8) 50%," +
-            "      rgba(128, 128, 255, 0.3) 65%," +
-            "      rgba(128, 128, 255, 0) 100%);" +
             "}";
         const node = document.createElement("style");
         node.innerHTML = style;
@@ -972,58 +955,6 @@ window._qutebrowser.caret = (function() {
         element.style.color = CaretBrowsing.caretForeground;
     };
 
-    /**
-     * Animate the caret element into the normal style.
-     */
-    CaretBrowsing.animateCaretElement = function() {
-        const element = CaretBrowsing.caretElement;
-        element.style.left = `${CaretBrowsing.caretX - 50}px`;
-        element.style.top = `${CaretBrowsing.caretY - 100}px`;
-        element.style.width = `${CaretBrowsing.caretWidth + 100}px`;
-        element.style.height = `${CaretBrowsing.caretHeight + 200}px`;
-        element.className = "CaretBrowsing_AnimateCaret";
-
-        // Start the animation. The setTimeout is so that the old values will get
-        // applied first, so we can animate to the new values.
-        window.setTimeout(() => {
-            if (!CaretBrowsing.caretElement) {
-                return;
-            }
-            CaretBrowsing.setCaretElementNormalStyle();
-            element.style.transition = "all 0.8s ease-in";
-            function listener() {
-                element.removeEventListener(
-                    "transitionend", listener, false);
-                element.style.transition = "none";
-            }
-            element.addEventListener(
-                "transitionend", listener, false);
-        }, 0);
-    };
-
-    /**
-     * Quick flash and then show the normal caret style.
-     */
-    CaretBrowsing.flashCaretElement = function() {
-        const x = CaretBrowsing.caretX;
-        const y = CaretBrowsing.caretY;
-
-        const vert = document.createElement("div");
-        vert.className = "CaretBrowsing_FlashVert";
-        vert.style.left = `${x - 6}px`;
-        vert.style.top = `${y - 100}px`;
-        vert.style.width = "11px";
-        vert.style.height = `${200}px`;
-        document.body.appendChild(vert);
-
-        window.setTimeout(() => {
-            document.body.removeChild(vert);
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.setCaretElementNormalStyle();
-            }
-        }, 250);
-    };
-
     /**
      * Create the caret element. This assumes that caretX, caretY,
      * caretWidth, and caretHeight have all been set. The caret is
@@ -1034,14 +965,7 @@ window._qutebrowser.caret = (function() {
         element.className = "CaretBrowsing_Caret";
         document.body.appendChild(element);
         CaretBrowsing.caretElement = element;
-
-        if (CaretBrowsing.onEnable === "anim") {
-            CaretBrowsing.animateCaretElement();
-        } else if (CaretBrowsing.onEnable === "flash") {
-            CaretBrowsing.flashCaretElement();
-        } else {
-            CaretBrowsing.setCaretElementNormalStyle();
-        }
+        CaretBrowsing.setCaretElementNormalStyle();
     };
 
     /**
@@ -1226,15 +1150,6 @@ window._qutebrowser.caret = (function() {
                     window.scroll(0, (caretY - 100));
                 }
             }
-
-            if (Math.abs(previousX - CaretBrowsing.caretX) > 500 ||
-                Math.abs(previousY - CaretBrowsing.caretY) > 100) {
-                if (CaretBrowsing.onJump === "anim") {
-                    CaretBrowsing.animateCaretElement();
-                } else if (CaretBrowsing.onJump === "flash") {
-                    CaretBrowsing.flashCaretElement();
-                }
-            }
         };
 
     CaretBrowsing.move = function(direction, granularity) {
@@ -1308,23 +1223,6 @@ window._qutebrowser.caret = (function() {
         return true;
     };
 
-    /**
-     * Called at a regular interval. Blink the cursor by changing its visibility.
-     */
-    CaretBrowsing.caretBlinkFunction = function() {
-        if (CaretBrowsing.caretElement) {
-            if (CaretBrowsing.blinkFlag) {
-                CaretBrowsing.caretElement.style.backgroundColor =
-                    CaretBrowsing.caretForeground;
-                CaretBrowsing.blinkFlag = false;
-            } else {
-                CaretBrowsing.caretElement.style.backgroundColor =
-                    CaretBrowsing.caretBackground;
-                CaretBrowsing.blinkFlag = true;
-            }
-        }
-    };
-
     /**
      * Update whether or not the caret is visible, based on whether caret browsing
      * is enabled and whether this window / iframe has focus.
@@ -1335,10 +1233,6 @@ window._qutebrowser.caret = (function() {
         if (CaretBrowsing.isCaretVisible && !CaretBrowsing.caretElement) {
             CaretBrowsing.setInitialCursor();
             CaretBrowsing.updateCaretOrSelection(true);
-            if (CaretBrowsing.caretElement) {
-                CaretBrowsing.blinkFunctionId = window.setInterval(
-                    CaretBrowsing.caretBlinkFunction, 500);
-            }
         } else if (!CaretBrowsing.isCaretVisible &&
             CaretBrowsing.caretElement) {
             window.clearInterval(CaretBrowsing.blinkFunctionId);

From 1e3f11ca136abd469b053be948a5ba1ca6a6b36a Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Fri, 19 Jan 2018 23:17:03 +0600
Subject: [PATCH 073/229] Fix eslint warnings

---
 qutebrowser/javascript/caret.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index 90557a7af..eed5aaa1f 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -1051,9 +1051,6 @@ window._qutebrowser.caret = (function() {
      */
     CaretBrowsing.updateCaretOrSelection =
         function(scrollToSelection) {
-            const previousX = CaretBrowsing.caretX;
-            const previousY = CaretBrowsing.caretY;
-
             const sel = window.getSelection();
             if (sel.rangeCount === 0) {
                 if (CaretBrowsing.caretElement) {
@@ -1293,7 +1290,7 @@ window._qutebrowser.caret = (function() {
 
     funcs.setPlatform = (platform) => {
         CaretBrowsing.platform = platform;
-    }
+    };
 
     funcs.disableCaret = () => {
         CaretBrowsing.toggle(false);

From 968367b042c95a4aea152b5a2bba518ef76ef83b Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Fri, 19 Jan 2018 15:25:03 -0500
Subject: [PATCH 074/229] Simplify logic for checking if an element is a frame

---
 qutebrowser/javascript/webelem.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js
index 76296acaa..d635de412 100644
--- a/qutebrowser/javascript/webelem.js
+++ b/qutebrowser/javascript/webelem.js
@@ -278,10 +278,13 @@ window._qutebrowser.webelem = (function() {
     // Check if elem is an iframe, and if so, return the result of func on it.
     // If no iframes match, return null
     function call_if_frame(elem, func) {
-        const frame = elem.contentWindow;
         // Check if elem is a frame, and if so, call func on the window
-        if (frame && iframe_same_domain(frame) && frame.frameElement) {
-            return func(frame);
+        if ("contentWindow" in elem) {
+            const frame = elem.contentWindow;
+            if (iframe_same_domain(frame) &&
+                "frameElement" in elem.contentWindow) {
+                return func(frame);
+            }
         }
         return null;
     }

From b2f95339ce3f42f8724fdf524004b41abcfa793a Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 27 Dec 2017 22:04:47 +1300
Subject: [PATCH 075/229] Greasemonkey: support regexes in @include and
 @exclude.

Like the spec says, if a value for the @include or @exclude rules starts
and ends with a '/' it should be parsed as a regular expression.
Technically a ECMAScript syntax regular expression, but I am not sure of
the differences and I assume they are far fewer than the similarities.
One that I did see mentioned was that javascript RegExp doesn't support
unicode. Although it apparently does support a 'u' flag now.

Note that code will only be ran for QtWebkit and QWebEngine < 5.8
we rely on the builtin support for metadata it QWebEngine for most
things greasemonkey related. Sadly it seems that they missed the regex
requirement too. I've opened a ticket to track that https://bugreports.qt.io/browse/QTBUG-65484
---
 qutebrowser/browser/greasemonkey.py        | 19 +++++++++++----
 tests/unit/javascript/test_greasemonkey.py | 28 +++++++++++++++++++++-
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 9a82d6a93..579cca82b 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -23,7 +23,6 @@ import re
 import os
 import json
 import fnmatch
-import functools
 import glob
 
 import attr
@@ -196,11 +195,21 @@ class GreasemonkeyManager(QObject):
         """
         if url.scheme() not in self.greaseable_schemes:
             return MatchingScripts(url, [], [], [])
-        match = functools.partial(fnmatch.fnmatch,
-                                  url.toString(QUrl.FullyEncoded))
+
+        def _match(pattern):
+            # For include and exclude rules if they start and end with '/' they
+            # should be treated as a (ecma syntax) regular expression.
+            string_url = url.toString(QUrl.FullyEncoded)
+            if pattern.startswith('/') and pattern.endswith('/'):
+                return re.search(pattern[1:-1], string_url) is not None
+
+            # Otherwise they are glob expressions.
+            return fnmatch.fnmatch(string_url, pattern)
+
         tester = (lambda script:
-                  any(match(pat) for pat in script.includes) and
-                  not any(match(pat) for pat in script.excludes))
+                  any(_match(pat) for pat in script.includes) and
+                  not any(_match(pat) for pat in script.excludes))
+
         return MatchingScripts(
             url,
             [script for script in self._run_start if tester(script)],
diff --git a/tests/unit/javascript/test_greasemonkey.py b/tests/unit/javascript/test_greasemonkey.py
index 0f5fe476c..1aaa3380f 100644
--- a/tests/unit/javascript/test_greasemonkey.py
+++ b/tests/unit/javascript/test_greasemonkey.py
@@ -19,6 +19,7 @@
 """Tests for qutebrowser.browser.greasemonkey."""
 
 import logging
+import textwrap
 
 import pytest
 import py.path  # pylint: disable=no-name-in-module
@@ -26,7 +27,7 @@ from PyQt5.QtCore import QUrl
 
 from qutebrowser.browser import greasemonkey
 
-test_gm_script = """
+test_gm_script = r"""
 // ==UserScript==
 // @name qutebrowser test userscript
 // @namespace invalid.org
@@ -75,6 +76,31 @@ def test_get_scripts_by_url(url, expected_matches):
             expected_matches)
 
 
+@pytest.mark.parametrize("url, expected_matches", [
+    # included
+    ('https://github.com/qutebrowser/qutebrowser/', 1),
+    # neither included nor excluded
+    ('http://aaaaaaaaaa.com/', 0),
+    # excluded takes priority
+    ('http://github.com/foo', 0),
+])
+def test_regex_includes_scripts_for(url, expected_matches):
+    """Ensure our GM @*clude support supports regular expressions."""
+    gh_dark_example = textwrap.dedent(r"""
+        // ==UserScript==
+        // @include     /^https?://((gist|guides|help|raw|status|developer)\.)?github\.com/((?!generated_pages\/preview).)*$/
+        // @exclude     /https?://github\.com/foo/
+        // @run-at document-start
+        // ==/UserScript==
+    """)
+    _save_script(gh_dark_example, 'test.user.js')
+    gm_manager = greasemonkey.GreasemonkeyManager()
+
+    scripts = gm_manager.scripts_for(QUrl(url))
+    assert (len(scripts.start + scripts.end + scripts.idle) ==
+            expected_matches)
+
+
 def test_no_metadata(caplog):
     """Run on all sites at document-end is the default."""
     _save_script("var nothing = true;\n", 'nothing.user.js')

From 971b41399160c26335b7a364348ca8b929e6538a Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 17 Jan 2018 18:17:14 +1300
Subject: [PATCH 076/229] Greasemonkey: make *clude regexes case insensitive

Sometimes I don't read specs so good.
---
 qutebrowser/browser/greasemonkey.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 579cca82b..753d13c56 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -201,7 +201,8 @@ class GreasemonkeyManager(QObject):
             # should be treated as a (ecma syntax) regular expression.
             string_url = url.toString(QUrl.FullyEncoded)
             if pattern.startswith('/') and pattern.endswith('/'):
-                return re.search(pattern[1:-1], string_url) is not None
+                matches = re.search(pattern[1:-1], string_url, flags=re.I)
+                return matches is not None
 
             # Otherwise they are glob expressions.
             return fnmatch.fnmatch(string_url, pattern)

From d5d22783eadda873e955911d17c137117a4cd9bf Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Sat, 20 Jan 2018 13:32:16 +1300
Subject: [PATCH 077/229] Greasemonkey: optimize pattern matching a little

Moving `QUrl.toString()` out of the `_match()` function which is called
for every pattern in every stript seems to make it ~40% faster.
---
 qutebrowser/browser/greasemonkey.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 753d13c56..8a9624148 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -196,10 +196,11 @@ class GreasemonkeyManager(QObject):
         if url.scheme() not in self.greaseable_schemes:
             return MatchingScripts(url, [], [], [])
 
+        string_url = url.toString(QUrl.FullyEncoded)
+
         def _match(pattern):
             # For include and exclude rules if they start and end with '/' they
             # should be treated as a (ecma syntax) regular expression.
-            string_url = url.toString(QUrl.FullyEncoded)
             if pattern.startswith('/') and pattern.endswith('/'):
                 matches = re.search(pattern[1:-1], string_url, flags=re.I)
                 return matches is not None

From aebc1a7d48b9583ee4b246dbfb6b1afcba91048e Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Sat, 20 Jan 2018 13:34:51 +1300
Subject: [PATCH 078/229] Greasemonkey: don't complain about an unset run-at

Apparently is is not an unusual situation to leave it unset and rely on
the default. Logging a warning about this could be unnecerasily
confusing for users.

I'm leaving the log message in there if it is set to something weird
like `window-load` or `document-complete` which scriptish may support.
---
 qutebrowser/browser/greasemonkey.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 8a9624148..7ee843b0b 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -177,10 +177,10 @@ class GreasemonkeyManager(QObject):
                 elif script.run_at == 'document-idle':
                     self._run_idle.append(script)
                 else:
-                    log.greasemonkey.warning("Script {} has invalid run-at "
-                                             "defined, defaulting to "
-                                             "document-end"
-                                             .format(script_path))
+                    if script.run_at:
+                        log.greasemonkey.warning(
+                            "Script {} has invalid run-at defined, "
+                            "defaulting to document-end".format(script_path))
                     # Default as per
                     # https://wiki.greasespot.net/Metadata_Block#.40run-at
                     self._run_end.append(script)

From 182bf1d688a6bcf32776b3e40749085d61c1146e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Sat, 20 Jan 2018 16:43:39 +0100
Subject: [PATCH 079/229] Simplify platform handling

---
 qutebrowser/javascript/caret.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index eed5aaa1f..3a7bb5bde 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -781,12 +781,6 @@ window._qutebrowser.caret = (function() {
      */
     CaretBrowsing.blinkFlag = true;
 
-    /**
-     * The os that user is using.
-     * @type {boolean}
-     */
-    CaretBrowsing.platform = null;
-
     /**
      * Check if a node is a control that normally allows the user to interact
      * with it using arrow keys. We won't override the arrow keys when such a
@@ -879,9 +873,6 @@ window._qutebrowser.caret = (function() {
      * first text character in the document.
      */
     CaretBrowsing.setInitialCursor = function() {
-        if (CaretBrowsing.platform) {
-            CaretBrowsing.isWindows = CaretBrowsing.platform.startsWith("win");
-        }
         const selectionRange = window.getSelection().toString().length;
         if (selectionRange === 0) {
             positionCaret();
@@ -1289,7 +1280,7 @@ window._qutebrowser.caret = (function() {
     };
 
     funcs.setPlatform = (platform) => {
-        CaretBrowsing.platform = platform;
+        CaretBrowsing.isWindows = platform.startsWith("win");
     };
 
     funcs.disableCaret = () => {

From 4b3a237e2adaa4d487ae1e433e9f5fba890afcac Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 20 Jan 2018 18:29:23 +0100
Subject: [PATCH 080/229] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 9a312dc0c..bc12746e8 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -21,6 +21,7 @@ v1.2.0 (unreleased)
 Added
 ~~~~~
 
+- Caret/visual mode is now supported for QtWebEngine.
 - A new `qute://bindings` page, opened by `:bind`, shows all keybindings.
 
 Changed

From 748de85ba2cc7bd8557a87fce88aab0ac3f3ad27 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 20 Jan 2018 18:50:17 +0100
Subject: [PATCH 081/229] Fix crash when getting signals for closed tabs

Fixes #3498
---
 qutebrowser/browser/browsertab.py             | 4 ++++
 qutebrowser/browser/webengine/webenginetab.py | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index db251bf45..324895100 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -749,6 +749,10 @@ class AbstractTab(QWidget):
 
     @pyqtSlot(bool)
     def _on_load_finished(self, ok):
+        if sip.isdeleted(self._widget):
+            # https://github.com/qutebrowser/qutebrowser/issues/3498
+            return
+
         sess_manager = objreg.get('session-manager')
         sess_manager.save_autosave()
 
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 136270238..0523972df 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -631,6 +631,9 @@ class WebEngineTab(browsertab.AbstractTab):
 
     @pyqtSlot()
     def _restore_zoom(self):
+        if sip.isdeleted(self._widget):
+            # https://github.com/qutebrowser/qutebrowser/issues/3498
+            return
         if self._saved_zoom is None:
             return
         self.zoom.set_factor(self._saved_zoom)

From 84478cd81c0cd656751ae0bb7134f66306f3efee Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 20 Jan 2018 18:58:03 +0100
Subject: [PATCH 082/229] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index bc12746e8..ccb05e162 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -45,6 +45,7 @@ Fixed
 ~~~~~
 
 - The Makefile now actually works.
+- Fixed crashes with Qt 5.10 when closing a tab before it finished loading.
 
 v1.1.0
 ------

From 9c3dcae793110e2178796f057785764551f02986 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 20 Jan 2018 19:20:12 +0100
Subject: [PATCH 083/229] Update changelog for v1.1.1

---
 doc/changelog.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index ccb05e162..2dada6af7 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -38,8 +38,8 @@ Fixed
 
 - Improved fullscreen handling with Qt 5.10.
 
-v1.1.1 (unreleased)
--------------------
+v1.1.1
+------
 
 Fixed
 ~~~~~

From d62cb58f7deb02a81e2585ee50ee4114b67be889 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 20 Jan 2018 19:21:20 +0100
Subject: [PATCH 084/229] Release v1.1.1

(cherry picked from commit 4e8abaa2d16103f42cb26919e50d59937a88ae8f)
---
 qutebrowser/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py
index 1b1ec4c40..bcca15b4e 100644
--- a/qutebrowser/__init__.py
+++ b/qutebrowser/__init__.py
@@ -26,7 +26,7 @@ __copyright__ = "Copyright 2014-2017 Florian Bruhin (The Compiler)"
 __license__ = "GPL"
 __maintainer__ = __author__
 __email__ = "mail@qutebrowser.org"
-__version_info__ = (1, 1, 0)
+__version_info__ = (1, 1, 1)
 __version__ = '.'.join(str(e) for e in __version_info__)
 __description__ = "A keyboard-driven, vim-like browser based on PyQt5."
 

From 9d5beff93731d6a57c1354f641344ed7bef44696 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sat, 20 Jan 2018 15:49:52 -0500
Subject: [PATCH 085/229] Set some PRAGMAs to optimize the history database.

Enable write-ahead-logging and reduce the synchronous level to NORMAL.
This should reduce the number of writes to disk and avoid some of the
hangs users are experiencing.

Resolves #3507.
Resolves #2930 (optimistically, reopen if not fixed).

See https://sqlite.org/pragma.html and https://www.sqlite.org/wal.html.
---
 qutebrowser/misc/sql.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/qutebrowser/misc/sql.py b/qutebrowser/misc/sql.py
index 00527e7fe..65a93a461 100644
--- a/qutebrowser/misc/sql.py
+++ b/qutebrowser/misc/sql.py
@@ -115,6 +115,11 @@ def init(db_path):
         raise SqliteError("Failed to open sqlite database at {}: {}"
                           .format(db_path, error.text()), error)
 
+    # Enable write-ahead-logging and reduce disk write frequency
+    # see https://sqlite.org/pragma.html and issues #2930 and #3507
+    Query("PRAGMA journal_mode=WAL").run()
+    Query("PRAGMA synchronous=NORMAL").run()
+
 
 def close():
     """Close the SQL connection."""

From 1e9a70855d2b371cbdd4265725434a876142efc7 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 21 Jan 2018 07:42:39 -0500
Subject: [PATCH 086/229] Show '&' properly in completion widget.

When highlighting the matched part of the text, we need to html-escape
the pattern used to find the matching text so it will replace terms that
have been escaped in the text, like &amp;.

Resolves #3508.
---
 qutebrowser/completion/completiondelegate.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/completion/completiondelegate.py b/qutebrowser/completion/completiondelegate.py
index b4f9c5a33..ab98eccef 100644
--- a/qutebrowser/completion/completiondelegate.py
+++ b/qutebrowser/completion/completiondelegate.py
@@ -203,9 +203,9 @@ class CompletionItemDelegate(QStyledItemDelegate):
             columns_to_filter = index.model().columns_to_filter(index)
             if index.column() in columns_to_filter and pattern:
                 repl = r'<span class="highlight">\g<0></span>'
-                text = re.sub(re.escape(pattern).replace(r'\ ', r'|'),
-                              repl, html.escape(self._opt.text),
-                              flags=re.IGNORECASE)
+                pat = html.escape(re.escape(pattern)).replace(r'\ ', r'|')
+                txt = html.escape(self._opt.text)
+                text = re.sub(pat, repl, txt, flags=re.IGNORECASE)
                 self._doc.setHtml(text)
             else:
                 self._doc.setPlainText(self._opt.text)

From 6edd096de468900797f3454da1cf4cd6a66cb337 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Jan 2018 16:52:14 +0100
Subject: [PATCH 087/229] Update certifi from 2017.11.5 to 2018.1.18

---
 misc/requirements/requirements-codecov.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt
index df7a12ed6..5fd4d1aff 100644
--- a/misc/requirements/requirements-codecov.txt
+++ b/misc/requirements/requirements-codecov.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-certifi==2017.11.5
+certifi==2018.1.18
 chardet==3.0.4
 codecov==2.0.13
 coverage==4.4.2

From 762205ef07abb4b1d72fdc02255bba3d972cfe33 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Jan 2018 16:52:15 +0100
Subject: [PATCH 088/229] Update certifi from 2017.11.5 to 2018.1.18

---
 misc/requirements/requirements-pylint-master.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint-master.txt b/misc/requirements/requirements-pylint-master.txt
index ce588c136..5a414b3db 100644
--- a/misc/requirements/requirements-pylint-master.txt
+++ b/misc/requirements/requirements-pylint-master.txt
@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 -e git+https://github.com/PyCQA/astroid.git#egg=astroid
-certifi==2017.11.5
+certifi==2018.1.18
 chardet==3.0.4
 github3.py==0.9.6
 idna==2.6

From 036031a48b6063ae366fc76cc8086dc4136a71f6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Jan 2018 16:52:17 +0100
Subject: [PATCH 089/229] Update certifi from 2017.11.5 to 2018.1.18

---
 misc/requirements/requirements-pylint.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index 6267fc2b0..b5aab6354 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 astroid==1.6.0
-certifi==2017.11.5
+certifi==2018.1.18
 chardet==3.0.4
 github3.py==0.9.6
 idna==2.6

From abd5da1fd131f691497e323dd9bc30ff8ceece9b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Jan 2018 16:52:18 +0100
Subject: [PATCH 090/229] Update codecov from 2.0.13 to 2.0.14

---
 misc/requirements/requirements-codecov.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt
index 5fd4d1aff..26008b77b 100644
--- a/misc/requirements/requirements-codecov.txt
+++ b/misc/requirements/requirements-codecov.txt
@@ -2,7 +2,7 @@
 
 certifi==2018.1.18
 chardet==3.0.4
-codecov==2.0.13
+codecov==2.0.14
 coverage==4.4.2
 idna==2.6
 requests==2.18.4

From c5c01c5364592b750abb347097ae3fbcc6a10799 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Jan 2018 16:52:20 +0100
Subject: [PATCH 091/229] Update hypothesis from 3.44.16 to 3.44.21

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 574dbdb28..0bd38e349 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.44.16
+hypothesis==3.44.21
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7

From dd0703eddfc102777b7b36f8fcd1528510dc27d2 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 22 Jan 2018 21:21:51 +0100
Subject: [PATCH 092/229] scripts/dev/src2asciidoc.py: vim: readonly

Set 'readonly' via Vim modeline in generated scripts.
---
 doc/help/commands.asciidoc  | 1 +
 doc/help/settings.asciidoc  | 1 +
 scripts/dev/src2asciidoc.py | 1 +
 3 files changed, 3 insertions(+)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index be7f4d557..1008de1bf 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1,6 +1,7 @@
 // DO NOT EDIT THIS FILE DIRECTLY!
 // It is autogenerated by running:
 //   $ python3 scripts/dev/src2asciidoc.py
+// vim: readonly:
 
 = Commands
 
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 53af8399d..73aae6fb2 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -1,6 +1,7 @@
 // DO NOT EDIT THIS FILE DIRECTLY!
 // It is autogenerated by running:
 //   $ python3 scripts/dev/src2asciidoc.py
+// vim: readonly:
 
 = Setting reference
 
diff --git a/scripts/dev/src2asciidoc.py b/scripts/dev/src2asciidoc.py
index 803280deb..5dc3d05ac 100755
--- a/scripts/dev/src2asciidoc.py
+++ b/scripts/dev/src2asciidoc.py
@@ -44,6 +44,7 @@ FILE_HEADER = """
 // DO NOT EDIT THIS FILE DIRECTLY!
 // It is autogenerated by running:
 //   $ python3 scripts/dev/src2asciidoc.py
+// vim: readonly:
 
 """.lstrip()
 

From 6a40cbf1608ad8e4c6dc8cef6f52a567dc25a812 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 22 Jan 2018 21:26:20 +0100
Subject: [PATCH 093/229] incdec_number: add support for port

---
 doc/help/commands.asciidoc        |  2 ++
 doc/help/settings.asciidoc        |  1 +
 qutebrowser/browser/commands.py   |  2 ++
 qutebrowser/config/configdata.yml |  2 +-
 qutebrowser/utils/urlutils.py     |  5 +++--
 tests/unit/utils/test_urlutils.py | 11 +++++++++++
 6 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index be7f4d557..9d7ce77fe 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -742,7 +742,9 @@ This tries to automatically click on typical _Previous Page_ or _Next Page_ link
  - `next`: Open a _next_ link.
  - `up`: Go up a level in the current URL.
  - `increment`: Increment the last number in the URL.
+ Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
  - `decrement`: Decrement the last number in the URL.
+ Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
  
 
 
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 53af8399d..a1b13f09f 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -2993,6 +2993,7 @@ Type: <<types,FlagList>>
 Valid values:
 
  * +host+
+ * +port+
  * +path+
  * +query+
  * +anchor+
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 6ddb72636..6eaa3e167 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -638,7 +638,9 @@ class CommandDispatcher:
                 - `next`: Open a _next_ link.
                 - `up`: Go up a level in the current URL.
                 - `increment`: Increment the last number in the URL.
+                  Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
                 - `decrement`: Decrement the last number in the URL.
+                  Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
 
             tab: Open in a new tab.
             bg: Open in a background tab.
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index a118a8b59..2d99af729 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1418,7 +1418,7 @@ url.default_page:
 url.incdec_segments:
   type:
     name: FlagList
-    valid_values: [host, path, query, anchor]
+    valid_values: [host, port, path, query, anchor]
   default: [path, query]
   desc: URL segments where `:navigate increment/decrement` will search for
     a number.
diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index 97e03c072..46bdee15c 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -537,7 +537,7 @@ def incdec_number(url, incdec, count=1, segments=None):
         incdec: Either 'increment' or 'decrement'
         count: The number to increment or decrement by
         segments: A set of URL segments to search. Valid segments are:
-                  'host', 'path', 'query', 'anchor'.
+                  'host', 'port', 'path', 'query', 'anchor'.
                   Default: {'path', 'query'}
 
     Return:
@@ -550,7 +550,7 @@ def incdec_number(url, incdec, count=1, segments=None):
 
     if segments is None:
         segments = {'path', 'query'}
-    valid_segments = {'host', 'path', 'query', 'anchor'}
+    valid_segments = {'host', 'port', 'path', 'query', 'anchor'}
     if segments - valid_segments:
         extra_elements = segments - valid_segments
         raise IncDecError("Invalid segments: {}".format(
@@ -561,6 +561,7 @@ def incdec_number(url, incdec, count=1, segments=None):
     # Order as they appear in a URL
     segment_modifiers = [
         ('host', url.host, url.setHost),
+        ('port', lambda: str(url.port()), lambda x: url.setPort(int(x))),
         ('path', url.path, url.setPath),
         ('query', url.query, url.setQuery),
         ('anchor', url.fragment, url.setFragment),
diff --git a/tests/unit/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
index 4d9b3ba0a..6b005f402 100644
--- a/tests/unit/utils/test_urlutils.py
+++ b/tests/unit/utils/test_urlutils.py
@@ -622,6 +622,17 @@ class TestIncDecNumber:
             base_url, incdec, segments={'host', 'path', 'query', 'anchor'})
         assert new_url == expected_url
 
+    def test_incdec_port(self):
+        """Test incdec_number with port."""
+
+        base_url = QUrl('http://localhost:8000')
+        new_url = urlutils.incdec_number(
+            base_url, 'increment', segments={'port'})
+        assert new_url == QUrl('http://localhost:8001')
+        new_url = urlutils.incdec_number(
+            base_url, 'decrement', segments={'port'})
+        assert new_url == QUrl('http://localhost:7999')
+
     @pytest.mark.parametrize('incdec', ['increment', 'decrement'])
     @pytest.mark.parametrize('value', [
         '{}foo', 'foo{}', 'foo{}bar', '42foo{}'

From 9f14ae184ff5f2a782424627e552e4feb8c10539 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 22 Jan 2018 21:48:21 +0100
Subject: [PATCH 094/229] fixup! incdec_number: add support for port

---
 qutebrowser/utils/urlutils.py     | 2 +-
 tests/unit/utils/test_urlutils.py | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index 46bdee15c..88853483e 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -561,7 +561,7 @@ def incdec_number(url, incdec, count=1, segments=None):
     # Order as they appear in a URL
     segment_modifiers = [
         ('host', url.host, url.setHost),
-        ('port', lambda: str(url.port()), lambda x: url.setPort(int(x))),
+        ('port', lambda: str(url.port()) if url.port() > 0 else '', lambda x: url.setPort(int(x))),
         ('path', url.path, url.setPath),
         ('query', url.query, url.setQuery),
         ('anchor', url.fragment, url.setFragment),
diff --git a/tests/unit/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
index 6b005f402..de83ba7bf 100644
--- a/tests/unit/utils/test_urlutils.py
+++ b/tests/unit/utils/test_urlutils.py
@@ -633,6 +633,12 @@ class TestIncDecNumber:
             base_url, 'decrement', segments={'port'})
         assert new_url == QUrl('http://localhost:7999')
 
+    def test_incdec_port_default(self):
+        """Test that a default port (with url.port() == -1) is not touched."""
+        base_url = QUrl('http://localhost')
+        with pytest.raises(urlutils.IncDecError):
+            urlutils.incdec_number(base_url, 'increment', segments={'port'})
+
     @pytest.mark.parametrize('incdec', ['increment', 'decrement'])
     @pytest.mark.parametrize('value', [
         '{}foo', 'foo{}', 'foo{}bar', '42foo{}'

From 56e686415922974c9a5edbb9514aa900589670c3 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Tue, 23 Jan 2018 09:58:36 -0500
Subject: [PATCH 095/229] Inject qutebrowser's JS files at DocumentReady

Use WebEngine's view-source: scheme for "view-source" command.
Also add missing URL when viewing source for WebKit.

Resolves #3490
Resolves #2395
Resolves #2948
---
 qutebrowser/browser/commands.py               | 11 ++++++++++-
 qutebrowser/browser/webengine/webenginetab.py |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 6ddb72636..0d390d081 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -758,7 +758,6 @@ class CommandDispatcher:
         else:
             x = None
             y = perc
-
         self._current_widget().scroller.to_perc(x, y)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
@@ -1513,6 +1512,14 @@ class CommandDispatcher:
             message.error(str(e))
             return
 
+        if tab.backend == usertypes.Backend.QtWebEngine:
+            # use view-source: scheme to show page source for webengine
+            url = QUrl('view-source:{}'.format(current_url.toString()))
+            new_tab = self._tabbed_browser.tabopen(url, background=True,
+                related=True)
+            new_tab.data.viewing_source = True
+            return
+
         def show_source_cb(source):
             """Show source as soon as it's ready."""
             # WORKAROUND for https://github.com/PyCQA/pylint/issues/491
@@ -1527,6 +1534,8 @@ class CommandDispatcher:
             new_tab = self._tabbed_browser.tabopen()
             new_tab.set_html(highlighted)
             new_tab.data.viewing_source = True
+            new_tab.url = lambda requested=False: QUrl(
+                'Source: {}'.format(current_url.toDisplayString()))
 
         tab.dump_async(show_source_cb)
 
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 0523972df..aa19f4c6b 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -613,7 +613,7 @@ class WebEngineTab(browsertab.AbstractTab):
             utils.read_file('javascript/caret.js'),
         ])
         script = QWebEngineScript()
-        script.setInjectionPoint(QWebEngineScript.DocumentCreation)
+        script.setInjectionPoint(QWebEngineScript.DocumentReady)
         script.setSourceCode(js_code)
 
         page = self._widget.page()

From 83515628a8fb2e63b4646c560a6392924a4a2519 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Tue, 23 Jan 2018 10:11:34 -0500
Subject: [PATCH 096/229] fix line indentation warning

---
 qutebrowser/browser/commands.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 0d390d081..46c37ced1 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1515,8 +1515,8 @@ class CommandDispatcher:
         if tab.backend == usertypes.Backend.QtWebEngine:
             # use view-source: scheme to show page source for webengine
             url = QUrl('view-source:{}'.format(current_url.toString()))
-            new_tab = self._tabbed_browser.tabopen(url, background=True,
-                related=True)
+            new_tab = self._tabbed_browser.tabopen(
+                url, background=True, related=True)
             new_tab.data.viewing_source = True
             return
 

From 3652553a8fe1f8d9943ff8427d612e714c46134a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Jan 2018 19:15:32 +0100
Subject: [PATCH 097/229] Mark second qute://settings test as flaky

---
 tests/end2end/features/qutescheme.feature | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/end2end/features/qutescheme.feature b/tests/end2end/features/qutescheme.feature
index 755c103e7..1abaadd87 100644
--- a/tests/end2end/features/qutescheme.feature
+++ b/tests/end2end/features/qutescheme.feature
@@ -98,6 +98,8 @@ Feature: Special qute:// pages
 
     # qute://settings
 
+    # Sometimes, an unrelated value gets set
+    @flaky
     Scenario: Focusing input fields in qute://settings and entering valid value
         When I set search.ignore_case to never
         And I open qute://settings

From a701426703c1a7354b8c8ac77e2ee4c020697632 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Jan 2018 19:41:45 +0100
Subject: [PATCH 098/229] Update to PyQt 5.10

---
 .travis.yml                             | 6 ++++--
 misc/requirements/requirements-pyqt.txt | 4 ++--
 tox.ini                                 | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 251842d06..a38ec0fe4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,12 @@ matrix:
     - os: linux
       env: TESTENV=py36-pyqt58
     - os: linux
-      python: 3.5
       env: TESTENV=py35-pyqt59
     - os: linux
-      env: TESTENV=py36-pyqt59-cov
+      python: 3.5
+      env: TESTENV=py35-pyqt510
+    - os: linux
+      env: TESTENV=py36-pyqt510-cov
     - os: osx
       env: TESTENV=py36 OSX=sierra
       osx_image: xcode9.2
diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 5a08f2f73..99ba1b7cc 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.9.2
-sip==4.19.6
+PyQt5==5.10
+sip==4.19.7
diff --git a/tox.ini b/tox.ini
index 5b8bc05b5..db020f4a4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,8 @@ skipsdist = true
 setenv =
     QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms
     PYTEST_QT_API=pyqt5
-    pyqt{,56,571,58,59}: LINK_PYQT_SKIP=true
-    pyqt{,56,571,58,59}: QUTE_BDD_WEBENGINE=true
+    pyqt{,56,571,58,59,510}: LINK_PYQT_SKIP=true
+    pyqt{,56,571,58,59,510}: QUTE_BDD_WEBENGINE=true
     cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
 passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER
 basepython =
@@ -27,6 +27,7 @@ deps =
     pyqt571: PyQt5==5.7.1
     pyqt58: PyQt5==5.8.2
     pyqt59: PyQt5==5.9.2
+    pyqt510: PyQt5==5.10
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -bb -m pytest {posargs:tests}

From c3deeaf2831625567eeb31ff456cf2edeb01cd0d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Jan 2018 20:00:14 +0100
Subject: [PATCH 099/229] Also use PyQt 5.10 on AppVeyor

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 837ebb1d4..f2424fc94 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,7 +7,7 @@ environment:
     PYTHONUNBUFFERED: 1
     PYTHON: C:\Python36\python.exe
     matrix:
-    - TESTENV: py36-pyqt59
+    - TESTENV: py36-pyqt510
     - TESTENV: pylint
 
 install:

From e26e04985b68c56cc9946e020b79747ea14e7ec8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Jan 2018 20:36:31 +0100
Subject: [PATCH 100/229] Revert "Update to PyQt 5.10"

This reverts commit a701426703c1a7354b8c8ac77e2ee4c020697632.
---
 .travis.yml                             | 6 ++----
 misc/requirements/requirements-pyqt.txt | 4 ++--
 tox.ini                                 | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a38ec0fe4..251842d06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,12 +17,10 @@ matrix:
     - os: linux
       env: TESTENV=py36-pyqt58
     - os: linux
+      python: 3.5
       env: TESTENV=py35-pyqt59
     - os: linux
-      python: 3.5
-      env: TESTENV=py35-pyqt510
-    - os: linux
-      env: TESTENV=py36-pyqt510-cov
+      env: TESTENV=py36-pyqt59-cov
     - os: osx
       env: TESTENV=py36 OSX=sierra
       osx_image: xcode9.2
diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 99ba1b7cc..5a08f2f73 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.10
-sip==4.19.7
+PyQt5==5.9.2
+sip==4.19.6
diff --git a/tox.ini b/tox.ini
index db020f4a4..5b8bc05b5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,8 @@ skipsdist = true
 setenv =
     QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms
     PYTEST_QT_API=pyqt5
-    pyqt{,56,571,58,59,510}: LINK_PYQT_SKIP=true
-    pyqt{,56,571,58,59,510}: QUTE_BDD_WEBENGINE=true
+    pyqt{,56,571,58,59}: LINK_PYQT_SKIP=true
+    pyqt{,56,571,58,59}: QUTE_BDD_WEBENGINE=true
     cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
 passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER
 basepython =
@@ -27,7 +27,6 @@ deps =
     pyqt571: PyQt5==5.7.1
     pyqt58: PyQt5==5.8.2
     pyqt59: PyQt5==5.9.2
-    pyqt510: PyQt5==5.10
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -bb -m pytest {posargs:tests}

From 072d42347acc65ab3faf3dbf4f20d653b3aff9cd Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Jan 2018 20:36:40 +0100
Subject: [PATCH 101/229] Revert "Also use PyQt 5.10 on AppVeyor"

This reverts commit c3deeaf2831625567eeb31ff456cf2edeb01cd0d.
---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index f2424fc94..837ebb1d4 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,7 +7,7 @@ environment:
     PYTHONUNBUFFERED: 1
     PYTHON: C:\Python36\python.exe
     matrix:
-    - TESTENV: py36-pyqt510
+    - TESTENV: py36-pyqt59
     - TESTENV: pylint
 
 install:

From 2e912eeadf0db5a8a98947a84ae01a5bca8361c0 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Tue, 23 Jan 2018 23:30:22 -0500
Subject: [PATCH 102/229] move backend dependent code to AbstractAction
 respective classes

---
 qutebrowser/browser/browsertab.py             |  4 +++
 qutebrowser/browser/commands.py               | 28 +------------------
 qutebrowser/browser/webengine/webenginetab.py |  7 +++++
 qutebrowser/browser/webkit/webkittab.py       | 23 +++++++++++++++
 tests/end2end/features/history.feature        |  2 +-
 5 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 324895100..e90c71f5d 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -139,6 +139,10 @@ class AbstractAction:
             raise WebTabError("{} is not a valid web action!".format(name))
         self._widget.triggerPageAction(member)
 
+    def show_source(self, dispatcher, url):
+        """Show the source of the current page in a new tab."""
+        raise NotImplementedError
+
 
 class AbstractPrinting:
 
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 46c37ced1..3f616d1f0 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1511,33 +1511,7 @@ class CommandDispatcher:
         except cmdexc.CommandError as e:
             message.error(str(e))
             return
-
-        if tab.backend == usertypes.Backend.QtWebEngine:
-            # use view-source: scheme to show page source for webengine
-            url = QUrl('view-source:{}'.format(current_url.toString()))
-            new_tab = self._tabbed_browser.tabopen(
-                url, background=True, related=True)
-            new_tab.data.viewing_source = True
-            return
-
-        def show_source_cb(source):
-            """Show source as soon as it's ready."""
-            # WORKAROUND for https://github.com/PyCQA/pylint/issues/491
-            # pylint: disable=no-member
-            lexer = pygments.lexers.HtmlLexer()
-            formatter = pygments.formatters.HtmlFormatter(
-                full=True, linenos='table',
-                title='Source for {}'.format(current_url.toDisplayString()))
-            # pylint: enable=no-member
-            highlighted = pygments.highlight(source, lexer, formatter)
-
-            new_tab = self._tabbed_browser.tabopen()
-            new_tab.set_html(highlighted)
-            new_tab.data.viewing_source = True
-            new_tab.url = lambda requested=False: QUrl(
-                'Source: {}'.format(current_url.toDisplayString()))
-
-        tab.dump_async(show_source_cb)
+        tab.action.show_source(self, current_url)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        debug=True)
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index aa19f4c6b..496df50e5 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -99,6 +99,13 @@ class WebEngineAction(browsertab.AbstractAction):
         """Save the current page."""
         self._widget.triggerPageAction(QWebEnginePage.SavePage)
 
+    def show_source(self, dispatcher, url):
+        # use view-source: scheme to show page source for webengine
+        url = QUrl('view-source:{}'.format(url.toString()))
+        new_tab = dispatcher._tabbed_browser.tabopen(
+            url, background=True, related=True)
+        new_tab.data.viewing_source = True
+
 
 class WebEnginePrinting(browsertab.AbstractPrinting):
 
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 4609f08db..6edda24ed 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -23,6 +23,10 @@ import re
 import functools
 import xml.etree.ElementTree
 
+import pygments
+import pygments.lexers
+import pygments.formatters
+
 import sip
 from PyQt5.QtCore import (pyqtSlot, Qt, QEvent, QUrl, QPoint, QTimer, QSizeF,
                           QSize)
@@ -50,6 +54,25 @@ class WebKitAction(browsertab.AbstractAction):
         """Save the current page."""
         raise browsertab.UnsupportedOperationError
 
+    def show_source(self, dispatcher, url):
+        def show_source_cb(source):
+            """Show source as soon as it's ready."""
+            # WORKAROUND for https://github.com/PyCQA/pylint/issues/491
+            # pylint: disable=no-member
+            lexer = pygments.lexers.HtmlLexer()
+            formatter = pygments.formatters.HtmlFormatter(
+                full=True, linenos='table',
+                title='view-source:{}'.format(url.toDisplayString()))
+            # pylint: enable=no-member
+            highlighted = pygments.highlight(source, lexer, formatter)
+
+            new_tab = dispatcher._tabbed_browser.tabopen()
+            new_tab.set_html(highlighted)
+            new_tab.data.viewing_source = True
+            new_tab.url = lambda requested=False: QUrl(
+                'view-source:' + url.toDisplayString())
+        dispatcher._current_widget().dump_async(show_source_cb)
+
 
 class WebKitPrinting(browsertab.AbstractPrinting):
 
diff --git a/tests/end2end/features/history.feature b/tests/end2end/features/history.feature
index 00bd20403..df6610daf 100644
--- a/tests/end2end/features/history.feature
+++ b/tests/end2end/features/history.feature
@@ -69,7 +69,7 @@ Feature: Page history
     Scenario: History with view-source URL
         When I open data/title.html
         And I run :view-source
-        And I wait for "Changing title for idx * to 'Source for http://localhost:*/data/title.html'" in the log
+        And I wait for "Changing title for idx * to 'view-source:http://localhost:*/data/title.html'" in the log
         Then the history should contain:
             http://localhost:(port)/data/title.html Test title
 

From b1c54f5706f435f80a986f102b08a9dec29943ae Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 24 Jan 2018 06:17:09 +0100
Subject: [PATCH 103/229] Re-add Qt 5.10 to tox.ini only

---
 tox.ini | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 5b8bc05b5..db020f4a4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,8 @@ skipsdist = true
 setenv =
     QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms
     PYTEST_QT_API=pyqt5
-    pyqt{,56,571,58,59}: LINK_PYQT_SKIP=true
-    pyqt{,56,571,58,59}: QUTE_BDD_WEBENGINE=true
+    pyqt{,56,571,58,59,510}: LINK_PYQT_SKIP=true
+    pyqt{,56,571,58,59,510}: QUTE_BDD_WEBENGINE=true
     cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
 passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER
 basepython =
@@ -27,6 +27,7 @@ deps =
     pyqt571: PyQt5==5.7.1
     pyqt58: PyQt5==5.8.2
     pyqt59: PyQt5==5.9.2
+    pyqt510: PyQt5==5.10
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -bb -m pytest {posargs:tests}

From 7690b9f8cd85e417ccd6b1224302a5e698006b68 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 24 Jan 2018 20:56:29 +0100
Subject: [PATCH 104/229] Update changelog

---
 doc/changelog.asciidoc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 2dada6af7..1f804b03c 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -32,6 +32,9 @@ Changed
 - Deleting a prefix (`:`, `/` or `?`) via backspace now leaves command mode.
 - Angular 1 elements now get hints assigned.
 - `:tab-only` with pinned tabs now still closes unpinned tabs.
+- On Qt 5.7.1, GreaseMonkey `@include` and `@exclude` now support
+  regex matches. With Qt 5.8 and newer, Qt handles the matching, but
+  similar functionality will likely land in Qt 5.11.
 
 Fixed
 ~~~~~

From c153ff5a97e223c5c04e5aa8c2705222d3fa2fbe Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 24 Jan 2018 21:15:10 +0100
Subject: [PATCH 105/229] Update docs

---
 doc/changelog.asciidoc     | 2 ++
 doc/help/commands.asciidoc | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 1f804b03c..28e8a5ad9 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -23,6 +23,8 @@ Added
 
 - Caret/visual mode is now supported for QtWebEngine.
 - A new `qute://bindings` page, opened by `:bind`, shows all keybindings.
+- `:session-load` has a new `--delete` flag which deletes the
+  session after loading it.
 
 Changed
 ~~~~~~~
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 1008de1bf..1d7ac608d 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1068,7 +1068,7 @@ Delete a session.
 
 [[session-load]]
 === session-load
-Syntax: +:session-load [*--clear*] [*--temp*] [*--force*] 'name'+
+Syntax: +:session-load [*--clear*] [*--temp*] [*--force*] [*--delete*] 'name'+
 
 Load a session.
 
@@ -1080,6 +1080,7 @@ Load a session.
 * +*-t*+, +*--temp*+: Don't set the current session for :session-save.
 * +*-f*+, +*--force*+: Force loading internal sessions (starting with an underline).
 
+* +*-d*+, +*--delete*+: Delete the saved session once it has loaded.
 
 [[session-save]]
 === session-save

From 3df469bc38ee93f3d82835bca6cd34b297621bf8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 24 Jan 2018 21:30:17 +0100
Subject: [PATCH 106/229] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 28e8a5ad9..3f78641f8 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -37,6 +37,8 @@ Changed
 - On Qt 5.7.1, GreaseMonkey `@include` and `@exclude` now support
   regex matches. With Qt 5.8 and newer, Qt handles the matching, but
   similar functionality will likely land in Qt 5.11.
+- The sqlite history now uses write-ahead logging which should be
+  a performance and stability improvement.
 
 Fixed
 ~~~~~

From 56f83ddde4d39d9eab7a902c21409c2eff15fd9c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 24 Jan 2018 21:33:32 +0100
Subject: [PATCH 107/229] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 3f78641f8..268ea6c1f 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -44,6 +44,8 @@ Fixed
 ~~~~~
 
 - Improved fullscreen handling with Qt 5.10.
+- URLs containing ampersands and other special chars are now shown
+  correctly when filtering them in the completion.
 
 v1.1.1
 ------

From 4f04c776c1757caacf1b5935358ec79f8a3faf75 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Wed, 24 Jan 2018 22:21:22 +0100
Subject: [PATCH 108/229] fixup! fixup! incdec_number: add support for port

---
 qutebrowser/browser/commands.py   | 8 ++++++--
 qutebrowser/utils/urlutils.py     | 3 ++-
 tests/unit/utils/test_urlutils.py | 1 -
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 6eaa3e167..09a72176a 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -638,9 +638,13 @@ class CommandDispatcher:
                 - `next`: Open a _next_ link.
                 - `up`: Go up a level in the current URL.
                 - `increment`: Increment the last number in the URL.
-                  Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
+                  Uses the
+                  link:settings.html#url.incdec_segments[url.incdec_segments]
+                  config option.
                 - `decrement`: Decrement the last number in the URL.
-                  Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
+                  Uses the
+                  link:settings.html#url.incdec_segments[url.incdec_segments]
+                  config option.
 
             tab: Open in a new tab.
             bg: Open in a background tab.
diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index 88853483e..0cbe6d88e 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -561,7 +561,8 @@ def incdec_number(url, incdec, count=1, segments=None):
     # Order as they appear in a URL
     segment_modifiers = [
         ('host', url.host, url.setHost),
-        ('port', lambda: str(url.port()) if url.port() > 0 else '', lambda x: url.setPort(int(x))),
+        ('port', lambda: str(url.port()) if url.port() > 0 else '',
+         lambda x: url.setPort(int(x))),
         ('path', url.path, url.setPath),
         ('query', url.query, url.setQuery),
         ('anchor', url.fragment, url.setFragment),
diff --git a/tests/unit/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
index de83ba7bf..d7f009a37 100644
--- a/tests/unit/utils/test_urlutils.py
+++ b/tests/unit/utils/test_urlutils.py
@@ -624,7 +624,6 @@ class TestIncDecNumber:
 
     def test_incdec_port(self):
         """Test incdec_number with port."""
-
         base_url = QUrl('http://localhost:8000')
         new_url = urlutils.incdec_number(
             base_url, 'increment', segments={'port'})

From d7c51f7fc4fd6df9c01e78cc20626f85f42a72b1 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Wed, 24 Jan 2018 18:04:05 -0500
Subject: [PATCH 109/229] implement requested changes for PR #3521.

---
 qutebrowser/browser/browsertab.py             |  5 +---
 qutebrowser/browser/commands.py               | 12 ++++-----
 qutebrowser/browser/webengine/webenginetab.py | 18 ++++++++-----
 qutebrowser/browser/webkit/webkittab.py       | 25 +++++++++++++------
 4 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index e90c71f5d..80cdbd5a6 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -94,7 +94,6 @@ class TabData:
         keep_icon: Whether the (e.g. cloned) icon should not be cleared on page
                    load.
         inspector: The QWebInspector used for this webview.
-        viewing_source: Set if we're currently showing a source view.
         override_target: Override for open_target for fake clicks (like hints).
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
@@ -102,7 +101,6 @@ class TabData:
     """
 
     keep_icon = attr.ib(False)
-    viewing_source = attr.ib(False)
     inspector = attr.ib(None)
     override_target = attr.ib(None)
     pinned = attr.ib(False)
@@ -139,7 +137,7 @@ class AbstractAction:
             raise WebTabError("{} is not a valid web action!".format(name))
         self._widget.triggerPageAction(member)
 
-    def show_source(self, dispatcher, url):
+    def show_source(self, win_id, url):
         """Show the source of the current page in a new tab."""
         raise NotImplementedError
 
@@ -727,7 +725,6 @@ class AbstractTab(QWidget):
     def _on_load_started(self):
         self._progress = 0
         self._has_ssl_errors = False
-        self.data.viewing_source = False
         self._set_load_status(usertypes.LoadStatus.loading)
         self.load_started.emit()
 
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 3f616d1f0..42b7d685e 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -29,9 +29,6 @@ from PyQt5.QtWidgets import QApplication, QTabBar, QDialog
 from PyQt5.QtCore import Qt, QUrl, QEvent, QUrlQuery
 from PyQt5.QtGui import QKeyEvent
 from PyQt5.QtPrintSupport import QPrintDialog, QPrintPreviewDialog
-import pygments
-import pygments.lexers
-import pygments.formatters
 
 from qutebrowser.commands import userscripts, cmdexc, cmdutils, runners
 from qutebrowser.config import config, configdata
@@ -758,6 +755,7 @@ class CommandDispatcher:
         else:
             x = None
             y = perc
+
         self._current_widget().scroller.to_perc(x, y)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
@@ -1503,15 +1501,15 @@ class CommandDispatcher:
     def view_source(self):
         """Show the source of the current page in a new tab."""
         tab = self._current_widget()
-        if tab.data.viewing_source:
-            raise cmdexc.CommandError("Already viewing source!")
-
         try:
             current_url = self._current_url()
         except cmdexc.CommandError as e:
             message.error(str(e))
             return
-        tab.action.show_source(self, current_url)
+        if current_url.scheme() == 'view-source':
+            raise cmdexc.CommandError("Already viewing source!")
+
+        tab.action.show_source(self._win_id, current_url)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        debug=True)
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 496df50e5..2b9d9418a 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -99,12 +99,18 @@ class WebEngineAction(browsertab.AbstractAction):
         """Save the current page."""
         self._widget.triggerPageAction(QWebEnginePage.SavePage)
 
-    def show_source(self, dispatcher, url):
-        # use view-source: scheme to show page source for webengine
-        url = QUrl('view-source:{}'.format(url.toString()))
-        new_tab = dispatcher._tabbed_browser.tabopen(
-            url, background=True, related=True)
-        new_tab.data.viewing_source = True
+    def show_source(self, win_id, url):
+        try:
+            self._widget.triggerPageAction(QWebEnginePage.ViewSource)
+        except AttributeError:
+            # Qt < 5.8
+            # note: it's not possible to build the QUrl object by setting the
+            # scheme using setScheme('view-source').
+            # QUrl does the right thing when URL prefix is "view-source:".
+            new_url = QUrl('view-source:' + url.toString())
+            tabbed_browser = objreg.get('tabbed-browser', scope='window',
+                                        window=win_id)
+            tabbed_browser.tabopen(new_url, background=False, related=True)
 
 
 class WebEnginePrinting(browsertab.AbstractPrinting):
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 6edda24ed..caaa32738 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -54,7 +54,15 @@ class WebKitAction(browsertab.AbstractAction):
         """Save the current page."""
         raise browsertab.UnsupportedOperationError
 
-    def show_source(self, dispatcher, url):
+    def show_source(self, win_id, url):
+
+        def format_url(url):
+            """emulate what WebEnginePage::ViewSource does."""
+            s = url.toString()
+            s = s.split('//')[-1]  # strip scheme
+            s = s.split('@')[-1]   # strip userinfo
+            return s
+
         def show_source_cb(source):
             """Show source as soon as it's ready."""
             # WORKAROUND for https://github.com/PyCQA/pylint/issues/491
@@ -62,16 +70,17 @@ class WebKitAction(browsertab.AbstractAction):
             lexer = pygments.lexers.HtmlLexer()
             formatter = pygments.formatters.HtmlFormatter(
                 full=True, linenos='table',
-                title='view-source:{}'.format(url.toDisplayString()))
+                title='view-source:' + format_url(url))
             # pylint: enable=no-member
             highlighted = pygments.highlight(source, lexer, formatter)
 
-            new_tab = dispatcher._tabbed_browser.tabopen()
-            new_tab.set_html(highlighted)
-            new_tab.data.viewing_source = True
-            new_tab.url = lambda requested=False: QUrl(
-                'view-source:' + url.toDisplayString())
-        dispatcher._current_widget().dump_async(show_source_cb)
+            base_url = QUrl('view-source:' + url.toString())
+            new_tab = tabbed_browser.tabopen(background=False, related=True)
+            new_tab.set_html(highlighted, base_url)
+
+        tabbed_browser = objreg.get('tabbed-browser', scope='window',
+                                    window=win_id)
+        tabbed_browser.currentWidget().dump_async(show_source_cb)
 
 
 class WebKitPrinting(browsertab.AbstractPrinting):

From ab4c8757927968bad0ee02fb3db02ad31cde42b1 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 25 Jan 2018 09:03:47 +0100
Subject: [PATCH 110/229] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 268ea6c1f..e450bae99 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -39,6 +39,7 @@ Changed
   similar functionality will likely land in Qt 5.11.
 - The sqlite history now uses write-ahead logging which should be
   a performance and stability improvement.
+- The `url.incdec_segments` option now also can take `port` as possible segment.
 
 Fixed
 ~~~~~

From b93bee18d00ebaca577137b306b2330d14e06097 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 25 Jan 2018 11:03:45 +0100
Subject: [PATCH 111/229] Regenerate docs

---
 doc/help/commands.asciidoc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index b469104e6..1b65dbdd7 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -743,9 +743,13 @@ This tries to automatically click on typical _Previous Page_ or _Next Page_ link
  - `next`: Open a _next_ link.
  - `up`: Go up a level in the current URL.
  - `increment`: Increment the last number in the URL.
- Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
+ Uses the
+ link:settings.html#url.incdec_segments[url.incdec_segments]
+ config option.
  - `decrement`: Decrement the last number in the URL.
- Uses the link:settings.html#url.incdec_segments[url.incdec_segments] config option.
+ Uses the
+ link:settings.html#url.incdec_segments[url.incdec_segments]
+ config option.
  
 
 

From eb888cc8d77cfdba90f85678de223002bdf731c6 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Thu, 25 Jan 2018 13:35:23 -0500
Subject: [PATCH 112/229] fix latest change requests

---
 qutebrowser/browser/browsertab.py             |  6 +++--
 qutebrowser/browser/commands.py               |  2 +-
 qutebrowser/browser/webengine/webenginetab.py | 16 ++++++-------
 qutebrowser/browser/webkit/webkittab.py       | 24 +++++++------------
 tests/end2end/features/history.feature        |  2 +-
 tests/unit/browser/test_tab.py                |  2 +-
 6 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 80cdbd5a6..f0015dd47 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -119,8 +119,10 @@ class AbstractAction:
     action_class = None
     action_base = None
 
-    def __init__(self):
+    def __init__(self, tab, win_id):
         self._widget = None
+        self._tab = tab
+        self._win_id = win_id
 
     def exit_fullscreen(self):
         """Exit the fullscreen mode."""
@@ -137,7 +139,7 @@ class AbstractAction:
             raise WebTabError("{} is not a valid web action!".format(name))
         self._widget.triggerPageAction(member)
 
-    def show_source(self, win_id, url):
+    def show_source(self):
         """Show the source of the current page in a new tab."""
         raise NotImplementedError
 
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 42b7d685e..f7d9bdf73 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1509,7 +1509,7 @@ class CommandDispatcher:
         if current_url.scheme() == 'view-source':
             raise cmdexc.CommandError("Already viewing source!")
 
-        tab.action.show_source(self._win_id, current_url)
+        tab.action.show_source()
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        debug=True)
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 2b9d9418a..7e2a81af6 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -99,18 +99,16 @@ class WebEngineAction(browsertab.AbstractAction):
         """Save the current page."""
         self._widget.triggerPageAction(QWebEnginePage.SavePage)
 
-    def show_source(self, win_id, url):
+    def show_source(self):
         try:
             self._widget.triggerPageAction(QWebEnginePage.ViewSource)
         except AttributeError:
             # Qt < 5.8
-            # note: it's not possible to build the QUrl object by setting the
-            # scheme using setScheme('view-source').
-            # QUrl does the right thing when URL prefix is "view-source:".
-            new_url = QUrl('view-source:' + url.toString())
-            tabbed_browser = objreg.get('tabbed-browser', scope='window',
-                                        window=win_id)
-            tabbed_browser.tabopen(new_url, background=False, related=True)
+            url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
+            new_url = QUrl('view-source:' + url_str)
+            tb = objreg.get('tabbed-browser', scope='window',
+                            window=self._win_id)
+            tb.tabopen(new_url, background=False, related=True)
 
 
 class WebEnginePrinting(browsertab.AbstractPrinting):
@@ -609,7 +607,7 @@ class WebEngineTab(browsertab.AbstractTab):
         self.search = WebEngineSearch(parent=self)
         self.printing = WebEnginePrinting()
         self.elements = WebEngineElements(self)
-        self.action = WebEngineAction()
+        self.action = WebEngineAction(self, win_id)
         self._set_widget(widget)
         self._connect_signals()
         self.backend = usertypes.Backend.QtWebEngine
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index caaa32738..92820642c 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -54,14 +54,7 @@ class WebKitAction(browsertab.AbstractAction):
         """Save the current page."""
         raise browsertab.UnsupportedOperationError
 
-    def show_source(self, win_id, url):
-
-        def format_url(url):
-            """emulate what WebEnginePage::ViewSource does."""
-            s = url.toString()
-            s = s.split('//')[-1]  # strip scheme
-            s = s.split('@')[-1]   # strip userinfo
-            return s
+    def show_source(self):
 
         def show_source_cb(source):
             """Show source as soon as it's ready."""
@@ -70,17 +63,18 @@ class WebKitAction(browsertab.AbstractAction):
             lexer = pygments.lexers.HtmlLexer()
             formatter = pygments.formatters.HtmlFormatter(
                 full=True, linenos='table',
-                title='view-source:' + format_url(url))
+                title='Source for {}'.format(url_str))
             # pylint: enable=no-member
             highlighted = pygments.highlight(source, lexer, formatter)
 
-            base_url = QUrl('view-source:' + url.toString())
-            new_tab = tabbed_browser.tabopen(background=False, related=True)
+            base_url = QUrl('view-source:' + url_str)
+            tb = objreg.get('tabbed-browser', scope='window',
+                            window=self._win_id)
+            new_tab = tb.tabopen(background=False, related=True)
             new_tab.set_html(highlighted, base_url)
 
-        tabbed_browser = objreg.get('tabbed-browser', scope='window',
-                                    window=win_id)
-        tabbed_browser.currentWidget().dump_async(show_source_cb)
+        url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
+        self._tab.dump_async(show_source_cb)
 
 
 class WebKitPrinting(browsertab.AbstractPrinting):
@@ -657,7 +651,7 @@ class WebKitTab(browsertab.AbstractTab):
         self.search = WebKitSearch(parent=self)
         self.printing = WebKitPrinting()
         self.elements = WebKitElements(self)
-        self.action = WebKitAction()
+        self.action = WebKitAction(self, win_id)
         self._set_widget(widget)
         self._connect_signals()
         self.backend = usertypes.Backend.QtWebKit
diff --git a/tests/end2end/features/history.feature b/tests/end2end/features/history.feature
index df6610daf..e9ef56129 100644
--- a/tests/end2end/features/history.feature
+++ b/tests/end2end/features/history.feature
@@ -69,7 +69,7 @@ Feature: Page history
     Scenario: History with view-source URL
         When I open data/title.html
         And I run :view-source
-        And I wait for "Changing title for idx * to 'view-source:http://localhost:*/data/title.html'" in the log
+        And I wait for regex "Changing title for idx \d+ to '(Source for |view-source:)(http://)?localhost:\d+/data/title.html'" in the log
         Then the history should contain:
             http://localhost:(port)/data/title.html Test title
 
diff --git a/tests/unit/browser/test_tab.py b/tests/unit/browser/test_tab.py
index d67ee4c8f..7ceb9795b 100644
--- a/tests/unit/browser/test_tab.py
+++ b/tests/unit/browser/test_tab.py
@@ -87,7 +87,7 @@ class Tab(browsertab.AbstractTab):
         self.search = browsertab.AbstractSearch(parent=self)
         self.printing = browsertab.AbstractPrinting()
         self.elements = browsertab.AbstractElements(self)
-        self.action = browsertab.AbstractAction()
+        self.action = browsertab.AbstractAction(self, self.win_id)
 
     def _install_event_filter(self):
         pass

From bb8bc7ea3cd55baf79fe152165228cd8802b3421 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Thu, 25 Jan 2018 15:17:03 -0500
Subject: [PATCH 113/229] fix test related to view-source remove pygment title
 remove view-source from history

---
 qutebrowser/browser/history.py                | 2 +-
 qutebrowser/browser/webengine/webenginetab.py | 8 +++++---
 qutebrowser/browser/webkit/webkittab.py       | 9 +++++----
 tests/end2end/features/history.feature        | 2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index 04bc1be15..995fb591d 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -172,7 +172,7 @@ class WebHistory(sql.SqlTable):
     @pyqtSlot(QUrl, QUrl, str)
     def add_from_tab(self, url, requested_url, title):
         """Add a new history entry as slot, called from a BrowserTab."""
-        if any(url.scheme() == 'data' or
+        if any(url.scheme() in ('data', 'view-source') or
                (url.scheme(), url.host()) == ('qute', 'back')
                for url in (url, requested_url)):
             return
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 7e2a81af6..e7fb07275 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -104,11 +104,13 @@ class WebEngineAction(browsertab.AbstractAction):
             self._widget.triggerPageAction(QWebEnginePage.ViewSource)
         except AttributeError:
             # Qt < 5.8
-            url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
-            new_url = QUrl('view-source:' + url_str)
             tb = objreg.get('tabbed-browser', scope='window',
                             window=self._win_id)
-            tb.tabopen(new_url, background=False, related=True)
+            url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
+            # The original URL becomes the path of a view-source: URL
+            # (without a host), but query/fragment should stay.
+            url = QUrl('view-source:' + url_str)
+            tb.tabopen(url, background=False, related=True)
 
 
 class WebEnginePrinting(browsertab.AbstractPrinting):
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 92820642c..49fd150ae 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -62,16 +62,17 @@ class WebKitAction(browsertab.AbstractAction):
             # pylint: disable=no-member
             lexer = pygments.lexers.HtmlLexer()
             formatter = pygments.formatters.HtmlFormatter(
-                full=True, linenos='table',
-                title='Source for {}'.format(url_str))
+                full=True, linenos='table')
             # pylint: enable=no-member
             highlighted = pygments.highlight(source, lexer, formatter)
 
-            base_url = QUrl('view-source:' + url_str)
             tb = objreg.get('tabbed-browser', scope='window',
                             window=self._win_id)
             new_tab = tb.tabopen(background=False, related=True)
-            new_tab.set_html(highlighted, base_url)
+            # The original URL becomes the path of a view-source: URL
+            # (without a host), but query/fragment should stay.
+            url = QUrl('view-source:' + url_str)
+            new_tab.set_html(highlighted, url)
 
         url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
         self._tab.dump_async(show_source_cb)
diff --git a/tests/end2end/features/history.feature b/tests/end2end/features/history.feature
index e9ef56129..9863d2c7f 100644
--- a/tests/end2end/features/history.feature
+++ b/tests/end2end/features/history.feature
@@ -69,7 +69,7 @@ Feature: Page history
     Scenario: History with view-source URL
         When I open data/title.html
         And I run :view-source
-        And I wait for regex "Changing title for idx \d+ to '(Source for |view-source:)(http://)?localhost:\d+/data/title.html'" in the log
+        And I wait for regex "Changing title for idx \d+ to 'view-source:(http://)?localhost:\d+/data/title.html'" in the log
         Then the history should contain:
             http://localhost:(port)/data/title.html Test title
 

From 88ff0c0425a413e70be9ac98e6669a577a8e65ac Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Thu, 25 Jan 2018 18:01:43 -0500
Subject: [PATCH 114/229] url_str -> urlstr: urlstr used accross the codebase,
 more consistent

---
 qutebrowser/browser/webengine/webenginetab.py | 4 ++--
 qutebrowser/browser/webkit/webkittab.py       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index e7fb07275..c2bfe8a5d 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -106,10 +106,10 @@ class WebEngineAction(browsertab.AbstractAction):
             # Qt < 5.8
             tb = objreg.get('tabbed-browser', scope='window',
                             window=self._win_id)
-            url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
+            urlstr = self._tab.url().toString(QUrl.RemoveUserInfo)
             # The original URL becomes the path of a view-source: URL
             # (without a host), but query/fragment should stay.
-            url = QUrl('view-source:' + url_str)
+            url = QUrl('view-source:' + urlstr)
             tb.tabopen(url, background=False, related=True)
 
 
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 49fd150ae..5a0de4983 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -71,10 +71,10 @@ class WebKitAction(browsertab.AbstractAction):
             new_tab = tb.tabopen(background=False, related=True)
             # The original URL becomes the path of a view-source: URL
             # (without a host), but query/fragment should stay.
-            url = QUrl('view-source:' + url_str)
+            url = QUrl('view-source:' + urlstr)
             new_tab.set_html(highlighted, url)
 
-        url_str = self._tab.url().toString(QUrl.RemoveUserInfo)
+        urlstr = self._tab.url().toString(QUrl.RemoveUserInfo)
         self._tab.dump_async(show_source_cb)
 
 

From 677e1888946d04cde79d840a7c056544ec16ae19 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 26 Jan 2018 09:37:35 +0100
Subject: [PATCH 115/229] Update docs

---
 doc/changelog.asciidoc                        | 3 +++
 qutebrowser/browser/webengine/webenginetab.py | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index e450bae99..e09d78236 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -40,6 +40,7 @@ Changed
 - The sqlite history now uses write-ahead logging which should be
   a performance and stability improvement.
 - The `url.incdec_segments` option now also can take `port` as possible segment.
+- `:view-source` now uses Chromium's `view-source:` scheme with QtWebEngine.
 
 Fixed
 ~~~~~
@@ -47,6 +48,8 @@ Fixed
 - Improved fullscreen handling with Qt 5.10.
 - URLs containing ampersands and other special chars are now shown
   correctly when filtering them in the completion.
+- Hinting and scrolling now works properly on special `view-source:` pages.
+- `:view-source` now displays a valid URL with QtWebKit.
 
 v1.1.1
 ------
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index c2bfe8a5d..8c10736fd 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -626,6 +626,8 @@ class WebEngineTab(browsertab.AbstractTab):
             utils.read_file('javascript/caret.js'),
         ])
         script = QWebEngineScript()
+        # We can't use DocumentCreation here as WORKAROUND for
+        # https://bugreports.qt.io/browse/QTBUG-66011
         script.setInjectionPoint(QWebEngineScript.DocumentReady)
         script.setSourceCode(js_code)
 

From 4b9bba750516a1751e5f8694c10fdea67bcc8260 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 26 Jan 2018 09:38:49 +0100
Subject: [PATCH 116/229] Edit changelog

---
 doc/changelog.asciidoc | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index e09d78236..c9cb327b3 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -21,7 +21,7 @@ v1.2.0 (unreleased)
 Added
 ~~~~~
 
-- Caret/visual mode is now supported for QtWebEngine.
+- QtWebEngine: Caret/visual mode is now supported.
 - A new `qute://bindings` page, opened by `:bind`, shows all keybindings.
 - `:session-load` has a new `--delete` flag which deletes the
   session after loading it.
@@ -34,22 +34,23 @@ Changed
 - Deleting a prefix (`:`, `/` or `?`) via backspace now leaves command mode.
 - Angular 1 elements now get hints assigned.
 - `:tab-only` with pinned tabs now still closes unpinned tabs.
-- On Qt 5.7.1, GreaseMonkey `@include` and `@exclude` now support
-  regex matches. With Qt 5.8 and newer, Qt handles the matching, but
-  similar functionality will likely land in Qt 5.11.
+- GreaseMonkey `@include` and `@exclude` now support
+  regex matches. With QtWebEngine and Qt 5.8 and newer, Qt handles the matching,
+  but similar functionality will likely land in Qt 5.11.
 - The sqlite history now uses write-ahead logging which should be
   a performance and stability improvement.
 - The `url.incdec_segments` option now also can take `port` as possible segment.
-- `:view-source` now uses Chromium's `view-source:` scheme with QtWebEngine.
+- QtWebEngine: `:view-source` now uses Chromium's `view-source:` scheme.
 
 Fixed
 ~~~~~
 
-- Improved fullscreen handling with Qt 5.10.
+- QtWebEngine: Improved fullscreen handling with Qt 5.10.
+- QtWebEngine: Hinting and scrolling now works properly on special
+  `view-source:` pages.
+- QtWebKit: `:view-source` now displays a valid URL.
 - URLs containing ampersands and other special chars are now shown
   correctly when filtering them in the completion.
-- Hinting and scrolling now works properly on special `view-source:` pages.
-- `:view-source` now displays a valid URL with QtWebKit.
 
 v1.1.1
 ------

From 24cc54a574e1d908bcc4cf64cfbb87885a27dcca Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 26 Jan 2018 09:46:16 +0100
Subject: [PATCH 117/229] Simplify initializing of AbstractTab subclasses

If we already pass the tab object, no need to pass the window ID separately.
---
 qutebrowser/browser/browsertab.py             | 20 ++++---------------
 qutebrowser/browser/webengine/webenginetab.py | 10 +++++-----
 qutebrowser/browser/webkit/webkittab.py       | 12 +++++------
 tests/unit/browser/test_tab.py                |  5 ++---
 4 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index f0015dd47..11ba7bc00 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -119,10 +119,9 @@ class AbstractAction:
     action_class = None
     action_base = None
 
-    def __init__(self, tab, win_id):
+    def __init__(self, tab):
         self._widget = None
         self._tab = tab
-        self._win_id = win_id
 
     def exit_fullscreen(self):
         """Exit the fullscreen mode."""
@@ -249,10 +248,10 @@ class AbstractZoom(QObject):
         _default_zoom_changed: Whether the zoom was changed from the default.
     """
 
-    def __init__(self, win_id, parent=None):
+    def __init__(self, tab, parent=None):
         super().__init__(parent)
+        self._tab = tab
         self._widget = None
-        self._win_id = win_id
         self._default_zoom_changed = False
         self._init_neighborlist()
         config.instance.changed.connect(self._on_config_changed)
@@ -328,10 +327,9 @@ class AbstractCaret(QObject):
 
     """Attribute of AbstractTab for caret browsing."""
 
-    def __init__(self, win_id, tab, mode_manager, parent=None):
+    def __init__(self, tab, mode_manager, parent=None):
         super().__init__(parent)
         self._tab = tab
-        self._win_id = win_id
         self._widget = None
         self.selection_enabled = False
         mode_manager.entered.connect(self._on_mode_entered)
@@ -643,16 +641,6 @@ class AbstractTab(QWidget):
         tab_registry[self.tab_id] = self
         objreg.register('tab', self, registry=self.registry)
 
-        # self.history = AbstractHistory(self)
-        # self.scroller = AbstractScroller(self, parent=self)
-        # self.caret = AbstractCaret(win_id=win_id, tab=self,
-        #                            mode_manager=mode_manager, parent=self)
-        # self.zoom = AbstractZoom(win_id=win_id)
-        # self.search = AbstractSearch(parent=self)
-        # self.printing = AbstractPrinting()
-        # self.elements = AbstractElements(self)
-        # self.action = AbstractAction()
-
         self.data = TabData()
         self._layout = miscwidgets.WrapperLayout(self)
         self._widget = None
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 8c10736fd..13ceb7fd1 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -105,7 +105,7 @@ class WebEngineAction(browsertab.AbstractAction):
         except AttributeError:
             # Qt < 5.8
             tb = objreg.get('tabbed-browser', scope='window',
-                            window=self._win_id)
+                            window=self._tab.win_id)
             urlstr = self._tab.url().toString(QUrl.RemoveUserInfo)
             # The original URL becomes the path of a view-source: URL
             # (without a host), but query/fragment should stay.
@@ -603,13 +603,13 @@ class WebEngineTab(browsertab.AbstractTab):
                                        private=private)
         self.history = WebEngineHistory(self)
         self.scroller = WebEngineScroller(self, parent=self)
-        self.caret = WebEngineCaret(win_id=win_id, mode_manager=mode_manager,
+        self.caret = WebEngineCaret(mode_manager=mode_manager,
                                     tab=self, parent=self)
-        self.zoom = WebEngineZoom(win_id=win_id, parent=self)
+        self.zoom = WebEngineZoom(tab=self, parent=self)
         self.search = WebEngineSearch(parent=self)
         self.printing = WebEnginePrinting()
-        self.elements = WebEngineElements(self)
-        self.action = WebEngineAction(self, win_id)
+        self.elements = WebEngineElements(tab=self)
+        self.action = WebEngineAction(tab=self)
         self._set_widget(widget)
         self._connect_signals()
         self.backend = usertypes.Backend.QtWebEngine
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 5a0de4983..93d5ee3f7 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -67,7 +67,7 @@ class WebKitAction(browsertab.AbstractAction):
             highlighted = pygments.highlight(source, lexer, formatter)
 
             tb = objreg.get('tabbed-browser', scope='window',
-                            window=self._win_id)
+                            window=self._tab.win_id)
             new_tab = tb.tabopen(background=False, related=True)
             # The original URL becomes the path of a view-source: URL
             # (without a host), but query/fragment should stay.
@@ -354,7 +354,7 @@ class WebKitCaret(browsertab.AbstractCaret):
     def toggle_selection(self):
         self.selection_enabled = not self.selection_enabled
         mainwindow = objreg.get('main-window', scope='window',
-                                window=self._win_id)
+                                window=self._tab.win_id)
         mainwindow.status.set_mode_active(usertypes.KeyMode.caret, True)
 
     def drop_selection(self):
@@ -646,13 +646,13 @@ class WebKitTab(browsertab.AbstractTab):
             self._make_private(widget)
         self.history = WebKitHistory(self)
         self.scroller = WebKitScroller(self, parent=self)
-        self.caret = WebKitCaret(win_id=win_id, mode_manager=mode_manager,
+        self.caret = WebKitCaret(mode_manager=mode_manager,
                                  tab=self, parent=self)
-        self.zoom = WebKitZoom(win_id=win_id, parent=self)
+        self.zoom = WebKitZoom(tab=self, parent=self)
         self.search = WebKitSearch(parent=self)
         self.printing = WebKitPrinting()
-        self.elements = WebKitElements(self)
-        self.action = WebKitAction(self, win_id)
+        self.elements = WebKitElements(tab=self)
+        self.action = WebKitAction(tab=self)
         self._set_widget(widget)
         self._connect_signals()
         self.backend = usertypes.Backend.QtWebKit
diff --git a/tests/unit/browser/test_tab.py b/tests/unit/browser/test_tab.py
index 7ceb9795b..2b2726951 100644
--- a/tests/unit/browser/test_tab.py
+++ b/tests/unit/browser/test_tab.py
@@ -80,10 +80,9 @@ class Tab(browsertab.AbstractTab):
                          parent=parent)
         self.history = browsertab.AbstractHistory(self)
         self.scroller = browsertab.AbstractScroller(self, parent=self)
-        self.caret = browsertab.AbstractCaret(win_id=self.win_id,
-                                              mode_manager=mode_manager,
+        self.caret = browsertab.AbstractCaret(mode_manager=mode_manager,
                                               tab=self, parent=self)
-        self.zoom = Zoom(win_id=self.win_id)
+        self.zoom = Zoom(tab=self)
         self.search = browsertab.AbstractSearch(parent=self)
         self.printing = browsertab.AbstractPrinting()
         self.elements = browsertab.AbstractElements(self)

From 1dac05a7ace6a54dead935ae694ad97811fea00b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 26 Jan 2018 11:58:02 +0100
Subject: [PATCH 118/229] Fix test_tab.py

---
 tests/unit/browser/test_tab.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/browser/test_tab.py b/tests/unit/browser/test_tab.py
index 2b2726951..3fc923b1f 100644
--- a/tests/unit/browser/test_tab.py
+++ b/tests/unit/browser/test_tab.py
@@ -85,8 +85,8 @@ class Tab(browsertab.AbstractTab):
         self.zoom = Zoom(tab=self)
         self.search = browsertab.AbstractSearch(parent=self)
         self.printing = browsertab.AbstractPrinting()
-        self.elements = browsertab.AbstractElements(self)
-        self.action = browsertab.AbstractAction(self, self.win_id)
+        self.elements = browsertab.AbstractElements(tab=self)
+        self.action = browsertab.AbstractAction(tab=self)
 
     def _install_event_filter(self):
         pass

From cdaf3ac097754f10ad1d3de23ff3fef8bf22e187 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 26 Jan 2018 18:32:27 +0100
Subject: [PATCH 119/229] Fix .Xresources example

[ci skip]
---
 doc/help/configuring.asciidoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc
index a9b7b6ddf..b801e8820 100644
--- a/doc/help/configuring.asciidoc
+++ b/doc/help/configuring.asciidoc
@@ -366,6 +366,8 @@ You can use something like this to read colors from an `~/.Xresources` file:
 
 [source,python]
 ----
+import subprocess
+
 def read_xresources(prefix):
     props = {}
     x = subprocess.run(['xrdb', '-query'], stdout=subprocess.PIPE)
@@ -376,7 +378,7 @@ def read_xresources(prefix):
     return props
 
 xresources = read_xresources('*')
-c.colors.statusbar.normal.bg = xresources['*background']
+c.colors.statusbar.normal.bg = xresources['*.background']
 ----
 
 Avoiding flake8 errors

From 8a9b98c2dc2b9c55808bcd2274b4039ede87b3a8 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Mon, 18 Dec 2017 14:42:05 -0500
Subject: [PATCH 120/229] Editor triggers update on every save.

For any command that spawns an editor, tirgger an update on save, not
just on exit.

- :open-editor writes the text field on save
- :edit-url navigates on save
- :edit-url -t opens a new tab on each save
- :edit-command updates the statusbar text on save
- :edit-command --run runs a command on each save
- :config-edit reloads the config on save

Resolves #2307.
Helps mitigate #1596 by allowing users to 'save' partial work, and
notice if there was an error without closing the editor.
---
 qutebrowser/misc/editor.py                | 39 +++++++++++++----------
 tests/end2end/features/editor.feature     | 14 +++++++-
 tests/end2end/features/test_editor_bdd.py | 27 +++++++++++++---
 3 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 553c700e7..62d4a2d6f 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -22,7 +22,8 @@
 import os
 import tempfile
 
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QProcess
+from PyQt5.QtCore import (pyqtSignal, pyqtSlot, QObject, QProcess,
+    QFileSystemWatcher)
 
 from qutebrowser.config import config
 from qutebrowser.utils import message, log
@@ -39,6 +40,7 @@ class ExternalEditor(QObject):
         _remove_file: Whether the file should be removed when the editor is
                       closed.
         _proc: The GUIProcess of the editor.
+        _watcher: A QFileSystemWatcher to watch the edited file for changes.
     """
 
     editing_finished = pyqtSignal(str)
@@ -48,10 +50,12 @@ class ExternalEditor(QObject):
         self._filename = None
         self._proc = None
         self._remove_file = None
+        self._watcher = QFileSystemWatcher(parent=self)
 
     def _cleanup(self):
         """Clean up temporary files after the editor closed."""
         assert self._remove_file is not None
+        self._watcher.fileChanged.disconnect()
         if self._filename is None or not self._remove_file:
             # Could not create initial file.
             return
@@ -75,22 +79,7 @@ class ExternalEditor(QObject):
             # No error/cleanup here, since we already handle this in
             # on_proc_error.
             return
-        try:
-            if exitcode != 0:
-                return
-            encoding = config.val.editor.encoding
-            try:
-                with open(self._filename, 'r', encoding=encoding) as f:
-                    text = f.read()
-            except OSError as e:
-                # NOTE: Do not replace this with "raise CommandError" as it's
-                # executed async.
-                message.error("Failed to read back edited file: {}".format(e))
-                return
-            log.procs.debug("Read back: {}".format(text))
-            self.editing_finished.emit(text)
-        finally:
-            self._cleanup()
+        self._cleanup()
 
     @pyqtSlot(QProcess.ProcessError)
     def on_proc_error(self, _err):
@@ -128,6 +117,19 @@ class ExternalEditor(QObject):
         line, column = self._calc_line_and_column(text, caret_position)
         self._start_editor(line=line, column=column)
 
+    def _on_file_changed(self, path):
+        encoding = config.val.editor.encoding
+        try:
+            with open(path, 'r', encoding=encoding) as f:
+                text = f.read()
+        except OSError as e:
+            # NOTE: Do not replace this with "raise CommandError" as it's
+            # executed async.
+            message.error("Failed to read back edited file: {}".format(e))
+            return
+        log.procs.debug("Read back: {}".format(text))
+        self.editing_finished.emit(text)
+
     def edit_file(self, filename):
         """Edit the file with the given filename."""
         self._filename = filename
@@ -147,6 +149,9 @@ class ExternalEditor(QObject):
         editor = config.val.editor.command
         executable = editor[0]
 
+        self._watcher.addPath(self._filename)
+        self._watcher.fileChanged.connect(self._on_file_changed)
+
         args = [self._sub_placeholder(arg, line, column) for arg in editor[1:]]
         log.procs.debug("Calling \"{}\" with args {}".format(executable, args))
         self._proc.start(executable, args)
diff --git a/tests/end2end/features/editor.feature b/tests/end2end/features/editor.feature
index d01e3d229..489fc7200 100644
--- a/tests/end2end/features/editor.feature
+++ b/tests/end2end/features/editor.feature
@@ -119,7 +119,7 @@ Feature: Opening external editors
     # There's no guarantee that the tab gets deleted...
     @posix @flaky
     Scenario: Spawning an editor and closing the tab
-        When I set up a fake editor that waits
+        When I set up a fake editor that writes "foobar" on save
         And I open data/editor.html
         And I run :click-element id qute-textarea
         And I wait for "Entering mode KeyMode.insert (reason: clicking input)" in the log
@@ -129,6 +129,18 @@ Feature: Opening external editors
         And I kill the waiting editor
         Then the error "Edited element vanished" should be shown
 
+    # Could not get signals working on Windows
+    @posix
+    Scenario: Spawning an editor and saving
+        When I set up a fake editor that writes "foobar" on save
+        And I open data/editor.html
+        And I run :click-element id qute-textarea
+        And I wait for "Entering mode KeyMode.insert (reason: clicking input)" in the log
+        And I run :open-editor
+        And I save without exiting the editor
+        And I run :click-element id qute-button
+        Then the javascript message "text: foobar" should be logged
+
     Scenario: Spawning an editor in caret mode
         When I set up a fake editor returning "foobar"
         And I open data/editor.html
diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index 260197a46..18551271b 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -70,8 +70,9 @@ def set_up_editor_empty(quteproc, tmpdir):
     set_up_editor(quteproc, tmpdir, "")
 
 
-@bdd.when(bdd.parsers.parse('I set up a fake editor that waits'))
-def set_up_editor_wait(quteproc, tmpdir):
+@bdd.when(bdd.parsers.parse('I set up a fake editor that writes "{text}" on '
+                            'save'))
+def set_up_editor_wait(quteproc, tmpdir, text):
     """Set up editor.command to a small python script inserting a text."""
     assert not utils.is_windows
     pidfile = tmpdir / 'editor_pid'
@@ -82,12 +83,19 @@ def set_up_editor_wait(quteproc, tmpdir):
         import time
         import signal
 
+        def handle(sig, frame):
+            with open(sys.argv[1], 'w', encoding='utf-8') as f:
+                f.write({text!r})
+            if sig == signal.SIGUSR1:
+                sys.exit(0)
+
         with open(r'{pidfile}', 'w') as f:
             f.write(str(os.getpid()))
 
-        signal.signal(signal.SIGUSR1, lambda s, f: sys.exit(0))
+        signal.signal(signal.SIGUSR1, handle)
+        signal.signal(signal.SIGUSR2, handle)
         time.sleep(100)
-    """.format(pidfile=pidfile)))
+    """.format(pidfile=pidfile, text=text)))
     editor = json.dumps([sys.executable, str(script), '{}'])
     quteproc.set_setting('editor.command', editor)
 
@@ -101,3 +109,14 @@ def kill_editor_wait(tmpdir):
     # for posix, there IS a member so we need to ignore useless-suppression
     # pylint: disable=no-member,useless-suppression
     os.kill(pid, signal.SIGUSR1)
+
+
+@bdd.when(bdd.parsers.parse('I save without exiting the editor'))
+def save_editor_wait(tmpdir):
+    """Trigger the waiting editor to write without exiting."""
+    pidfile = tmpdir / 'editor_pid'
+    pid = int(pidfile.read())
+    # windows has no SIGUSR2, but we don't run this on windows anyways
+    # for posix, there IS a member so we need to ignore useless-suppression
+    # pylint: disable=no-member,useless-suppression
+    os.kill(pid, signal.SIGUSR2)

From 23eb6a6c534f397885e89f91fd48f641b807e10a Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Fri, 29 Dec 2017 16:08:59 -0500
Subject: [PATCH 121/229] Fix test_editor for edit-on-write behavior.

Now that the editor fires editing_finished on every write, the unit
tests had to be updated.

- Add qtbot to the editor fixture to resolve `QtWarningMsg:
  QSocketNotifier: Can only be used with threads started with QThread`
- Use removePaths instead of disconnect to stop the watcher from
  signalling. This avoids an error when the editor is forcibly cleaned
  up by the tests without the signal ever being connected, but otherwise
  has the same behavior as disconnecting the singal.
- wait for a signal on write instead of proc closed
- wait for _watcher.fileChanged in test_unreadable to ensure the write
  event is fired before the test exits.
---
 qutebrowser/misc/editor.py     |  2 +-
 tests/unit/misc/test_editor.py | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 62d4a2d6f..53067ca2c 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -55,7 +55,7 @@ class ExternalEditor(QObject):
     def _cleanup(self):
         """Clean up temporary files after the editor closed."""
         assert self._remove_file is not None
-        self._watcher.fileChanged.disconnect()
+        self._watcher.removePaths(self._watcher.files())
         if self._filename is None or not self._remove_file:
             # Could not create initial file.
             return
diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 7dea6e069..55425a1c4 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -37,7 +37,7 @@ def patch_things(config_stub, monkeypatch, stubs):
 
 
 @pytest.fixture
-def editor(caplog):
+def editor(caplog, qtbot):
     ed = editormod.ExternalEditor()
     yield ed
     with caplog.at_level(logging.ERROR):
@@ -118,18 +118,21 @@ class TestFileHandling:
 
         os.remove(filename)
 
-    def test_unreadable(self, message_mock, editor, caplog):
+    def test_unreadable(self, message_mock, editor, caplog, qtbot):
         """Test file handling when closing with an unreadable file."""
         editor.edit("")
         filename = editor._filename
         assert os.path.exists(filename)
-        os.chmod(filename, 0o077)
+        os.chmod(filename, 0o277)
         if os.access(filename, os.R_OK):
             # Docker container or similar
             pytest.skip("File was still readable")
 
         with caplog.at_level(logging.ERROR):
-            editor._proc.finished.emit(0, QProcess.NormalExit)
+            with qtbot.wait_signal(editor._watcher.fileChanged):
+                with open(filename, 'w', encoding='utf-8') as f:
+                    f.write('unreadable')
+        editor._proc.finished.emit(0, QProcess.NormalExit)
         assert not os.path.exists(filename)
         msg = message_mock.getmsg(usertypes.MessageLevel.error)
         assert msg.text.startswith("Failed to read back edited file: ")
@@ -170,11 +173,11 @@ def test_modify(qtbot, editor, initial_text, edited_text):
     with open(editor._filename, 'r', encoding='utf-8') as f:
         assert f.read() == initial_text
 
-    with open(editor._filename, 'w', encoding='utf-8') as f:
-        f.write(edited_text)
-
     with qtbot.wait_signal(editor.editing_finished) as blocker:
-        editor._proc.finished.emit(0, QProcess.NormalExit)
+        with open(editor._filename, 'w', encoding='utf-8') as f:
+            f.write(edited_text)
+
+    editor._proc.finished.emit(0, QProcess.NormalExit)
 
     assert blocker.args == [edited_text]
 

From a940de3717d167cd7c13ce5429fd58d6b23d74d7 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Fri, 29 Dec 2017 22:05:04 -0500
Subject: [PATCH 122/229] Rename editing_finished to file_updated.

ExternalEditor now fires an event on save rather than on exit, so the
signal name should be updated to match the behavior.
---
 qutebrowser/browser/commands.py             | 8 ++++----
 qutebrowser/config/configcommands.py        | 4 ++--
 qutebrowser/mainwindow/statusbar/command.py | 2 +-
 qutebrowser/misc/editor.py                  | 4 ++--
 tests/unit/misc/test_editor.py              | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index fdd552b32..55af2c50a 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1622,8 +1622,8 @@ class CommandDispatcher:
         caret_position = elem.caret_position()
 
         ed = editor.ExternalEditor(self._tabbed_browser)
-        ed.editing_finished.connect(functools.partial(
-            self.on_editing_finished, elem))
+        ed.file_updated.connect(functools.partial(
+            self.on_file_updated, elem))
         ed.edit(text, caret_position)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
@@ -1636,7 +1636,7 @@ class CommandDispatcher:
         tab = self._current_widget()
         tab.elements.find_focused(self._open_editor_cb)
 
-    def on_editing_finished(self, elem, text):
+    def on_file_updated(self, elem, text):
         """Write the editor text into the form field and clean up tempfile.
 
         Callback for GUIProcess when the editor was closed.
@@ -2146,7 +2146,7 @@ class CommandDispatcher:
         ed = editor.ExternalEditor(self._tabbed_browser)
 
         # Passthrough for openurl args (e.g. -t, -b, -w)
-        ed.editing_finished.connect(functools.partial(
+        ed.file_updated.connect(functools.partial(
             self._open_if_changed, old_url=old_url, bg=bg, tab=tab,
             window=window, private=private, related=related))
 
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index 93a1f7ce0..faf31d718 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -253,7 +253,7 @@ class ConfigCommands:
         Args:
             no_source: Don't re-source the config file after editing.
         """
-        def on_editing_finished():
+        def on_file_updated():
             """Source the new config when editing finished.
 
             This can't use cmdexc.CommandError as it's run async.
@@ -265,7 +265,7 @@ class ConfigCommands:
 
         ed = editor.ExternalEditor(self._config)
         if not no_source:
-            ed.editing_finished.connect(on_editing_finished)
+            ed.file_updated.connect(on_file_updated)
 
         filename = os.path.join(standarddir.config(), 'config.py')
         ed.edit_file(filename)
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 26ba802c0..6689d3bf5 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -193,7 +193,7 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             if run:
                 self.command_accept()
 
-        ed.editing_finished.connect(callback)
+        ed.file_updated.connect(callback)
         ed.edit(self.text())
 
     @pyqtSlot(usertypes.KeyMode)
diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 53067ca2c..f300bc2e1 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -43,7 +43,7 @@ class ExternalEditor(QObject):
         _watcher: A QFileSystemWatcher to watch the edited file for changes.
     """
 
-    editing_finished = pyqtSignal(str)
+    file_updated = pyqtSignal(str)
 
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -128,7 +128,7 @@ class ExternalEditor(QObject):
             message.error("Failed to read back edited file: {}".format(e))
             return
         log.procs.debug("Read back: {}".format(text))
-        self.editing_finished.emit(text)
+        self.file_updated.emit(text)
 
     def edit_file(self, filename):
         """Edit the file with the given filename."""
diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 55425a1c4..b0ddbff25 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -173,7 +173,7 @@ def test_modify(qtbot, editor, initial_text, edited_text):
     with open(editor._filename, 'r', encoding='utf-8') as f:
         assert f.read() == initial_text
 
-    with qtbot.wait_signal(editor.editing_finished) as blocker:
+    with qtbot.wait_signal(editor.file_updated) as blocker:
         with open(editor._filename, 'w', encoding='utf-8') as f:
             f.write(edited_text)
 

From 2e5595b5c6868f22e820eea12900821601aa9061 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Fri, 29 Dec 2017 22:07:37 -0500
Subject: [PATCH 123/229] Update test_configcommands for new editor behavior.

Now that the editor signals on save, the configcommands editing
unittests need to emit the signal in the patch rather than relying on
on_proc_closed to emit the signal.
---
 tests/unit/config/test_configcommands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index 92796e8e5..a376e19b9 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -330,7 +330,7 @@ class TestEdit:
             def _write_file(editor_self):
                 with open(editor_self._filename, 'w', encoding='utf-8') as f:
                     f.write(text)
-                editor_self.on_proc_closed(0, QProcess.NormalExit)
+                editor_self.file_updated.emit(text)
 
             return mocker.patch('qutebrowser.config.configcommands.editor.'
                                 'ExternalEditor._start_editor', autospec=True,

From 7c33ff4046c6566038bb61d7007291b2d1538d3b Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Wed, 24 Jan 2018 07:40:34 -0500
Subject: [PATCH 124/229] Fix flaky editor test.

Give the process time to write its PID before trying to interrupt it.
---
 tests/end2end/features/test_editor_bdd.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index 18551271b..e2415da46 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -22,6 +22,7 @@ import json
 import textwrap
 import os
 import signal
+import time
 
 import pytest_bdd as bdd
 bdd.scenarios('editor.feature')
@@ -115,6 +116,11 @@ def kill_editor_wait(tmpdir):
 def save_editor_wait(tmpdir):
     """Trigger the waiting editor to write without exiting."""
     pidfile = tmpdir / 'editor_pid'
+    # give the "editor" process time to write its pid
+    for _ in range(10):
+        if pidfile.check():
+            break
+        time.sleep(1)
     pid = int(pidfile.read())
     # windows has no SIGUSR2, but we don't run this on windows anyways
     # for posix, there IS a member so we need to ignore useless-suppression

From 530a1859a331d49d67fa71509063b8cb384a5e4c Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Fri, 26 Jan 2018 11:12:07 -0500
Subject: [PATCH 125/229] Trigger editor signal on exit if content changed.

With the previous code, the editor could miss the final signal on a
save-and-exit. This is avoided by always running the file changed
handler on a successful exit, but only firing the signal if the content
actually changed (to avoid double-signalling).
---
 qutebrowser/misc/editor.py     |  8 +++++++-
 tests/unit/misc/test_editor.py | 26 +++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index f300bc2e1..6752a37e3 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -51,6 +51,7 @@ class ExternalEditor(QObject):
         self._proc = None
         self._remove_file = None
         self._watcher = QFileSystemWatcher(parent=self)
+        self._content = None
 
     def _cleanup(self):
         """Clean up temporary files after the editor closed."""
@@ -79,6 +80,8 @@ class ExternalEditor(QObject):
             # No error/cleanup here, since we already handle this in
             # on_proc_error.
             return
+        # do a final read to make sure we don't miss the last signal
+        self._on_file_changed(self._filename)
         self._cleanup()
 
     @pyqtSlot(QProcess.ProcessError)
@@ -128,7 +131,10 @@ class ExternalEditor(QObject):
             message.error("Failed to read back edited file: {}".format(e))
             return
         log.procs.debug("Read back: {}".format(text))
-        self.file_updated.emit(text)
+        if self._content != text:
+            self._content = text
+            self.file_updated.emit(text)
+
 
     def edit_file(self, filename):
         """Edit the file with the given filename."""
diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index b0ddbff25..3f7d8acaf 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -129,10 +129,7 @@ class TestFileHandling:
             pytest.skip("File was still readable")
 
         with caplog.at_level(logging.ERROR):
-            with qtbot.wait_signal(editor._watcher.fileChanged):
-                with open(filename, 'w', encoding='utf-8') as f:
-                    f.write('unreadable')
-        editor._proc.finished.emit(0, QProcess.NormalExit)
+            editor._proc.finished.emit(0, QProcess.NormalExit)
         assert not os.path.exists(filename)
         msg = message_mock.getmsg(usertypes.MessageLevel.error)
         assert msg.text.startswith("Failed to read back edited file: ")
@@ -177,11 +174,30 @@ def test_modify(qtbot, editor, initial_text, edited_text):
         with open(editor._filename, 'w', encoding='utf-8') as f:
             f.write(edited_text)
 
-    editor._proc.finished.emit(0, QProcess.NormalExit)
+    with qtbot.assert_not_emitted(editor.file_updated):
+        editor._proc.finished.emit(0, QProcess.NormalExit)
 
     assert blocker.args == [edited_text]
 
 
+def test_modify_multiple(qtbot, editor):
+    """Test that multiple saves all trigger file_updated."""
+    editor.edit('foo')
+
+    with qtbot.wait_signal(editor.file_updated) as blocker:
+        with open(editor._filename, 'w', encoding='utf-8') as f:
+            f.write('bar')
+    assert blocker.args == ['bar']
+
+    with qtbot.wait_signal(editor.file_updated) as blocker:
+        with open(editor._filename, 'w', encoding='utf-8') as f:
+            f.write('baz')
+    assert blocker.args == ['baz']
+
+    with qtbot.assert_not_emitted(editor.file_updated):
+        editor._proc.finished.emit(0, QProcess.NormalExit)
+
+
 @pytest.mark.parametrize('text, caret_position, result', [
     ('', 0, (1, 1)),
     ('a', 0, (1, 1)),

From d01a0b1d64a4178c20133a77954eff8b84d4d7f9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 28 Jan 2018 13:05:49 +0100
Subject: [PATCH 126/229] Fix :bookmark-add with no URL

---
 doc/changelog.asciidoc          | 2 ++
 doc/help/commands.asciidoc      | 3 ++-
 qutebrowser/browser/commands.py | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index c9cb327b3..7f22dc694 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -51,6 +51,8 @@ Fixed
 - QtWebKit: `:view-source` now displays a valid URL.
 - URLs containing ampersands and other special chars are now shown
   correctly when filtering them in the completion.
+- `:bookmark-add "" foo` can now be used to save the current URL with a custom
+  title.
 
 v1.1.1
 ------
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 1b65dbdd7..a87dc2304 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -176,7 +176,8 @@ Save the current page as a bookmark, or a specific url.
 If no url and title are provided, then save the current page as a bookmark. If a url and title have been provided, then save the given url as a bookmark with the provided title. You can view all saved bookmarks on the link:qute://bookmarks[bookmarks page].
 
 ==== positional arguments
-* +'url'+: url to save as a bookmark. If None, use url of current page.
+* +'url'+: url to save as a bookmark. If not given, use url of current page.
+
 * +'title'+: title of the new bookmark.
 
 ==== optional arguments
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index fdd552b32..a0c5e63ff 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1349,7 +1349,8 @@ class CommandDispatcher:
         link:qute://bookmarks[bookmarks page].
 
         Args:
-            url: url to save as a bookmark. If None, use url of current page.
+            url: url to save as a bookmark. If not given, use url of current
+                 page.
             title: title of the new bookmark.
             toggle: remove the bookmark instead of raising an error if it
                     already exists.
@@ -1358,7 +1359,7 @@ class CommandDispatcher:
             raise cmdexc.CommandError('Title must be provided if url has '
                                       'been provided')
         bookmark_manager = objreg.get('bookmark-manager')
-        if url is None:
+        if not url:
             url = self._current_url()
         else:
             try:

From e9023ce2336cc68cce084893534ff2a27f995322 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Mon, 29 Jan 2018 07:50:32 -0500
Subject: [PATCH 127/229] Remove newline in editor.py

---
 qutebrowser/misc/editor.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 6752a37e3..70bd4e68a 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -135,7 +135,6 @@ class ExternalEditor(QObject):
             self._content = text
             self.file_updated.emit(text)
 
-
     def edit_file(self, filename):
         """Edit the file with the given filename."""
         self._filename = filename

From 400e1bc7d797c60486a4c97cb86ad512973982da Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 30 Jan 2018 07:11:48 +0100
Subject: [PATCH 128/229] Show tab titles as tooltip

Closes #3535
---
 doc/changelog.asciidoc              | 1 +
 qutebrowser/mainwindow/tabwidget.py | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 7f22dc694..edc5523ba 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -41,6 +41,7 @@ Changed
   a performance and stability improvement.
 - The `url.incdec_segments` option now also can take `port` as possible segment.
 - QtWebEngine: `:view-source` now uses Chromium's `view-source:` scheme.
+- Tabs now show their full title as tooltip.
 
 Fixed
 ~~~~~
diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index 28cfac0fb..ac3a34581 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -148,7 +148,10 @@ class TabWidget(QTabWidget):
         fields['index'] = idx + 1
 
         title = '' if fmt is None else fmt.format(**fields)
-        self.tabBar().setTabText(idx, title)
+        tabbar = self.tabBar()
+
+        tabbar.setTabText(idx, title)
+        tabbar.setTabToolTip(idx, title)
 
     def get_tab_fields(self, idx):
         """Get the tab field data."""

From b55ae02eda3c02cbcbea546d6f5cb5b52c260a60 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Tue, 30 Jan 2018 09:48:52 -0500
Subject: [PATCH 129/229] document proxy environment variable for system proxy

---
 qutebrowser/browser/network/proxy.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py
index 2821a840d..9a1f80ae8 100644
--- a/qutebrowser/browser/network/proxy.py
+++ b/qutebrowser/browser/network/proxy.py
@@ -61,6 +61,8 @@ class ProxyFactory(QNetworkProxyFactory):
         """
         proxy = config.val.content.proxy
         if proxy is configtypes.SYSTEM_PROXY:
+            # On Linux, use "export http_proxy=socks5://host:port" to manually set system proxy
+            # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery
             proxies = QNetworkProxyFactory.systemProxyForQuery(query)
         elif isinstance(proxy, pac.PACFetcher):
             proxies = proxy.resolve(query)

From d8510e61aa1b68075b5d81d19fa87124b00c4bd6 Mon Sep 17 00:00:00 2001
From: lufte <javierayres@gmail.com>
Date: Tue, 30 Jan 2018 19:26:45 -0300
Subject: [PATCH 130/229] Use the instance attribute instead of querying the
 registry

---
 qutebrowser/mainwindow/mainwindow.py | 37 ++++++++++++++++------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index a5faf6dd1..6774a03af 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -429,7 +429,6 @@ class MainWindow(QWidget):
         status = self._get_object('statusbar')
         keyparsers = self._get_object('keyparsers')
         completion_obj = self._get_object('completion')
-        tabs = self._get_object('tabbed-browser')
         cmd = self._get_object('status-command')
         message_bridge = self._get_object('message-bridge')
         mode_manager = self._get_object('mode-manager')
@@ -449,7 +448,7 @@ class MainWindow(QWidget):
             status.keystring.setText)
         cmd.got_cmd[str].connect(self._commandrunner.run_safely)
         cmd.got_cmd[str, int].connect(self._commandrunner.run_safely)
-        cmd.returnPressed.connect(tabs.on_cmd_return_pressed)
+        cmd.returnPressed.connect(self.tabbed_browser.on_cmd_return_pressed)
 
         # key hint popup
         for mode, parser in keyparsers.items():
@@ -467,25 +466,31 @@ class MainWindow(QWidget):
         message_bridge.s_maybe_reset_text.connect(status.txt.maybe_reset_text)
 
         # statusbar
-        tabs.current_tab_changed.connect(status.on_tab_changed)
+        self.tabbed_browser.current_tab_changed.connect(status.on_tab_changed)
 
-        tabs.cur_progress.connect(status.prog.setValue)
-        tabs.cur_load_finished.connect(status.prog.hide)
-        tabs.cur_load_started.connect(status.prog.on_load_started)
+        self.tabbed_browser.cur_progress.connect(status.prog.setValue)
+        self.tabbed_browser.cur_load_finished.connect(status.prog.hide)
+        self.tabbed_browser.cur_load_started.connect(
+            status.prog.on_load_started)
 
-        tabs.cur_scroll_perc_changed.connect(status.percentage.set_perc)
-        tabs.tab_index_changed.connect(status.tabindex.on_tab_index_changed)
+        self.tabbed_browser.cur_scroll_perc_changed.connect(
+            status.percentage.set_perc)
+        self.tabbed_browser.tab_index_changed.connect(
+            status.tabindex.on_tab_index_changed)
 
-        tabs.cur_url_changed.connect(status.url.set_url)
-        tabs.cur_url_changed.connect(functools.partial(
-            status.backforward.on_tab_cur_url_changed, tabs=tabs))
-        tabs.cur_link_hovered.connect(status.url.set_hover_url)
-        tabs.cur_load_status_changed.connect(status.url.on_load_status_changed)
-        tabs.cur_fullscreen_requested.connect(self._on_fullscreen_requested)
-        tabs.cur_fullscreen_requested.connect(status.maybe_hide)
+        self.tabbed_browser.cur_url_changed.connect(status.url.set_url)
+        self.tabbed_browser.cur_url_changed.connect(functools.partial(
+            status.backforward.on_tab_cur_url_changed,
+            tabs=self.tabbed_browser))
+        self.tabbed_browser.cur_link_hovered.connect(status.url.set_hover_url)
+        self.tabbed_browser.cur_load_status_changed.connect(
+            status.url.on_load_status_changed)
+        self.tabbed_browser.cur_fullscreen_requested.connect(
+            self._on_fullscreen_requested)
+        self.tabbed_browser.cur_fullscreen_requested.connect(status.maybe_hide)
 
         # command input / completion
-        mode_manager.left.connect(tabs.on_mode_left)
+        mode_manager.left.connect(self.tabbed_browser.on_mode_left)
         cmd.clear_completion_selection.connect(
             completion_obj.on_clear_completion_selection)
         cmd.hide_completion.connect(completion_obj.hide)

From 532205aafa4b842b632fb62653c44a3fcc8281cf Mon Sep 17 00:00:00 2001
From: Knowlege <jakov.manjkas@gmail.com>
Date: Tue, 30 Jan 2018 23:29:02 +0100
Subject: [PATCH 131/229] Updated PyYaml link

---
 README.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.asciidoc b/README.asciidoc
index a625f317c..aed2f61e2 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -114,7 +114,7 @@ The following software and libraries are required to run qutebrowser:
 * http://fdik.org/pyPEG/[pyPEG2]
 * http://jinja.pocoo.org/[jinja2]
 * http://pygments.org/[pygments]
-* http://pyyaml.org/wiki/PyYAML[PyYAML]
+* https://github.com/yaml/pyyaml[PyYAML]
 * http://www.attrs.org/[attrs]
 
 The following libraries are optional:

From 79935e048c2a56402cdc43afb48fd4f94fb2dd46 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 31 Jan 2018 22:35:03 +0100
Subject: [PATCH 132/229] Break long line

---
 qutebrowser/browser/network/proxy.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py
index 9a1f80ae8..9a4999ef2 100644
--- a/qutebrowser/browser/network/proxy.py
+++ b/qutebrowser/browser/network/proxy.py
@@ -61,7 +61,8 @@ class ProxyFactory(QNetworkProxyFactory):
         """
         proxy = config.val.content.proxy
         if proxy is configtypes.SYSTEM_PROXY:
-            # On Linux, use "export http_proxy=socks5://host:port" to manually set system proxy
+            # On Linux, use "export http_proxy=socks5://host:port" to manually
+            # set system proxy.
             # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery
             proxies = QNetworkProxyFactory.systemProxyForQuery(query)
         elif isinstance(proxy, pac.PACFetcher):

From def2920a3516cec1539a4221a8ed233f408cebca Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Wed, 31 Jan 2018 18:05:14 -0500
Subject: [PATCH 133/229] fix line length

---
 qutebrowser/browser/network/proxy.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py
index 9a1f80ae8..cefb5d179 100644
--- a/qutebrowser/browser/network/proxy.py
+++ b/qutebrowser/browser/network/proxy.py
@@ -61,8 +61,10 @@ class ProxyFactory(QNetworkProxyFactory):
         """
         proxy = config.val.content.proxy
         if proxy is configtypes.SYSTEM_PROXY:
-            # On Linux, use "export http_proxy=socks5://host:port" to manually set system proxy
-            # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery
+            # On Linux, use "export http_proxy=socks5://host:port"
+            #   to manually set system proxy.
+            # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html
+            #   look under the systemProxyForQuery() call
             proxies = QNetworkProxyFactory.systemProxyForQuery(query)
         elif isinstance(proxy, pac.PACFetcher):
             proxies = proxy.resolve(query)

From 132095c98c5521ed637ef8eaef1e2b5e87bdeb30 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Wed, 31 Jan 2018 18:05:23 -0500
Subject: [PATCH 134/229] only open the tab for output once the job has
 finished running

---
 qutebrowser/browser/commands.py     | 21 +++++++++++++--------
 qutebrowser/commands/userscripts.py |  1 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index a0c5e63ff..3619affc5 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1217,10 +1217,18 @@ class CommandDispatcher:
 
         log.procs.debug("Executing {} with args {}, userscript={}".format(
             cmd, args, userscript))
+
+        def _on_proc_finished():
+            if output:
+                tb = objreg.get('tabbed-browser', scope='window',
+                                window='last-focused')
+                tb.openurl(QUrl('qute://spawn-output'), newtab=True)
+
         if userscript:
             def _selection_callback(s):
                 try:
-                    self._run_userscript(s, cmd, args, verbose)
+                    runner = self._run_userscript(s, cmd, args, verbose)
+                    runner.finished.connect(_on_proc_finished)
                 except cmdexc.CommandError as e:
                     message.error(str(e))
 
@@ -1239,11 +1247,7 @@ class CommandDispatcher:
                 proc.start_detached(cmd, args)
             else:
                 proc.start(cmd, args)
-
-        if output:
-            tabbed_browser = objreg.get('tabbed-browser', scope='window',
-                                        window='last-focused')
-            tabbed_browser.openurl(QUrl('qute://spawn-output'), newtab=True)
+            proc.finished.connect(_on_proc_finished)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def home(self):
@@ -1284,10 +1288,11 @@ class CommandDispatcher:
             env['QUTE_URL'] = url.toString(QUrl.FullyEncoded)
 
         try:
-            userscripts.run_async(tab, cmd, *args, win_id=self._win_id,
-                                  env=env, verbose=verbose)
+            runner = userscripts.run_async(
+                tab, cmd, *args, win_id=self._win_id, env=env, verbose=verbose)
         except userscripts.Error as e:
             raise cmdexc.CommandError(e)
+        return runner
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def quickmark_save(self):
diff --git a/qutebrowser/commands/userscripts.py b/qutebrowser/commands/userscripts.py
index d86cb8ccf..fc6443eb3 100644
--- a/qutebrowser/commands/userscripts.py
+++ b/qutebrowser/commands/userscripts.py
@@ -446,3 +446,4 @@ def run_async(tab, cmd, *args, win_id, env, verbose=False):
     runner.prepare_run(cmd_path, *args, env=env, verbose=verbose)
     tab.dump_async(runner.store_html)
     tab.dump_async(runner.store_text, plain=True)
+    return runner

From eab9b70f2826abd8f0b7668196d0807b3988852f Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Thu, 1 Feb 2018 20:43:35 -0500
Subject: [PATCH 135/229] Fix pylint for editor.py.

Notate unused parameter.
---
 qutebrowser/misc/editor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 70bd4e68a..b6707f886 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -70,7 +70,7 @@ class ExternalEditor(QObject):
             message.error("Failed to delete tempfile... ({})".format(e))
 
     @pyqtSlot(int, QProcess.ExitStatus)
-    def on_proc_closed(self, exitcode, exitstatus):
+    def on_proc_closed(self, _exitcode, exitstatus):
         """Write the editor text into the form field and clean up tempfile.
 
         Callback for QProcess when the editor was closed.

From 0aefffce4dab9afd99c278558af605d626441ca8 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Thu, 1 Feb 2018 20:55:18 -0500
Subject: [PATCH 136/229] Attempt to solve flaky editor tests.

These are passing locally but failing in travis. This fixes two possible
timing issues:

- Ensure the signals are set up befor the pidfile is written. The
  function that sends the signal waits for the pidfile to exist, so this
  ensures we don't miss a signal.
- Wait for the log message indicating that the editor file was read
  back, so the test doesn't run through before we get a chance to read
  from the editor.
---
 tests/end2end/features/editor.feature     | 1 +
 tests/end2end/features/test_editor_bdd.py | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/end2end/features/editor.feature b/tests/end2end/features/editor.feature
index 489fc7200..391e88749 100644
--- a/tests/end2end/features/editor.feature
+++ b/tests/end2end/features/editor.feature
@@ -138,6 +138,7 @@ Feature: Opening external editors
         And I wait for "Entering mode KeyMode.insert (reason: clicking input)" in the log
         And I run :open-editor
         And I save without exiting the editor
+        And I wait for "Read back: foobar" in the log
         And I run :click-element id qute-button
         Then the javascript message "text: foobar" should be logged
 
diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index e2415da46..4e480b85d 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -90,11 +90,12 @@ def set_up_editor_wait(quteproc, tmpdir, text):
             if sig == signal.SIGUSR1:
                 sys.exit(0)
 
+        signal.signal(signal.SIGUSR1, handle)
+        signal.signal(signal.SIGUSR2, handle)
+
         with open(r'{pidfile}', 'w') as f:
             f.write(str(os.getpid()))
 
-        signal.signal(signal.SIGUSR1, handle)
-        signal.signal(signal.SIGUSR2, handle)
         time.sleep(100)
     """.format(pidfile=pidfile, text=text)))
     editor = json.dumps([sys.executable, str(script), '{}'])

From ceab4a4c1f6f650089d6d4267d67fb6094d506ef Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sat, 3 Feb 2018 08:12:45 -0500
Subject: [PATCH 137/229] Fix pylint warnings

---
 qutebrowser/misc/editor.py               | 2 +-
 tests/unit/config/test_configcommands.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index b6707f886..b9a3ed97f 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -23,7 +23,7 @@ import os
 import tempfile
 
 from PyQt5.QtCore import (pyqtSignal, pyqtSlot, QObject, QProcess,
-    QFileSystemWatcher)
+                          QFileSystemWatcher)
 
 from qutebrowser.config import config
 from qutebrowser.utils import message, log
diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index a376e19b9..1f1637ed3 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -22,7 +22,7 @@ import logging
 import unittest.mock
 
 import pytest
-from PyQt5.QtCore import QUrl, QProcess
+from PyQt5.QtCore import QUrl
 
 from qutebrowser.config import configcommands
 from qutebrowser.commands import cmdexc

From d7a436568ccad55e37bac2c93e2d9e485b7f7522 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sat, 3 Feb 2018 14:31:44 -0500
Subject: [PATCH 138/229] Add a new --no-last flag to :tab-focus

--no-last prevents going to the last focused tab if a new tab does not
need to be focused.
---
 doc/help/commands.asciidoc      | 15 +++++++--------
 qutebrowser/browser/commands.py |  6 ++++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index a87dc2304..82c714cdf 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -519,8 +519,7 @@ Show help about a command or setting.
 
 [[hint]]
 === hint
-Syntax: +:hint [*--mode* 'mode'] [*--add-history*] [*--rapid*]
-     ['group'] ['target'] ['args' ['args' ...]]+
+Syntax: +:hint [*--mode* 'mode'] [*--add-history*] [*--rapid*] ['group'] ['target'] ['args' ['args' ...]]+
 
 Start hinting.
 
@@ -770,8 +769,7 @@ Do nothing.
 
 [[open]]
 === open
-Syntax: +:open [*--related*] [*--bg*] [*--tab*] [*--window*] [*--secure*] [*--private*]
-     ['url']+
+Syntax: +:open [*--related*] [*--bg*] [*--tab*] [*--window*] [*--secure*] [*--private*] ['url']+
 
 Open a URL in the current/[count]th tab.
 
@@ -1091,9 +1089,7 @@ Load a session.
 
 [[session-save]]
 === session-save
-Syntax: +:session-save [*--current*] [*--quiet*] [*--force*] [*--only-active-window*]
-             [*--with-private*]
-             ['name']+
+Syntax: +:session-save [*--current*] [*--quiet*] [*--force*] [*--only-active-window*] [*--with-private*] ['name']+
 
 Save a session.
 
@@ -1212,7 +1208,7 @@ The tab index to close
 
 [[tab-focus]]
 === tab-focus
-Syntax: +:tab-focus ['index']+
+Syntax: +:tab-focus [*--no-last*] ['index']+
 
 Select the tab given as argument/[count].
 
@@ -1224,6 +1220,9 @@ If neither count nor index are given, it behaves like tab-next. If both are give
  last tab.
 
 
+==== optional arguments
+* +*-n*+, +*--no-last*+: Whether to avoid focusing last tab if already focused.
+
 ==== count
 The tab index to focus, starting with 1.
 
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index a0c5e63ff..81835e422 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1109,7 +1109,8 @@ class CommandDispatcher:
     @cmdutils.register(instance='command-dispatcher', scope='window')
     @cmdutils.argument('index', choices=['last'])
     @cmdutils.argument('count', count=True)
-    def tab_focus(self, index: typing.Union[str, int] = None, count=None):
+    def tab_focus(self, index: typing.Union[str, int] = None,
+                  count=None, no_last=False):
         """Select the tab given as argument/[count].
 
         If neither count nor index are given, it behaves like tab-next.
@@ -1121,13 +1122,14 @@ class CommandDispatcher:
                    Negative indices count from the end, such that -1 is the
                    last tab.
             count: The tab index to focus, starting with 1.
+            no_last: Whether to avoid focusing last tab if already focused.
         """
         index = count if count is not None else index
 
         if index == 'last':
             self._tab_focus_last()
             return
-        elif index == self._current_index() + 1:
+        elif not no_last and index == self._current_index() + 1:
             self._tab_focus_last(show_error=False)
             return
         elif index is None:

From 989e60b01fe0b5c2d2e49c35450e751c7ca3217c Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 3 Feb 2018 19:10:19 -0500
Subject: [PATCH 139/229] Revert "fix line length"

This reverts commit def2920a3516cec1539a4221a8ed233f408cebca.
---
 qutebrowser/browser/network/proxy.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py
index cefb5d179..9a1f80ae8 100644
--- a/qutebrowser/browser/network/proxy.py
+++ b/qutebrowser/browser/network/proxy.py
@@ -61,10 +61,8 @@ class ProxyFactory(QNetworkProxyFactory):
         """
         proxy = config.val.content.proxy
         if proxy is configtypes.SYSTEM_PROXY:
-            # On Linux, use "export http_proxy=socks5://host:port"
-            #   to manually set system proxy.
-            # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html
-            #   look under the systemProxyForQuery() call
+            # On Linux, use "export http_proxy=socks5://host:port" to manually set system proxy
+            # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery
             proxies = QNetworkProxyFactory.systemProxyForQuery(query)
         elif isinstance(proxy, pac.PACFetcher):
             proxies = proxy.resolve(query)

From 833df95485e9cf9516d7869315808e55bcc3a16d Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sat, 3 Feb 2018 08:27:36 -0500
Subject: [PATCH 140/229] Only detect save for open-editor and config-edit.

Scope down the new trigger-on-save behavior to only open-editor and
config-edit. Other uses of the editor such as edit-url and edit-command
will behave as before.
---
 qutebrowser/browser/commands.py      |  2 +-
 qutebrowser/config/configcommands.py |  2 +-
 qutebrowser/misc/editor.py           | 16 +++++++++++-----
 tests/unit/misc/test_editor.py       | 12 ++++++------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 55af2c50a..094563bcc 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1621,7 +1621,7 @@ class CommandDispatcher:
 
         caret_position = elem.caret_position()
 
-        ed = editor.ExternalEditor(self._tabbed_browser)
+        ed = editor.ExternalEditor(watch=True, parent=self._tabbed_browser)
         ed.file_updated.connect(functools.partial(
             self.on_file_updated, elem))
         ed.edit(text, caret_position)
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index faf31d718..1a07b2020 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -263,7 +263,7 @@ class ConfigCommands:
             except configexc.ConfigFileErrors as e:
                 message.error(str(e))
 
-        ed = editor.ExternalEditor(self._config)
+        ed = editor.ExternalEditor(watch=True, parent=self._config)
         if not no_source:
             ed.file_updated.connect(on_file_updated)
 
diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index b9a3ed97f..9565ce28b 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -41,22 +41,27 @@ class ExternalEditor(QObject):
                       closed.
         _proc: The GUIProcess of the editor.
         _watcher: A QFileSystemWatcher to watch the edited file for changes.
+                  Only set if watch=True.
     """
 
     file_updated = pyqtSignal(str)
 
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, watch=False):
         super().__init__(parent)
         self._filename = None
         self._proc = None
         self._remove_file = None
-        self._watcher = QFileSystemWatcher(parent=self)
+        if watch:
+            self._watcher = QFileSystemWatcher(parent=self)
+        else:
+            self._watcher = None
         self._content = None
 
     def _cleanup(self):
         """Clean up temporary files after the editor closed."""
         assert self._remove_file is not None
-        self._watcher.removePaths(self._watcher.files())
+        if self._watcher:
+            self._watcher.removePaths(self._watcher.files())
         if self._filename is None or not self._remove_file:
             # Could not create initial file.
             return
@@ -154,8 +159,9 @@ class ExternalEditor(QObject):
         editor = config.val.editor.command
         executable = editor[0]
 
-        self._watcher.addPath(self._filename)
-        self._watcher.fileChanged.connect(self._on_file_changed)
+        if self._watcher:
+            self._watcher.addPath(self._filename)
+            self._watcher.fileChanged.connect(self._on_file_changed)
 
         args = [self._sub_placeholder(arg, line, column) for arg in editor[1:]]
         log.procs.debug("Calling \"{}\" with args {}".format(executable, args))
diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 3f7d8acaf..37506d923 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -170,18 +170,18 @@ def test_modify(qtbot, editor, initial_text, edited_text):
     with open(editor._filename, 'r', encoding='utf-8') as f:
         assert f.read() == initial_text
 
-    with qtbot.wait_signal(editor.file_updated) as blocker:
-        with open(editor._filename, 'w', encoding='utf-8') as f:
-            f.write(edited_text)
+    with open(editor._filename, 'w', encoding='utf-8') as f:
+        f.write(edited_text)
 
-    with qtbot.assert_not_emitted(editor.file_updated):
+    with qtbot.wait_signal(editor.file_updated) as blocker:
         editor._proc.finished.emit(0, QProcess.NormalExit)
 
     assert blocker.args == [edited_text]
 
 
-def test_modify_multiple(qtbot, editor):
-    """Test that multiple saves all trigger file_updated."""
+def test_modify_watch(qtbot):
+    """Test that saving triggers file_updated when watch=True."""
+    editor = editormod.ExternalEditor(watch=True)
     editor.edit('foo')
 
     with qtbot.wait_signal(editor.file_updated) as blocker:

From a8733d7228f47ee7f24982deb68934902992f2f4 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 4 Feb 2018 07:02:25 -0500
Subject: [PATCH 141/229] Increase timeout in test_editor.

The test with watch=True was failing on the Travis OSX environment
becausee it was timing out before the file_updated signal was fired.
---
 tests/unit/misc/test_editor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 37506d923..58f6edae7 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -184,7 +184,7 @@ def test_modify_watch(qtbot):
     editor = editormod.ExternalEditor(watch=True)
     editor.edit('foo')
 
-    with qtbot.wait_signal(editor.file_updated) as blocker:
+    with qtbot.wait_signal(editor.file_updated, timeout=3000) as blocker:
         with open(editor._filename, 'w', encoding='utf-8') as f:
             f.write('bar')
     assert blocker.args == ['bar']

From 0ebde6f2e9cdb0eb087bfea7ba225e02ec7840de Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sun, 4 Feb 2018 02:11:34 -0500
Subject: [PATCH 142/229] Delete QWebEngineDownloadItem objects when wrapper
 object is deleted

---
 qutebrowser/browser/webengine/webenginedownloads.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py
index d467724d5..7dec2dd54 100644
--- a/qutebrowser/browser/webengine/webenginedownloads.py
+++ b/qutebrowser/browser/webengine/webenginedownloads.py
@@ -45,6 +45,10 @@ class DownloadItem(downloads.AbstractDownloadItem):
         qt_item.downloadProgress.connect(self.stats.on_download_progress)
         qt_item.stateChanged.connect(self._on_state_changed)
 
+        # Ensure wrapped qt_item is deleted manually when the wrapper object
+        # is deleted. See https://github.com/qutebrowser/qutebrowser/issues/3373
+        self.destroyed.connect(self._qt_item.deleteLater)
+
     def _is_page_download(self):
         """Check if this item is a page (i.e. mhtml) download."""
         return (self._qt_item.savePageFormat() !=

From c8de4675db14fad73389ad8805bf0fc571a469f0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 3 Feb 2018 19:08:42 +0100
Subject: [PATCH 143/229] Various spelling fixes

---
 doc/changelog.asciidoc                    | 4 ++--
 doc/contributing.asciidoc                 | 2 +-
 doc/help/configuring.asciidoc             | 2 +-
 doc/help/settings.asciidoc                | 2 +-
 doc/stacktrace.asciidoc                   | 2 +-
 qutebrowser/browser/greasemonkey.py       | 2 +-
 qutebrowser/commands/command.py           | 4 ++--
 qutebrowser/config/configdata.yml         | 2 +-
 qutebrowser/misc/backendproblem.py        | 2 +-
 qutebrowser/misc/savemanager.py           | 4 ++--
 qutebrowser/utils/version.py              | 6 +++---
 scripts/dev/misc_checks.py                | 2 +-
 tests/end2end/features/conftest.py        | 4 ++--
 tests/end2end/features/hints.feature      | 2 +-
 tests/end2end/features/utilcmds.feature   | 2 +-
 tests/end2end/fixtures/testprocess.py     | 2 +-
 tests/unit/mainwindow/test_messageview.py | 2 +-
 17 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index edc5523ba..8e943d2c7 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -1143,7 +1143,7 @@ Added
 - New `:fake-key` command to send a fake keypress to a website or to
   qutebrowser.
 - New `--mhtml` argument for `:download` to download a page including all
-  ressources as MHTML file.
+  resources as MHTML file.
 - New option `tabs -> title-alignment` to change the alignment of tab titles.
 
 Changed
@@ -1343,7 +1343,7 @@ Added
 - New argument `--no-err-windows` to suppress all error windows.
 - New arguments `--top-navigate` and `--bottom-navigate` (`-t`/`-b`) for `:scroll-page` to specify a navigation action (e.g. automatically go to the next page when arriving at the bottom).
 - New flag `-d`/`--detach` for `:spawn` to detach the spawned process so it's not closed when qutebrowser is.
-- New flag `-v`/`--verbose` for `:spawn` to print informations when the process started/exited successfully.
+- New flag `-v`/`--verbose` for `:spawn` to print information when the process started/exited successfully.
 - Many new color settings (foreground setting for every background setting).
 - New setting `ui -> modal-js-dialog` to use the standard modal dialogs for javascript questions instead of using the statusbar.
 - New setting `colors -> webpage.bg` to set the background color to use for websites which don't set one.
diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc
index afbb752c5..a75034b95 100644
--- a/doc/contributing.asciidoc
+++ b/doc/contributing.asciidoc
@@ -375,7 +375,7 @@ The following logging levels are available for every logger:
 |error     |There was an issue and some kind of operation was abandoned.
 |warning   |There was an issue but the operation can continue running.
 |info      |General informational messages.
-|debug     |Verbose debugging informations.
+|debug     |Verbose debugging information.
 |=======================================================================
 
 [[commands]]
diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc
index b801e8820..bb43e1dfe 100644
--- a/doc/help/configuring.asciidoc
+++ b/doc/help/configuring.asciidoc
@@ -254,7 +254,7 @@ Getting the config directory
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you need to get the qutebrowser config directory, you can do so by reading
-`config.configdir`. Similarily, you can get the qutebrowser data directory via
+`config.configdir`. Similarly, you can get the qutebrowser data directory via
 `config.datadir`.
 
 This gives you a https://docs.python.org/3/library/pathlib.html[`pathlib.Path`
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 67ede4fa8..c44dfb9a6 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -1580,7 +1580,7 @@ Default: +pass:[true]+
 [[content.headers.referer]]
 === content.headers.referer
 When to send the Referer header.
-The Referer header tells websites from which website you were coming from when visting them.
+The Referer header tells websites from which website you were coming from when visiting them.
 
 Type: <<types,String>>
 
diff --git a/doc/stacktrace.asciidoc b/doc/stacktrace.asciidoc
index 5505eca93..00c89e884 100644
--- a/doc/stacktrace.asciidoc
+++ b/doc/stacktrace.asciidoc
@@ -37,7 +37,7 @@ is available in the repositories:
 Archlinux
 ^^^^^^^^^
 
-For Archlinux, no debug informations are provided. You can either compile Qt
+For Archlinux, no debug information is provided. You can either compile Qt
 yourself (which will take a few hours even on a modern machine) or use
 debugging symbols compiled/packaged by me (x86_64 only).
 
diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 7ee843b0b..ba2879848 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -134,7 +134,7 @@ class GreasemonkeyManager(QObject):
     Signals:
         scripts_reloaded: Emitted when scripts are reloaded from disk.
             Any cached or already-injected scripts should be
-            considered obselete.
+            considered obsolete.
     """
 
     scripts_reloaded = pyqtSignal()
diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py
index b4ff1cde8..dd9a63101 100644
--- a/qutebrowser/commands/command.py
+++ b/qutebrowser/commands/command.py
@@ -193,10 +193,10 @@ class Command:
         return False
 
     def _inspect_func(self):
-        """Inspect the function to get useful informations from it.
+        """Inspect the function to get useful information from it.
 
         Sets instance attributes (desc, type_conv, name_conv) based on the
-        informations.
+        information.
 
         Return:
             How many user-visible arguments the command has.
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 2d99af729..e2daefe3b 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -360,7 +360,7 @@ content.headers.referer:
     When to send the Referer header.
 
     The Referer header tells websites from which website you were coming from
-    when visting them.
+    when visiting them.
 
 content.headers.user_agent:
   default: null
diff --git a/qutebrowser/misc/backendproblem.py b/qutebrowser/misc/backendproblem.py
index 8cc5b71b2..cf1024c57 100644
--- a/qutebrowser/misc/backendproblem.py
+++ b/qutebrowser/misc/backendproblem.py
@@ -191,7 +191,7 @@ def _handle_nouveau_graphics():
         text="<p>There are two ways to fix this:</p>"
              "<p><b>Forcing software rendering</b></p>"
              "<p>This allows you to use the newer QtWebEngine backend (based "
-             "on Chromium) but could have noticable performance impact "
+             "on Chromium) but could have noticeable performance impact "
              "(depending on your hardware). "
              "This sets the <i>qt.force_software_rendering = True</i> option "
              "(if you have a <i>config.py</i> file, you'll need to set this "
diff --git a/qutebrowser/misc/savemanager.py b/qutebrowser/misc/savemanager.py
index 02001902c..436e3b66f 100644
--- a/qutebrowser/misc/savemanager.py
+++ b/qutebrowser/misc/savemanager.py
@@ -77,7 +77,7 @@ class Saveable:
         Args:
             is_exit: Whether we're currently exiting qutebrowser.
             explicit: Whether the user explicitly requested this save.
-            silent: Don't write informations to log.
+            silent: Don't write information to log.
             force: Force saving, no matter what.
         """
         if (self._config_opt is not None and
@@ -157,7 +157,7 @@ class SaveManager(QObject):
         Args:
             is_exit: Whether we're currently exiting qutebrowser.
             explicit: Whether this save operation was triggered explicitly.
-            silent: Don't write informations to log. Used to reduce log spam
+            silent: Don't write information to log. Used to reduce log spam
                     when autosaving.
             force: Force saving, no matter what.
         """
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 47cbf6eff..624197bdd 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Utilities to show various version informations."""
+"""Utilities to show various version information."""
 
 import re
 import sys
@@ -167,7 +167,7 @@ def _git_str_subprocess(gitpath):
 
 
 def _release_info():
-    """Try to gather distribution release informations.
+    """Try to gather distribution release information.
 
     Return:
         list of (filename, content) tuples.
@@ -335,7 +335,7 @@ def _uptime() -> datetime.timedelta:
 
 
 def version():
-    """Return a string with various version informations."""
+    """Return a string with various version information."""
     lines = ["qutebrowser v{}".format(qutebrowser.__version__)]
     gitver = _git_str()
     if gitver is not None:
diff --git a/scripts/dev/misc_checks.py b/scripts/dev/misc_checks.py
index c04a35f1a..ff372a7ae 100644
--- a/scripts/dev/misc_checks.py
+++ b/scripts/dev/misc_checks.py
@@ -89,7 +89,7 @@ def check_spelling():
              '[Ww]ether', '[Pp]rogramatically', '[Ss]plitted', '[Ee]xitted',
              '[Mm]ininum', '[Rr]esett?ed', '[Rr]ecieved', '[Rr]egularily',
              '[Uu]nderlaying', '[Ii]nexistant', '[Ee]lipsis', 'commiting',
-             'existant', '[Rr]esetted'}
+             'existant', '[Rr]esetted', '[Ss]imilarily', '[Ii]nformations'}
 
     # Words which look better when splitted, but might need some fine tuning.
     words |= {'[Ww]ebelements', '[Mm]ouseevent', '[Kk]eysequence',
diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py
index 5b97ba2a4..228e80f06 100644
--- a/tests/end2end/features/conftest.py
+++ b/tests/end2end/features/conftest.py
@@ -63,7 +63,7 @@ def pytest_runtest_makereport(item, call):
     if (not hasattr(report.longrepr, 'addsection') or
             not hasattr(report, 'scenario')):
         # In some conditions (on macOS and Windows it seems), report.longrepr
-        # is actually a tuple. This is handled similarily in pytest-qt too.
+        # is actually a tuple. This is handled similarly in pytest-qt too.
         #
         # Since this hook is invoked for any test, we also need to skip it for
         # non-BDD ones.
@@ -389,7 +389,7 @@ def clear_ssl_errors(request, quteproc):
 def path_should_be_loaded(quteproc, path):
     """Make sure the given path was loaded according to the log.
 
-    This is usally the better check compared to "should be requested" as the
+    This is usually the better check compared to "should be requested" as the
     page could be loaded from local cache.
     """
     quteproc.wait_for_load_finished(path)
diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 0151a14ad..3c55c74b1 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -211,7 +211,7 @@ Feature: Using hints
         And I hint with args "links normal" and follow a
         Then "navigation request: url http://localhost:*/data/hello.txt, type NavigationTypeLinkClicked, *" should be logged
 
-    ### FIXME currenly skipped, see https://github.com/qutebrowser/qutebrowser/issues/1525
+    ### FIXME currently skipped, see https://github.com/qutebrowser/qutebrowser/issues/1525
     @xfail_norun
     Scenario: Using :follow-hint inside a scrolled iframe
         When I open data/hints/iframe_scroll.html
diff --git a/tests/end2end/features/utilcmds.feature b/tests/end2end/features/utilcmds.feature
index bff13d40e..5ccbac9b3 100644
--- a/tests/end2end/features/utilcmds.feature
+++ b/tests/end2end/features/utilcmds.feature
@@ -117,7 +117,7 @@ Feature: Miscellaneous utility commands exposed to the user.
         And the message "test2" should be shown
         And the message "test2" should be shown
 
-    Scenario: :repeat-command with not-normal command inbetween
+    Scenario: :repeat-command with not-normal command in between
         When I run :message-info test3
         And I run :prompt-accept
         And I run :repeat-command
diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index 3fb259e47..99ea81337 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -101,7 +101,7 @@ def pytest_runtest_makereport(item, call):
 
     if not hasattr(report.longrepr, 'addsection'):
         # In some conditions (on macOS and Windows it seems), report.longrepr
-        # is actually a tuple. This is handled similarily in pytest-qt too.
+        # is actually a tuple. This is handled similarly in pytest-qt too.
         return
 
     if item.config.getoption('--capture') == 'no':
diff --git a/tests/unit/mainwindow/test_messageview.py b/tests/unit/mainwindow/test_messageview.py
index 3a502b2bd..6c9d767c5 100644
--- a/tests/unit/mainwindow/test_messageview.py
+++ b/tests/unit/mainwindow/test_messageview.py
@@ -117,7 +117,7 @@ def test_replaced_messages(view, replace1, replace2, length):
     (Qt.BackButton, 2),
 ])
 def test_click_messages(qtbot, view, button, count):
-    """Messages should dissappear when we click on them."""
+    """Messages should disappear when we click on them."""
     view.show_message(usertypes.MessageLevel.info, 'test mouse click')
     view.show_message(usertypes.MessageLevel.info, 'test mouse click 2')
     qtbot.mousePress(view, button)

From 8dbf506916acbad384044cbc3215a75ce22d2166 Mon Sep 17 00:00:00 2001
From: seebye <seebye@users.noreply.github.com>
Date: Mon, 5 Feb 2018 01:20:56 +0100
Subject: [PATCH 144/229] Fix #3542 going back twice on lazy loading a tab

---
 qutebrowser/html/back.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/html/back.html b/qutebrowser/html/back.html
index 894427800..6128c41f7 100644
--- a/qutebrowser/html/back.html
+++ b/qutebrowser/html/back.html
@@ -27,7 +27,7 @@ function prepare_restore() {
 		return;
 	}
 
-	document.addEventListener("visibilitychange", go_back);
+	document.addEventListener("visibilitychange", go_back, {once: true});
 }
 
 // there are three states

From 6f028e9ad030f93cc504ee7a5d34bbfc0693489d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 5 Feb 2018 12:19:50 +0100
Subject: [PATCH 145/229] Update copyright years

---
 qutebrowser.py                                              | 2 +-
 qutebrowser/__init__.py                                     | 2 +-
 qutebrowser/__main__.py                                     | 2 +-
 qutebrowser/app.py                                          | 2 +-
 qutebrowser/browser/__init__.py                             | 2 +-
 qutebrowser/browser/adblock.py                              | 2 +-
 qutebrowser/browser/browsertab.py                           | 2 +-
 qutebrowser/browser/commands.py                             | 2 +-
 qutebrowser/browser/downloads.py                            | 2 +-
 qutebrowser/browser/downloadview.py                         | 2 +-
 qutebrowser/browser/greasemonkey.py                         | 2 +-
 qutebrowser/browser/hints.py                                | 2 +-
 qutebrowser/browser/history.py                              | 2 +-
 qutebrowser/browser/inspector.py                            | 2 +-
 qutebrowser/browser/mouse.py                                | 2 +-
 qutebrowser/browser/navigate.py                             | 2 +-
 qutebrowser/browser/network/pac.py                          | 2 +-
 qutebrowser/browser/network/proxy.py                        | 2 +-
 qutebrowser/browser/pdfjs.py                                | 2 +-
 qutebrowser/browser/qtnetworkdownloads.py                   | 2 +-
 qutebrowser/browser/qutescheme.py                           | 2 +-
 qutebrowser/browser/shared.py                               | 2 +-
 qutebrowser/browser/signalfilter.py                         | 2 +-
 qutebrowser/browser/urlmarks.py                             | 4 ++--
 qutebrowser/browser/webelem.py                              | 2 +-
 qutebrowser/browser/webengine/__init__.py                   | 2 +-
 qutebrowser/browser/webengine/certificateerror.py           | 2 +-
 qutebrowser/browser/webengine/interceptor.py                | 2 +-
 qutebrowser/browser/webengine/spell.py                      | 2 +-
 qutebrowser/browser/webengine/tabhistory.py                 | 2 +-
 qutebrowser/browser/webengine/webenginedownloads.py         | 2 +-
 qutebrowser/browser/webengine/webengineelem.py              | 2 +-
 qutebrowser/browser/webengine/webengineinspector.py         | 2 +-
 qutebrowser/browser/webengine/webenginequtescheme.py        | 2 +-
 qutebrowser/browser/webengine/webenginesettings.py          | 2 +-
 qutebrowser/browser/webengine/webenginetab.py               | 2 +-
 qutebrowser/browser/webengine/webview.py                    | 2 +-
 qutebrowser/browser/webkit/__init__.py                      | 2 +-
 qutebrowser/browser/webkit/cache.py                         | 2 +-
 qutebrowser/browser/webkit/certificateerror.py              | 2 +-
 qutebrowser/browser/webkit/cookies.py                       | 2 +-
 qutebrowser/browser/webkit/http.py                          | 2 +-
 qutebrowser/browser/webkit/mhtml.py                         | 2 +-
 qutebrowser/browser/webkit/network/filescheme.py            | 4 ++--
 qutebrowser/browser/webkit/network/networkmanager.py        | 2 +-
 qutebrowser/browser/webkit/network/networkreply.py          | 2 +-
 qutebrowser/browser/webkit/network/schemehandler.py         | 2 +-
 qutebrowser/browser/webkit/network/webkitqutescheme.py      | 2 +-
 qutebrowser/browser/webkit/rfc6266.py                       | 2 +-
 qutebrowser/browser/webkit/tabhistory.py                    | 2 +-
 qutebrowser/browser/webkit/webkitelem.py                    | 2 +-
 qutebrowser/browser/webkit/webkithistory.py                 | 2 +-
 qutebrowser/browser/webkit/webkitinspector.py               | 2 +-
 qutebrowser/browser/webkit/webkitsettings.py                | 2 +-
 qutebrowser/browser/webkit/webkittab.py                     | 2 +-
 qutebrowser/browser/webkit/webpage.py                       | 2 +-
 qutebrowser/browser/webkit/webview.py                       | 2 +-
 qutebrowser/commands/__init__.py                            | 2 +-
 qutebrowser/commands/argparser.py                           | 2 +-
 qutebrowser/commands/cmdexc.py                              | 2 +-
 qutebrowser/commands/cmdutils.py                            | 2 +-
 qutebrowser/commands/command.py                             | 2 +-
 qutebrowser/commands/runners.py                             | 2 +-
 qutebrowser/commands/userscripts.py                         | 2 +-
 qutebrowser/completion/__init__.py                          | 2 +-
 qutebrowser/completion/completer.py                         | 2 +-
 qutebrowser/completion/completiondelegate.py                | 2 +-
 qutebrowser/completion/completionwidget.py                  | 2 +-
 qutebrowser/completion/models/__init__.py                   | 2 +-
 qutebrowser/completion/models/completionmodel.py            | 2 +-
 qutebrowser/completion/models/configmodel.py                | 2 +-
 qutebrowser/completion/models/histcategory.py               | 2 +-
 qutebrowser/completion/models/listcategory.py               | 2 +-
 qutebrowser/completion/models/miscmodels.py                 | 2 +-
 qutebrowser/completion/models/urlmodel.py                   | 2 +-
 qutebrowser/completion/models/util.py                       | 2 +-
 qutebrowser/config/__init__.py                              | 2 +-
 qutebrowser/config/config.py                                | 2 +-
 qutebrowser/config/configcommands.py                        | 2 +-
 qutebrowser/config/configdata.py                            | 2 +-
 qutebrowser/config/configdiff.py                            | 2 +-
 qutebrowser/config/configexc.py                             | 2 +-
 qutebrowser/config/configfiles.py                           | 2 +-
 qutebrowser/config/configinit.py                            | 2 +-
 qutebrowser/config/configtypes.py                           | 2 +-
 qutebrowser/config/websettings.py                           | 2 +-
 qutebrowser/keyinput/__init__.py                            | 2 +-
 qutebrowser/keyinput/basekeyparser.py                       | 2 +-
 qutebrowser/keyinput/keyparser.py                           | 2 +-
 qutebrowser/keyinput/macros.py                              | 2 +-
 qutebrowser/keyinput/modeman.py                             | 2 +-
 qutebrowser/keyinput/modeparsers.py                         | 2 +-
 qutebrowser/mainwindow/__init__.py                          | 2 +-
 qutebrowser/mainwindow/mainwindow.py                        | 2 +-
 qutebrowser/mainwindow/messageview.py                       | 2 +-
 qutebrowser/mainwindow/prompt.py                            | 2 +-
 qutebrowser/mainwindow/statusbar/__init__.py                | 2 +-
 qutebrowser/mainwindow/statusbar/backforward.py             | 2 +-
 qutebrowser/mainwindow/statusbar/bar.py                     | 2 +-
 qutebrowser/mainwindow/statusbar/command.py                 | 2 +-
 qutebrowser/mainwindow/statusbar/keystring.py               | 2 +-
 qutebrowser/mainwindow/statusbar/percentage.py              | 2 +-
 qutebrowser/mainwindow/statusbar/progress.py                | 2 +-
 qutebrowser/mainwindow/statusbar/tabindex.py                | 2 +-
 qutebrowser/mainwindow/statusbar/text.py                    | 2 +-
 qutebrowser/mainwindow/statusbar/textbase.py                | 2 +-
 qutebrowser/mainwindow/statusbar/url.py                     | 2 +-
 qutebrowser/mainwindow/tabbedbrowser.py                     | 2 +-
 qutebrowser/mainwindow/tabwidget.py                         | 2 +-
 qutebrowser/misc/__init__.py                                | 2 +-
 qutebrowser/misc/autoupdate.py                              | 2 +-
 qutebrowser/misc/backendproblem.py                          | 2 +-
 qutebrowser/misc/checkpyver.py                              | 2 +-
 qutebrowser/misc/cmdhistory.py                              | 2 +-
 qutebrowser/misc/consolewidget.py                           | 2 +-
 qutebrowser/misc/crashdialog.py                             | 2 +-
 qutebrowser/misc/crashsignal.py                             | 2 +-
 qutebrowser/misc/earlyinit.py                               | 2 +-
 qutebrowser/misc/editor.py                                  | 2 +-
 qutebrowser/misc/guiprocess.py                              | 2 +-
 qutebrowser/misc/httpclient.py                              | 2 +-
 qutebrowser/misc/ipc.py                                     | 2 +-
 qutebrowser/misc/keyhintwidget.py                           | 2 +-
 qutebrowser/misc/lineparser.py                              | 2 +-
 qutebrowser/misc/miscwidgets.py                             | 2 +-
 qutebrowser/misc/msgbox.py                                  | 2 +-
 qutebrowser/misc/objects.py                                 | 2 +-
 qutebrowser/misc/pastebin.py                                | 2 +-
 qutebrowser/misc/readline.py                                | 2 +-
 qutebrowser/misc/savemanager.py                             | 2 +-
 qutebrowser/misc/sessions.py                                | 2 +-
 qutebrowser/misc/split.py                                   | 2 +-
 qutebrowser/misc/sql.py                                     | 2 +-
 qutebrowser/misc/utilcmds.py                                | 2 +-
 qutebrowser/qutebrowser.py                                  | 2 +-
 qutebrowser/utils/__init__.py                               | 2 +-
 qutebrowser/utils/debug.py                                  | 2 +-
 qutebrowser/utils/docutils.py                               | 2 +-
 qutebrowser/utils/error.py                                  | 2 +-
 qutebrowser/utils/javascript.py                             | 2 +-
 qutebrowser/utils/jinja.py                                  | 2 +-
 qutebrowser/utils/log.py                                    | 2 +-
 qutebrowser/utils/message.py                                | 2 +-
 qutebrowser/utils/objreg.py                                 | 2 +-
 qutebrowser/utils/qtutils.py                                | 2 +-
 qutebrowser/utils/standarddir.py                            | 2 +-
 qutebrowser/utils/urlutils.py                               | 2 +-
 qutebrowser/utils/usertypes.py                              | 2 +-
 qutebrowser/utils/utils.py                                  | 2 +-
 qutebrowser/utils/version.py                                | 2 +-
 scripts/asciidoc2html.py                                    | 2 +-
 scripts/dev/build_release.py                                | 2 +-
 scripts/dev/check_coverage.py                               | 2 +-
 scripts/dev/check_doc_changes.py                            | 2 +-
 scripts/dev/cleanup.py                                      | 2 +-
 scripts/dev/get_coredumpctl_traces.py                       | 2 +-
 scripts/dev/misc_checks.py                                  | 2 +-
 scripts/dev/pylint_checkers/qute_pylint/config.py           | 2 +-
 scripts/dev/pylint_checkers/qute_pylint/modeline.py         | 2 +-
 scripts/dev/pylint_checkers/qute_pylint/openencoding.py     | 2 +-
 scripts/dev/pylint_checkers/qute_pylint/settrace.py         | 2 +-
 scripts/dev/pylint_checkers/setup.py                        | 2 +-
 scripts/dev/recompile_requirements.py                       | 2 +-
 scripts/dev/run_profile.py                                  | 2 +-
 scripts/dev/run_pylint_on_tests.py                          | 2 +-
 scripts/dev/run_vulture.py                                  | 2 +-
 scripts/dev/segfault_test.py                                | 2 +-
 scripts/dev/src2asciidoc.py                                 | 2 +-
 scripts/dev/standardpaths_tester.py                         | 2 +-
 scripts/dev/ua_fetch.py                                     | 6 +++---
 scripts/dev/update_3rdparty.py                              | 2 +-
 scripts/dictcli.py                                          | 2 +-
 scripts/hist_importer.py                                    | 4 ++--
 scripts/importer.py                                         | 4 ++--
 scripts/keytester.py                                        | 2 +-
 scripts/link_pyqt.py                                        | 2 +-
 scripts/setupcommon.py                                      | 2 +-
 scripts/testbrowser/testbrowser_webengine.py                | 2 +-
 scripts/testbrowser/testbrowser_webkit.py                   | 2 +-
 scripts/utils.py                                            | 2 +-
 tests/conftest.py                                           | 2 +-
 tests/end2end/conftest.py                                   | 2 +-
 tests/end2end/data/misc/pyeval_file.py                      | 2 +-
 tests/end2end/data/userscripts/stdinclose.py                | 2 +-
 tests/end2end/features/conftest.py                          | 2 +-
 tests/end2end/features/test_backforward_bdd.py              | 2 +-
 tests/end2end/features/test_caret_bdd.py                    | 2 +-
 tests/end2end/features/test_completion_bdd.py               | 2 +-
 tests/end2end/features/test_downloads_bdd.py                | 2 +-
 tests/end2end/features/test_editor_bdd.py                   | 2 +-
 tests/end2end/features/test_hints_bdd.py                    | 2 +-
 tests/end2end/features/test_history_bdd.py                  | 2 +-
 tests/end2end/features/test_invoke_bdd.py                   | 2 +-
 tests/end2end/features/test_javascript_bdd.py               | 2 +-
 tests/end2end/features/test_keyinput_bdd.py                 | 2 +-
 tests/end2end/features/test_marks_bdd.py                    | 2 +-
 tests/end2end/features/test_misc_bdd.py                     | 2 +-
 tests/end2end/features/test_navigate_bdd.py                 | 2 +-
 tests/end2end/features/test_open_bdd.py                     | 2 +-
 tests/end2end/features/test_private_bdd.py                  | 2 +-
 tests/end2end/features/test_prompts_bdd.py                  | 2 +-
 tests/end2end/features/test_qutescheme_bdd.py               | 2 +-
 tests/end2end/features/test_scroll_bdd.py                   | 2 +-
 tests/end2end/features/test_search_bdd.py                   | 2 +-
 tests/end2end/features/test_sessions_bdd.py                 | 2 +-
 tests/end2end/features/test_spawn_bdd.py                    | 2 +-
 tests/end2end/features/test_tabs_bdd.py                     | 2 +-
 tests/end2end/features/test_urlmarks_bdd.py                 | 2 +-
 tests/end2end/features/test_utilcmds_bdd.py                 | 2 +-
 tests/end2end/features/test_yankpaste_bdd.py                | 2 +-
 tests/end2end/features/test_zoom_bdd.py                     | 2 +-
 tests/end2end/fixtures/quteprocess.py                       | 2 +-
 tests/end2end/fixtures/test_quteprocess.py                  | 2 +-
 tests/end2end/fixtures/test_testprocess.py                  | 2 +-
 tests/end2end/fixtures/test_webserver.py                    | 2 +-
 tests/end2end/fixtures/testprocess.py                       | 2 +-
 tests/end2end/fixtures/webserver.py                         | 2 +-
 tests/end2end/fixtures/webserver_sub.py                     | 2 +-
 tests/end2end/fixtures/webserver_sub_ssl.py                 | 2 +-
 tests/end2end/test_dirbrowser.py                            | 2 +-
 tests/end2end/test_hints_html.py                            | 2 +-
 tests/end2end/test_insert_mode.py                           | 2 +-
 tests/end2end/test_invocations.py                           | 2 +-
 tests/end2end/test_mhtml_e2e.py                             | 2 +-
 tests/helpers/fixtures.py                                   | 2 +-
 tests/helpers/logfail.py                                    | 2 +-
 tests/helpers/messagemock.py                                | 2 +-
 tests/helpers/stubs.py                                      | 2 +-
 tests/helpers/test_helper_utils.py                          | 2 +-
 tests/helpers/test_logfail.py                               | 2 +-
 tests/helpers/test_stubs.py                                 | 2 +-
 tests/helpers/utils.py                                      | 2 +-
 tests/test_conftest.py                                      | 2 +-
 tests/unit/browser/test_hints.py                            | 2 +-
 tests/unit/browser/test_history.py                          | 2 +-
 tests/unit/browser/test_qutescheme.py                       | 2 +-
 tests/unit/browser/test_shared.py                           | 2 +-
 tests/unit/browser/test_signalfilter.py                     | 2 +-
 tests/unit/browser/test_tab.py                              | 2 +-
 tests/unit/browser/webengine/test_spell.py                  | 2 +-
 tests/unit/browser/webengine/test_webenginedownloads.py     | 2 +-
 tests/unit/browser/webengine/test_webenginesettings.py      | 2 +-
 tests/unit/browser/webkit/http/test_content_disposition.py  | 2 +-
 tests/unit/browser/webkit/http/test_http.py                 | 2 +-
 tests/unit/browser/webkit/http/test_http_hypothesis.py      | 2 +-
 tests/unit/browser/webkit/network/test_filescheme.py        | 2 +-
 tests/unit/browser/webkit/network/test_networkmanager.py    | 2 +-
 tests/unit/browser/webkit/network/test_networkreply.py      | 2 +-
 tests/unit/browser/webkit/network/test_pac.py               | 2 +-
 tests/unit/browser/webkit/network/test_schemehandler.py     | 2 +-
 tests/unit/browser/webkit/network/test_webkitqutescheme.py  | 4 ++--
 tests/unit/browser/webkit/test_cache.py                     | 2 +-
 tests/unit/browser/webkit/test_cookies.py                   | 2 +-
 tests/unit/browser/webkit/test_downloads.py                 | 2 +-
 tests/unit/browser/webkit/test_mhtml.py                     | 2 +-
 tests/unit/browser/webkit/test_qt_javascript.py             | 2 +-
 tests/unit/browser/webkit/test_tabhistory.py                | 2 +-
 tests/unit/browser/webkit/test_webkitelem.py                | 2 +-
 tests/unit/commands/test_argparser.py                       | 2 +-
 tests/unit/commands/test_cmdutils.py                        | 2 +-
 tests/unit/commands/test_runners.py                         | 2 +-
 tests/unit/commands/test_userscripts.py                     | 2 +-
 tests/unit/completion/test_completer.py                     | 2 +-
 tests/unit/completion/test_completionmodel.py               | 2 +-
 tests/unit/completion/test_completionwidget.py              | 2 +-
 tests/unit/completion/test_histcategory.py                  | 2 +-
 tests/unit/completion/test_listcategory.py                  | 2 +-
 tests/unit/completion/test_models.py                        | 2 +-
 tests/unit/config/test_config.py                            | 2 +-
 tests/unit/config/test_configcommands.py                    | 2 +-
 tests/unit/config/test_configdata.py                        | 2 +-
 tests/unit/config/test_configexc.py                         | 2 +-
 tests/unit/config/test_configfiles.py                       | 2 +-
 tests/unit/config/test_configinit.py                        | 2 +-
 tests/unit/config/test_configtypes.py                       | 2 +-
 tests/unit/javascript/conftest.py                           | 2 +-
 tests/unit/javascript/position_caret/test_position_caret.py | 2 +-
 tests/unit/javascript/stylesheet/test_stylesheet.py         | 2 +-
 tests/unit/javascript/test_greasemonkey.py                  | 2 +-
 tests/unit/keyinput/conftest.py                             | 2 +-
 tests/unit/keyinput/test_basekeyparser.py                   | 2 +-
 tests/unit/keyinput/test_modeman.py                         | 2 +-
 tests/unit/keyinput/test_modeparsers.py                     | 2 +-
 tests/unit/mainwindow/statusbar/test_backforward.py         | 2 +-
 tests/unit/mainwindow/statusbar/test_percentage.py          | 2 +-
 tests/unit/mainwindow/statusbar/test_progress.py            | 2 +-
 tests/unit/mainwindow/statusbar/test_tabindex.py            | 2 +-
 tests/unit/mainwindow/statusbar/test_textbase.py            | 2 +-
 tests/unit/mainwindow/statusbar/test_url.py                 | 2 +-
 tests/unit/mainwindow/test_messageview.py                   | 2 +-
 tests/unit/mainwindow/test_prompt.py                        | 2 +-
 tests/unit/mainwindow/test_tabwidget.py                     | 2 +-
 tests/unit/misc/test_autoupdate.py                          | 2 +-
 tests/unit/misc/test_checkpyver.py                          | 2 +-
 tests/unit/misc/test_cmdhistory.py                          | 4 ++--
 tests/unit/misc/test_crashdialog.py                         | 2 +-
 tests/unit/misc/test_earlyinit.py                           | 2 +-
 tests/unit/misc/test_editor.py                              | 2 +-
 tests/unit/misc/test_guiprocess.py                          | 2 +-
 tests/unit/misc/test_ipc.py                                 | 2 +-
 tests/unit/misc/test_keyhints.py                            | 2 +-
 tests/unit/misc/test_lineparser.py                          | 2 +-
 tests/unit/misc/test_miscwidgets.py                         | 2 +-
 tests/unit/misc/test_msgbox.py                              | 2 +-
 tests/unit/misc/test_objects.py                             | 2 +-
 tests/unit/misc/test_pastebin.py                            | 2 +-
 tests/unit/misc/test_readline.py                            | 2 +-
 tests/unit/misc/test_sessions.py                            | 2 +-
 tests/unit/misc/test_split.py                               | 2 +-
 tests/unit/misc/test_split_hypothesis.py                    | 2 +-
 tests/unit/misc/test_sql.py                                 | 2 +-
 tests/unit/misc/test_utilcmds.py                            | 2 +-
 tests/unit/scripts/test_check_coverage.py                   | 2 +-
 tests/unit/scripts/test_dictcli.py                          | 2 +-
 tests/unit/scripts/test_importer.py                         | 2 +-
 tests/unit/scripts/test_run_vulture.py                      | 2 +-
 tests/unit/test_app.py                                      | 2 +-
 tests/unit/utils/overflow_test_cases.py                     | 2 +-
 tests/unit/utils/test_debug.py                              | 2 +-
 tests/unit/utils/test_error.py                              | 2 +-
 tests/unit/utils/test_javascript.py                         | 2 +-
 tests/unit/utils/test_jinja.py                              | 2 +-
 tests/unit/utils/test_log.py                                | 2 +-
 tests/unit/utils/test_qtutils.py                            | 2 +-
 tests/unit/utils/test_standarddir.py                        | 2 +-
 tests/unit/utils/test_urlutils.py                           | 2 +-
 tests/unit/utils/test_utils.py                              | 2 +-
 tests/unit/utils/test_version.py                            | 2 +-
 tests/unit/utils/usertypes/test_misc.py                     | 2 +-
 tests/unit/utils/usertypes/test_neighborlist.py             | 2 +-
 tests/unit/utils/usertypes/test_question.py                 | 2 +-
 tests/unit/utils/usertypes/test_timer.py                    | 2 +-
 332 files changed, 340 insertions(+), 340 deletions(-)

diff --git a/qutebrowser.py b/qutebrowser.py
index a16bd9ac7..8dd81b01a 100755
--- a/qutebrowser.py
+++ b/qutebrowser.py
@@ -2,7 +2,7 @@
 
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py
index bcca15b4e..72afa0d5d 100644
--- a/qutebrowser/__init__.py
+++ b/qutebrowser/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/__main__.py b/qutebrowser/__main__.py
index 506039890..533cf6e67 100644
--- a/qutebrowser/__main__.py
+++ b/qutebrowser/__main__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index e3d06391d..c87201931 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/__init__.py b/qutebrowser/browser/__init__.py
index c5d5e6c92..b565801d3 100644
--- a/qutebrowser/browser/__init__.py
+++ b/qutebrowser/browser/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/adblock.py b/qutebrowser/browser/adblock.py
index 623d15717..fa35684b9 100644
--- a/qutebrowser/browser/adblock.py
+++ b/qutebrowser/browser/adblock.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 11ba7bc00..1a514f4a3 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index a0c5e63ff..0ebcf3240 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py
index c064d700e..12c96db7e 100644
--- a/qutebrowser/browser/downloads.py
+++ b/qutebrowser/browser/downloads.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/downloadview.py b/qutebrowser/browser/downloadview.py
index ac44d75d9..80da117d2 100644
--- a/qutebrowser/browser/downloadview.py
+++ b/qutebrowser/browser/downloadview.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index ba2879848..fb064f6c1 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 14cc2b574..3e0eddbeb 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index 995fb591d..85922f9e8 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/inspector.py b/qutebrowser/browser/inspector.py
index 9c583f4b3..608404eeb 100644
--- a/qutebrowser/browser/inspector.py
+++ b/qutebrowser/browser/inspector.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/mouse.py b/qutebrowser/browser/mouse.py
index d08f191a8..b0053cbf1 100644
--- a/qutebrowser/browser/mouse.py
+++ b/qutebrowser/browser/mouse.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/navigate.py b/qutebrowser/browser/navigate.py
index 8b406368b..257ce6fe0 100644
--- a/qutebrowser/browser/navigate.py
+++ b/qutebrowser/browser/navigate.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/network/pac.py b/qutebrowser/browser/network/pac.py
index a3f0813c8..95ff99390 100644
--- a/qutebrowser/browser/network/pac.py
+++ b/qutebrowser/browser/network/pac.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py
index 9a4999ef2..96be78742 100644
--- a/qutebrowser/browser/network/proxy.py
+++ b/qutebrowser/browser/network/proxy.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/pdfjs.py b/qutebrowser/browser/pdfjs.py
index cd5bcac0a..5ce3d866e 100644
--- a/qutebrowser/browser/pdfjs.py
+++ b/qutebrowser/browser/pdfjs.py
@@ -1,7 +1,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 # Copyright 2015 Daniel Schadt
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/qtnetworkdownloads.py b/qutebrowser/browser/qtnetworkdownloads.py
index 378bc72b5..7a8c5aa64 100644
--- a/qutebrowser/browser/qtnetworkdownloads.py
+++ b/qutebrowser/browser/qtnetworkdownloads.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 08122958a..320e7873a 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py
index b6bfefe7b..2a374906d 100644
--- a/qutebrowser/browser/shared.py
+++ b/qutebrowser/browser/shared.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/signalfilter.py b/qutebrowser/browser/signalfilter.py
index 90b85c586..663aa67e7 100644
--- a/qutebrowser/browser/signalfilter.py
+++ b/qutebrowser/browser/signalfilter.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/urlmarks.py b/qutebrowser/browser/urlmarks.py
index 5e2c60dfb..2d357a8e8 100644
--- a/qutebrowser/browser/urlmarks.py
+++ b/qutebrowser/browser/urlmarks.py
@@ -1,7 +1,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-# Copyright 2015-2017 Antoni Boucher <bouanto@zoho.com>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Antoni Boucher <bouanto@zoho.com>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py
index 30355ad1a..122e7d031 100644
--- a/qutebrowser/browser/webelem.py
+++ b/qutebrowser/browser/webelem.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/__init__.py b/qutebrowser/browser/webengine/__init__.py
index 60d140540..2649645d3 100644
--- a/qutebrowser/browser/webengine/__init__.py
+++ b/qutebrowser/browser/webengine/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/certificateerror.py b/qutebrowser/browser/webengine/certificateerror.py
index c97e51b81..47953d4cc 100644
--- a/qutebrowser/browser/webengine/certificateerror.py
+++ b/qutebrowser/browser/webengine/certificateerror.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/interceptor.py b/qutebrowser/browser/webengine/interceptor.py
index e34718791..480e8ee85 100644
--- a/qutebrowser/browser/webengine/interceptor.py
+++ b/qutebrowser/browser/webengine/interceptor.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/spell.py b/qutebrowser/browser/webengine/spell.py
index 9166180d4..beebe4da7 100644
--- a/qutebrowser/browser/webengine/spell.py
+++ b/qutebrowser/browser/webengine/spell.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Michal Siedlaczek <michal.siedlaczek@gmail.com>
+# Copyright 2017-2018 Michal Siedlaczek <michal.siedlaczek@gmail.com>
 
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/tabhistory.py b/qutebrowser/browser/webengine/tabhistory.py
index 5db6faeb1..81f0a3afd 100644
--- a/qutebrowser/browser/webengine/tabhistory.py
+++ b/qutebrowser/browser/webengine/tabhistory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py
index d467724d5..fac04686a 100644
--- a/qutebrowser/browser/webengine/webenginedownloads.py
+++ b/qutebrowser/browser/webengine/webenginedownloads.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webengineelem.py b/qutebrowser/browser/webengine/webengineelem.py
index d6d74ebe4..127b71cf0 100644
--- a/qutebrowser/browser/webengine/webengineelem.py
+++ b/qutebrowser/browser/webengine/webengineelem.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webengineinspector.py b/qutebrowser/browser/webengine/webengineinspector.py
index 8fa8bcb2d..b2a6ebb1e 100644
--- a/qutebrowser/browser/webengine/webengineinspector.py
+++ b/qutebrowser/browser/webengine/webengineinspector.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webenginequtescheme.py b/qutebrowser/browser/webengine/webenginequtescheme.py
index 2e9aedd3e..ac583a671 100644
--- a/qutebrowser/browser/webengine/webenginequtescheme.py
+++ b/qutebrowser/browser/webengine/webenginequtescheme.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index f8b54e065..607499401 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 13ceb7fd1..ecbe81922 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py
index b313fc36c..1b3c15f9e 100644
--- a/qutebrowser/browser/webengine/webview.py
+++ b/qutebrowser/browser/webengine/webview.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/__init__.py b/qutebrowser/browser/webkit/__init__.py
index 93b53cdba..5100b7a53 100644
--- a/qutebrowser/browser/webkit/__init__.py
+++ b/qutebrowser/browser/webkit/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/cache.py b/qutebrowser/browser/webkit/cache.py
index 998545509..163612ce9 100644
--- a/qutebrowser/browser/webkit/cache.py
+++ b/qutebrowser/browser/webkit/cache.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/certificateerror.py b/qutebrowser/browser/webkit/certificateerror.py
index 23353f268..cad17fba5 100644
--- a/qutebrowser/browser/webkit/certificateerror.py
+++ b/qutebrowser/browser/webkit/certificateerror.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/cookies.py b/qutebrowser/browser/webkit/cookies.py
index f08e2e546..01b6842a0 100644
--- a/qutebrowser/browser/webkit/cookies.py
+++ b/qutebrowser/browser/webkit/cookies.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/http.py b/qutebrowser/browser/webkit/http.py
index 8997f4b0c..73e620015 100644
--- a/qutebrowser/browser/webkit/http.py
+++ b/qutebrowser/browser/webkit/http.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/mhtml.py b/qutebrowser/browser/webkit/mhtml.py
index 67c8a5b7a..ca807f705 100644
--- a/qutebrowser/browser/webkit/mhtml.py
+++ b/qutebrowser/browser/webkit/mhtml.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Daniel Schadt
+# Copyright 2015-2018 Daniel Schadt
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/network/filescheme.py b/qutebrowser/browser/webkit/network/filescheme.py
index a971e3257..d8c2c36b8 100644
--- a/qutebrowser/browser/webkit/network/filescheme.py
+++ b/qutebrowser/browser/webkit/network/filescheme.py
@@ -1,7 +1,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-# Copyright 2015-2017 Antoni Boucher (antoyo) <bouanto@zoho.com>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Antoni Boucher (antoyo) <bouanto@zoho.com>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index a19687eb1..cb70e62fa 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/qutebrowser/browser/webkit/network/networkmanager.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/network/networkreply.py b/qutebrowser/browser/webkit/network/networkreply.py
index 22263c96b..dc6bed5ed 100644
--- a/qutebrowser/browser/webkit/network/networkreply.py
+++ b/qutebrowser/browser/webkit/network/networkreply.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # Based on the Eric5 helpviewer,
 # Copyright (c) 2009 - 2014 Detlev Offenbach <detlev@die-offenbachs.de>
diff --git a/qutebrowser/browser/webkit/network/schemehandler.py b/qutebrowser/browser/webkit/network/schemehandler.py
index c6337efa3..c50194172 100644
--- a/qutebrowser/browser/webkit/network/schemehandler.py
+++ b/qutebrowser/browser/webkit/network/schemehandler.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # Based on the Eric5 helpviewer,
 # Copyright (c) 2009 - 2014 Detlev Offenbach <detlev@die-offenbachs.de>
diff --git a/qutebrowser/browser/webkit/network/webkitqutescheme.py b/qutebrowser/browser/webkit/network/webkitqutescheme.py
index 5413a4a8d..2ed8d5aa1 100644
--- a/qutebrowser/browser/webkit/network/webkitqutescheme.py
+++ b/qutebrowser/browser/webkit/network/webkitqutescheme.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/rfc6266.py b/qutebrowser/browser/webkit/rfc6266.py
index f83413ee2..139b4f9df 100644
--- a/qutebrowser/browser/webkit/rfc6266.py
+++ b/qutebrowser/browser/webkit/rfc6266.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/tabhistory.py b/qutebrowser/browser/webkit/tabhistory.py
index d595a6e95..263bf6334 100644
--- a/qutebrowser/browser/webkit/tabhistory.py
+++ b/qutebrowser/browser/webkit/tabhistory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webkitelem.py b/qutebrowser/browser/webkit/webkitelem.py
index 829052798..a7d4f4b3e 100644
--- a/qutebrowser/browser/webkit/webkitelem.py
+++ b/qutebrowser/browser/webkit/webkitelem.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webkithistory.py b/qutebrowser/browser/webkit/webkithistory.py
index 0edbb3fa3..2c719acd6 100644
--- a/qutebrowser/browser/webkit/webkithistory.py
+++ b/qutebrowser/browser/webkit/webkithistory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webkitinspector.py b/qutebrowser/browser/webkit/webkitinspector.py
index 957d1b4d2..3098ab5af 100644
--- a/qutebrowser/browser/webkit/webkitinspector.py
+++ b/qutebrowser/browser/webkit/webkitinspector.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py
index 3354a9486..ee01c40db 100644
--- a/qutebrowser/browser/webkit/webkitsettings.py
+++ b/qutebrowser/browser/webkit/webkitsettings.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 93d5ee3f7..4ad177a2a 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 89407fcdf..5c2bb4111 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/browser/webkit/webview.py b/qutebrowser/browser/webkit/webview.py
index 4f1ff10c8..942e7265c 100644
--- a/qutebrowser/browser/webkit/webview.py
+++ b/qutebrowser/browser/webkit/webview.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/__init__.py b/qutebrowser/commands/__init__.py
index 7bc59ae40..0bbc9852b 100644
--- a/qutebrowser/commands/__init__.py
+++ b/qutebrowser/commands/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/argparser.py b/qutebrowser/commands/argparser.py
index 9dfe841ce..707324ede 100644
--- a/qutebrowser/commands/argparser.py
+++ b/qutebrowser/commands/argparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/cmdexc.py b/qutebrowser/commands/cmdexc.py
index bca2f0500..5d3ac2a89 100644
--- a/qutebrowser/commands/cmdexc.py
+++ b/qutebrowser/commands/cmdexc.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/cmdutils.py b/qutebrowser/commands/cmdutils.py
index 2f7af2f9f..d261e5e86 100644
--- a/qutebrowser/commands/cmdutils.py
+++ b/qutebrowser/commands/cmdutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py
index dd9a63101..fd3fcf20a 100644
--- a/qutebrowser/commands/command.py
+++ b/qutebrowser/commands/command.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index 890a0275e..9fe53f07a 100644
--- a/qutebrowser/commands/runners.py
+++ b/qutebrowser/commands/runners.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/commands/userscripts.py b/qutebrowser/commands/userscripts.py
index d86cb8ccf..65930182f 100644
--- a/qutebrowser/commands/userscripts.py
+++ b/qutebrowser/commands/userscripts.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/__init__.py b/qutebrowser/completion/__init__.py
index 8b8b9d88d..2c9121699 100644
--- a/qutebrowser/completion/__init__.py
+++ b/qutebrowser/completion/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index 4e187750d..09b80ed12 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/completiondelegate.py b/qutebrowser/completion/completiondelegate.py
index ab98eccef..779906a83 100644
--- a/qutebrowser/completion/completiondelegate.py
+++ b/qutebrowser/completion/completiondelegate.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/completionwidget.py b/qutebrowser/completion/completionwidget.py
index 29f4f6653..740be75d9 100644
--- a/qutebrowser/completion/completionwidget.py
+++ b/qutebrowser/completion/completionwidget.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/__init__.py b/qutebrowser/completion/models/__init__.py
index 5812545eb..7f62829ba 100644
--- a/qutebrowser/completion/models/__init__.py
+++ b/qutebrowser/completion/models/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/completionmodel.py b/qutebrowser/completion/models/completionmodel.py
index aa4422d83..1c77e1d31 100644
--- a/qutebrowser/completion/models/completionmodel.py
+++ b/qutebrowser/completion/models/completionmodel.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2017-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/configmodel.py b/qutebrowser/completion/models/configmodel.py
index 445a57a66..c433dbc12 100644
--- a/qutebrowser/completion/models/configmodel.py
+++ b/qutebrowser/completion/models/configmodel.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/histcategory.py b/qutebrowser/completion/models/histcategory.py
index 57a2aa936..a07f78143 100644
--- a/qutebrowser/completion/models/histcategory.py
+++ b/qutebrowser/completion/models/histcategory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2017-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/listcategory.py b/qutebrowser/completion/models/listcategory.py
index 657ae97aa..13bc1e6b2 100644
--- a/qutebrowser/completion/models/listcategory.py
+++ b/qutebrowser/completion/models/listcategory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2017-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/miscmodels.py b/qutebrowser/completion/models/miscmodels.py
index 22c9000c3..049d89295 100644
--- a/qutebrowser/completion/models/miscmodels.py
+++ b/qutebrowser/completion/models/miscmodels.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/urlmodel.py b/qutebrowser/completion/models/urlmodel.py
index 1d7a075eb..bebf6d829 100644
--- a/qutebrowser/completion/models/urlmodel.py
+++ b/qutebrowser/completion/models/urlmodel.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/completion/models/util.py b/qutebrowser/completion/models/util.py
index 40d5de8dc..c1b8b56f9 100644
--- a/qutebrowser/completion/models/util.py
+++ b/qutebrowser/completion/models/util.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2017-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/__init__.py b/qutebrowser/config/__init__.py
index bf0bce0ec..e2c25cce8 100644
--- a/qutebrowser/config/__init__.py
+++ b/qutebrowser/config/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index c170d0705..f30acb8ca 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index 93a1f7ce0..a3a7d298a 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index b265ab8fc..bcad53e00 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configdiff.py b/qutebrowser/config/configdiff.py
index 020be2c8c..9f8b70a26 100644
--- a/qutebrowser/config/configdiff.py
+++ b/qutebrowser/config/configdiff.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configexc.py b/qutebrowser/config/configexc.py
index 28b269dd5..0a4986efa 100644
--- a/qutebrowser/config/configexc.py
+++ b/qutebrowser/config/configexc.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 0e9572f55..8a5cb6697 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configinit.py b/qutebrowser/config/configinit.py
index 510245e2e..c7c9362b0 100644
--- a/qutebrowser/config/configinit.py
+++ b/qutebrowser/config/configinit.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py
index 71c32f59e..26998d510 100644
--- a/qutebrowser/config/configtypes.py
+++ b/qutebrowser/config/configtypes.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py
index 0e57af45f..fa8abb76f 100644
--- a/qutebrowser/config/websettings.py
+++ b/qutebrowser/config/websettings.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/keyinput/__init__.py b/qutebrowser/keyinput/__init__.py
index c6b95b8a9..1cff4943b 100644
--- a/qutebrowser/keyinput/__init__.py
+++ b/qutebrowser/keyinput/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/keyinput/basekeyparser.py b/qutebrowser/keyinput/basekeyparser.py
index b435ac52c..89120f922 100644
--- a/qutebrowser/keyinput/basekeyparser.py
+++ b/qutebrowser/keyinput/basekeyparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/keyinput/keyparser.py b/qutebrowser/keyinput/keyparser.py
index 8fcb53035..8ae27412e 100644
--- a/qutebrowser/keyinput/keyparser.py
+++ b/qutebrowser/keyinput/keyparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/keyinput/macros.py b/qutebrowser/keyinput/macros.py
index 9e3667590..08740d80d 100644
--- a/qutebrowser/keyinput/macros.py
+++ b/qutebrowser/keyinput/macros.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Jan Verbeek (blyxxyz) <ring@openmailbox.org>
+# Copyright 2016-2018 Jan Verbeek (blyxxyz) <ring@openmailbox.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index 78b313450..e32830f50 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/keyinput/modeparsers.py b/qutebrowser/keyinput/modeparsers.py
index 7c2088133..b739d38a1 100644
--- a/qutebrowser/keyinput/modeparsers.py
+++ b/qutebrowser/keyinput/modeparsers.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/__init__.py b/qutebrowser/mainwindow/__init__.py
index 43eb563a9..1b76e9b5a 100644
--- a/qutebrowser/mainwindow/__init__.py
+++ b/qutebrowser/mainwindow/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index a5faf6dd1..0e6b64936 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/messageview.py b/qutebrowser/mainwindow/messageview.py
index 5e389e23c..43ddd5248 100644
--- a/qutebrowser/mainwindow/messageview.py
+++ b/qutebrowser/mainwindow/messageview.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py
index 3d21a52e0..df4c45096 100644
--- a/qutebrowser/mainwindow/prompt.py
+++ b/qutebrowser/mainwindow/prompt.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/__init__.py b/qutebrowser/mainwindow/statusbar/__init__.py
index eb3ed7193..eee7cf990 100644
--- a/qutebrowser/mainwindow/statusbar/__init__.py
+++ b/qutebrowser/mainwindow/statusbar/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/backforward.py b/qutebrowser/mainwindow/statusbar/backforward.py
index 3a566e105..b214b894d 100644
--- a/qutebrowser/mainwindow/statusbar/backforward.py
+++ b/qutebrowser/mainwindow/statusbar/backforward.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/bar.py b/qutebrowser/mainwindow/statusbar/bar.py
index ae7a3954d..ae6832eb0 100644
--- a/qutebrowser/mainwindow/statusbar/bar.py
+++ b/qutebrowser/mainwindow/statusbar/bar.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 26ba802c0..5f1451af3 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/keystring.py b/qutebrowser/mainwindow/statusbar/keystring.py
index dd9825ab2..29dd3b790 100644
--- a/qutebrowser/mainwindow/statusbar/keystring.py
+++ b/qutebrowser/mainwindow/statusbar/keystring.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/percentage.py b/qutebrowser/mainwindow/statusbar/percentage.py
index 0d75e8163..a3f30e50d 100644
--- a/qutebrowser/mainwindow/statusbar/percentage.py
+++ b/qutebrowser/mainwindow/statusbar/percentage.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/progress.py b/qutebrowser/mainwindow/statusbar/progress.py
index c8707e0b1..930282771 100644
--- a/qutebrowser/mainwindow/statusbar/progress.py
+++ b/qutebrowser/mainwindow/statusbar/progress.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/tabindex.py b/qutebrowser/mainwindow/statusbar/tabindex.py
index 6a4cc987c..47a775f34 100644
--- a/qutebrowser/mainwindow/statusbar/tabindex.py
+++ b/qutebrowser/mainwindow/statusbar/tabindex.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/text.py b/qutebrowser/mainwindow/statusbar/text.py
index b232cedc8..0a57446f1 100644
--- a/qutebrowser/mainwindow/statusbar/text.py
+++ b/qutebrowser/mainwindow/statusbar/text.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/textbase.py b/qutebrowser/mainwindow/statusbar/textbase.py
index 0ae271191..5c157e52a 100644
--- a/qutebrowser/mainwindow/statusbar/textbase.py
+++ b/qutebrowser/mainwindow/statusbar/textbase.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/statusbar/url.py b/qutebrowser/mainwindow/statusbar/url.py
index a91c67550..f24e79834 100644
--- a/qutebrowser/mainwindow/statusbar/url.py
+++ b/qutebrowser/mainwindow/statusbar/url.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index d8056d853..824abf25b 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index ac3a34581..da1f2624b 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/__init__.py b/qutebrowser/misc/__init__.py
index 03ad27aa8..2be43490a 100644
--- a/qutebrowser/misc/__init__.py
+++ b/qutebrowser/misc/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/autoupdate.py b/qutebrowser/misc/autoupdate.py
index 15a3b6670..d056d61b6 100644
--- a/qutebrowser/misc/autoupdate.py
+++ b/qutebrowser/misc/autoupdate.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/backendproblem.py b/qutebrowser/misc/backendproblem.py
index cf1024c57..d6ac36d10 100644
--- a/qutebrowser/misc/backendproblem.py
+++ b/qutebrowser/misc/backendproblem.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/checkpyver.py b/qutebrowser/misc/checkpyver.py
index da71b278d..50330ef88 100644
--- a/qutebrowser/misc/checkpyver.py
+++ b/qutebrowser/misc/checkpyver.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The-Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The-Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/cmdhistory.py b/qutebrowser/misc/cmdhistory.py
index a24f6b816..9fa273c1c 100644
--- a/qutebrowser/misc/cmdhistory.py
+++ b/qutebrowser/misc/cmdhistory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/consolewidget.py b/qutebrowser/misc/consolewidget.py
index b5ca8dd78..661c7b805 100644
--- a/qutebrowser/misc/consolewidget.py
+++ b/qutebrowser/misc/consolewidget.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py
index 9ef0e573c..4d395b8ec 100644
--- a/qutebrowser/misc/crashdialog.py
+++ b/qutebrowser/misc/crashdialog.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/crashsignal.py b/qutebrowser/misc/crashsignal.py
index b8d63ad58..5224c31cc 100644
--- a/qutebrowser/misc/crashsignal.py
+++ b/qutebrowser/misc/crashsignal.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
index 10530eecf..c78d0848d 100644
--- a/qutebrowser/misc/earlyinit.py
+++ b/qutebrowser/misc/earlyinit.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The-Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The-Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 553c700e7..6b464724f 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py
index 384c3ae30..52dc352a7 100644
--- a/qutebrowser/misc/guiprocess.py
+++ b/qutebrowser/misc/guiprocess.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/httpclient.py b/qutebrowser/misc/httpclient.py
index 4d33d487e..b0b41af76 100644
--- a/qutebrowser/misc/httpclient.py
+++ b/qutebrowser/misc/httpclient.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/ipc.py b/qutebrowser/misc/ipc.py
index c9f982365..8af5ba6bf 100644
--- a/qutebrowser/misc/ipc.py
+++ b/qutebrowser/misc/ipc.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/keyhintwidget.py b/qutebrowser/misc/keyhintwidget.py
index 46d1d3f24..fad58da2d 100644
--- a/qutebrowser/misc/keyhintwidget.py
+++ b/qutebrowser/misc/keyhintwidget.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/lineparser.py b/qutebrowser/misc/lineparser.py
index 155cbd1b0..6e50edb9b 100644
--- a/qutebrowser/misc/lineparser.py
+++ b/qutebrowser/misc/lineparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/miscwidgets.py b/qutebrowser/misc/miscwidgets.py
index 5d3e9b5ca..2e868e27c 100644
--- a/qutebrowser/misc/miscwidgets.py
+++ b/qutebrowser/misc/miscwidgets.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/msgbox.py b/qutebrowser/misc/msgbox.py
index 459ab8b61..053534158 100644
--- a/qutebrowser/misc/msgbox.py
+++ b/qutebrowser/misc/msgbox.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/objects.py b/qutebrowser/misc/objects.py
index 60d764620..d6c116eab 100644
--- a/qutebrowser/misc/objects.py
+++ b/qutebrowser/misc/objects.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/pastebin.py b/qutebrowser/misc/pastebin.py
index 9609481b6..d022fc526 100644
--- a/qutebrowser/misc/pastebin.py
+++ b/qutebrowser/misc/pastebin.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/readline.py b/qutebrowser/misc/readline.py
index 51ce6bb94..3846b77e0 100644
--- a/qutebrowser/misc/readline.py
+++ b/qutebrowser/misc/readline.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/savemanager.py b/qutebrowser/misc/savemanager.py
index 436e3b66f..0d79c97db 100644
--- a/qutebrowser/misc/savemanager.py
+++ b/qutebrowser/misc/savemanager.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index d18cebf32..a8a652dbb 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/split.py b/qutebrowser/misc/split.py
index 2ae8b3792..31738fbcc 100644
--- a/qutebrowser/misc/split.py
+++ b/qutebrowser/misc/split.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/sql.py b/qutebrowser/misc/sql.py
index 65a93a461..9b09fb132 100644
--- a/qutebrowser/misc/sql.py
+++ b/qutebrowser/misc/sql.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/misc/utilcmds.py b/qutebrowser/misc/utilcmds.py
index 4054f85bb..c0d83b7eb 100644
--- a/qutebrowser/misc/utilcmds.py
+++ b/qutebrowser/misc/utilcmds.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index fc113a5d4..815ffd5a7 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/__init__.py b/qutebrowser/utils/__init__.py
index c28a40b10..16069f3ae 100644
--- a/qutebrowser/utils/__init__.py
+++ b/qutebrowser/utils/__init__.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/debug.py b/qutebrowser/utils/debug.py
index 813b02e7a..06bdd2909 100644
--- a/qutebrowser/utils/debug.py
+++ b/qutebrowser/utils/debug.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/docutils.py b/qutebrowser/utils/docutils.py
index e54effe8d..9ae2039ac 100644
--- a/qutebrowser/utils/docutils.py
+++ b/qutebrowser/utils/docutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/error.py b/qutebrowser/utils/error.py
index 0d045bf19..b9abcdfe1 100644
--- a/qutebrowser/utils/error.py
+++ b/qutebrowser/utils/error.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/javascript.py b/qutebrowser/utils/javascript.py
index f536fed1f..335b1b983 100644
--- a/qutebrowser/utils/javascript.py
+++ b/qutebrowser/utils/javascript.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/jinja.py b/qutebrowser/utils/jinja.py
index 802fc5fff..d4ce3368f 100644
--- a/qutebrowser/utils/jinja.py
+++ b/qutebrowser/utils/jinja.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py
index 1a65b6eb8..d6cae1312 100644
--- a/qutebrowser/utils/log.py
+++ b/qutebrowser/utils/log.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/message.py b/qutebrowser/utils/message.py
index 32395b8bd..49fb021a4 100644
--- a/qutebrowser/utils/message.py
+++ b/qutebrowser/utils/message.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/objreg.py b/qutebrowser/utils/objreg.py
index f65e4efab..8d44a9eb5 100644
--- a/qutebrowser/utils/objreg.py
+++ b/qutebrowser/utils/objreg.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/qtutils.py b/qutebrowser/utils/qtutils.py
index 87978274f..8a42fb073 100644
--- a/qutebrowser/utils/qtutils.py
+++ b/qutebrowser/utils/qtutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/standarddir.py b/qutebrowser/utils/standarddir.py
index 64f7eb9a8..40f1fa966 100644
--- a/qutebrowser/utils/standarddir.py
+++ b/qutebrowser/utils/standarddir.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index 0cbe6d88e..2ed466dd1 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index aad685d07..dc57e708c 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index f29db578e..079866920 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 624197bdd..aff7ed07b 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/asciidoc2html.py b/scripts/asciidoc2html.py
index 01af53693..1827dc2a3 100755
--- a/scripts/asciidoc2html.py
+++ b/scripts/asciidoc2html.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py
index aa4046adc..eba7610af 100755
--- a/scripts/dev/build_release.py
+++ b/scripts/dev/build_release.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/check_coverage.py b/scripts/dev/check_coverage.py
index 8ec4f80f7..45ad534e1 100644
--- a/scripts/dev/check_coverage.py
+++ b/scripts/dev/check_coverage.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/check_doc_changes.py b/scripts/dev/check_doc_changes.py
index 1cc2a90f9..3d90bea5e 100755
--- a/scripts/dev/check_doc_changes.py
+++ b/scripts/dev/check_doc_changes.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/cleanup.py b/scripts/dev/cleanup.py
index 086b210ab..d1bb84a2f 100755
--- a/scripts/dev/cleanup.py
+++ b/scripts/dev/cleanup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/get_coredumpctl_traces.py b/scripts/dev/get_coredumpctl_traces.py
index 3935abdc8..d286d381e 100644
--- a/scripts/dev/get_coredumpctl_traces.py
+++ b/scripts/dev/get_coredumpctl_traces.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/misc_checks.py b/scripts/dev/misc_checks.py
index ff372a7ae..299246448 100644
--- a/scripts/dev/misc_checks.py
+++ b/scripts/dev/misc_checks.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/pylint_checkers/qute_pylint/config.py b/scripts/dev/pylint_checkers/qute_pylint/config.py
index da7fbf32f..5aa52502f 100644
--- a/scripts/dev/pylint_checkers/qute_pylint/config.py
+++ b/scripts/dev/pylint_checkers/qute_pylint/config.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/pylint_checkers/qute_pylint/modeline.py b/scripts/dev/pylint_checkers/qute_pylint/modeline.py
index ee3de13c9..429974cb9 100644
--- a/scripts/dev/pylint_checkers/qute_pylint/modeline.py
+++ b/scripts/dev/pylint_checkers/qute_pylint/modeline.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 # This file is part of qutebrowser.
diff --git a/scripts/dev/pylint_checkers/qute_pylint/openencoding.py b/scripts/dev/pylint_checkers/qute_pylint/openencoding.py
index eccc152ba..f577011ca 100644
--- a/scripts/dev/pylint_checkers/qute_pylint/openencoding.py
+++ b/scripts/dev/pylint_checkers/qute_pylint/openencoding.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/pylint_checkers/qute_pylint/settrace.py b/scripts/dev/pylint_checkers/qute_pylint/settrace.py
index 2bfa9f06f..c82d646aa 100644
--- a/scripts/dev/pylint_checkers/qute_pylint/settrace.py
+++ b/scripts/dev/pylint_checkers/qute_pylint/settrace.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/pylint_checkers/setup.py b/scripts/dev/pylint_checkers/setup.py
index 960fdd2b7..7833c7dbd 100644
--- a/scripts/dev/pylint_checkers/setup.py
+++ b/scripts/dev/pylint_checkers/setup.py
@@ -2,7 +2,7 @@
 
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/recompile_requirements.py b/scripts/dev/recompile_requirements.py
index 191f52031..6e26145e9 100644
--- a/scripts/dev/recompile_requirements.py
+++ b/scripts/dev/recompile_requirements.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/run_profile.py b/scripts/dev/run_profile.py
index 2247bd842..93e0b611c 100755
--- a/scripts/dev/run_profile.py
+++ b/scripts/dev/run_profile.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/run_pylint_on_tests.py b/scripts/dev/run_pylint_on_tests.py
index 3dba0318d..7adf45f76 100644
--- a/scripts/dev/run_pylint_on_tests.py
+++ b/scripts/dev/run_pylint_on_tests.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/run_vulture.py b/scripts/dev/run_vulture.py
index 2bc7283d0..cb19d6211 100755
--- a/scripts/dev/run_vulture.py
+++ b/scripts/dev/run_vulture.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/segfault_test.py b/scripts/dev/segfault_test.py
index efd60c232..aaf495fc1 100755
--- a/scripts/dev/segfault_test.py
+++ b/scripts/dev/segfault_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/src2asciidoc.py b/scripts/dev/src2asciidoc.py
index 5dc3d05ac..6307e3a5c 100755
--- a/scripts/dev/src2asciidoc.py
+++ b/scripts/dev/src2asciidoc.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/standardpaths_tester.py b/scripts/dev/standardpaths_tester.py
index 1cf2fbe4f..27b8382e6 100644
--- a/scripts/dev/standardpaths_tester.py
+++ b/scripts/dev/standardpaths_tester.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/ua_fetch.py b/scripts/dev/ua_fetch.py
index b276eff27..75ce4c2f7 100755
--- a/scripts/dev/ua_fetch.py
+++ b/scripts/dev/ua_fetch.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 lamarpavel
-# Copyright 2015-2017 Alexey Nabrodov (Averrin)
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 lamarpavel
+# Copyright 2015-2018 Alexey Nabrodov (Averrin)
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dev/update_3rdparty.py b/scripts/dev/update_3rdparty.py
index 9c67db107..c40015d22 100755
--- a/scripts/dev/update_3rdparty.py
+++ b/scripts/dev/update_3rdparty.py
@@ -2,7 +2,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 # Copyright 2015 Daniel Schadt
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/dictcli.py b/scripts/dictcli.py
index 796544365..12c80b72d 100755
--- a/scripts/dictcli.py
+++ b/scripts/dictcli.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Michal Siedlaczek <michal.siedlaczek@gmail.com>
+# Copyright 2017-2018 Michal Siedlaczek <michal.siedlaczek@gmail.com>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/hist_importer.py b/scripts/hist_importer.py
index c7c49c200..914701a19 100755
--- a/scripts/hist_importer.py
+++ b/scripts/hist_importer.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-# Copyright 2017 Josefson Souza <josefson.br@gmail.com>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Josefson Souza <josefson.br@gmail.com>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/importer.py b/scripts/importer.py
index d81ace0d0..eb808a615 100755
--- a/scripts/importer.py
+++ b/scripts/importer.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Claude (longneck) <longneck@scratchbook.ch>
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Claude (longneck) <longneck@scratchbook.ch>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/keytester.py b/scripts/keytester.py
index b147599b6..80260f6bf 100644
--- a/scripts/keytester.py
+++ b/scripts/keytester.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/link_pyqt.py b/scripts/link_pyqt.py
index 02f979137..e29a69c3a 100644
--- a/scripts/link_pyqt.py
+++ b/scripts/link_pyqt.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/setupcommon.py b/scripts/setupcommon.py
index 1832ead86..50eabacd0 100644
--- a/scripts/setupcommon.py
+++ b/scripts/setupcommon.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/scripts/testbrowser/testbrowser_webengine.py b/scripts/testbrowser/testbrowser_webengine.py
index e6353dc23..fdf67286c 100755
--- a/scripts/testbrowser/testbrowser_webengine.py
+++ b/scripts/testbrowser/testbrowser_webengine.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/testbrowser/testbrowser_webkit.py b/scripts/testbrowser/testbrowser_webkit.py
index 7c7081f18..73cae08b1 100755
--- a/scripts/testbrowser/testbrowser_webkit.py
+++ b/scripts/testbrowser/testbrowser_webkit.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/scripts/utils.py b/scripts/utils.py
index 6793bb2a7..9a1a751b2 100644
--- a/scripts/utils.py
+++ b/scripts/utils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/conftest.py b/tests/conftest.py
index 42d7e2c81..7d6a0da09 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py
index 084f5439d..d3d34097b 100644
--- a/tests/end2end/conftest.py
+++ b/tests/end2end/conftest.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/data/misc/pyeval_file.py b/tests/end2end/data/misc/pyeval_file.py
index e8ede9444..1dadc6853 100644
--- a/tests/end2end/data/misc/pyeval_file.py
+++ b/tests/end2end/data/misc/pyeval_file.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/data/userscripts/stdinclose.py b/tests/end2end/data/userscripts/stdinclose.py
index 8862fe7ba..21a7e6ca1 100755
--- a/tests/end2end/data/userscripts/stdinclose.py
+++ b/tests/end2end/data/userscripts/stdinclose.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py
index 228e80f06..4752e2393 100644
--- a/tests/end2end/features/conftest.py
+++ b/tests/end2end/features/conftest.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_backforward_bdd.py b/tests/end2end/features/test_backforward_bdd.py
index 187882b67..6d9ab626e 100644
--- a/tests/end2end/features/test_backforward_bdd.py
+++ b/tests/end2end/features/test_backforward_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_caret_bdd.py b/tests/end2end/features/test_caret_bdd.py
index ec9506859..d444f72b1 100644
--- a/tests/end2end/features/test_caret_bdd.py
+++ b/tests/end2end/features/test_caret_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_completion_bdd.py b/tests/end2end/features/test_completion_bdd.py
index 82e2df030..cd0254a83 100644
--- a/tests/end2end/features/test_completion_bdd.py
+++ b/tests/end2end/features/test_completion_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_downloads_bdd.py b/tests/end2end/features/test_downloads_bdd.py
index 843385a36..4aa58d053 100644
--- a/tests/end2end/features/test_downloads_bdd.py
+++ b/tests/end2end/features/test_downloads_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index 260197a46..24309d070 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_hints_bdd.py b/tests/end2end/features/test_hints_bdd.py
index e637fb886..d0f25b16f 100644
--- a/tests/end2end/features/test_hints_bdd.py
+++ b/tests/end2end/features/test_hints_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_history_bdd.py b/tests/end2end/features/test_history_bdd.py
index 8bdd8c396..6efa08330 100644
--- a/tests/end2end/features/test_history_bdd.py
+++ b/tests/end2end/features/test_history_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_invoke_bdd.py b/tests/end2end/features/test_invoke_bdd.py
index 46a6ca637..801de132f 100644
--- a/tests/end2end/features/test_invoke_bdd.py
+++ b/tests/end2end/features/test_invoke_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_javascript_bdd.py b/tests/end2end/features/test_javascript_bdd.py
index 631a422a5..3753d12ad 100644
--- a/tests/end2end/features/test_javascript_bdd.py
+++ b/tests/end2end/features/test_javascript_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_keyinput_bdd.py b/tests/end2end/features/test_keyinput_bdd.py
index ef5be0ee9..67795d437 100644
--- a/tests/end2end/features/test_keyinput_bdd.py
+++ b/tests/end2end/features/test_keyinput_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_marks_bdd.py b/tests/end2end/features/test_marks_bdd.py
index 5d31298ff..4734147af 100644
--- a/tests/end2end/features/test_marks_bdd.py
+++ b/tests/end2end/features/test_marks_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_misc_bdd.py b/tests/end2end/features/test_misc_bdd.py
index 19d94ce6a..7d3da36eb 100644
--- a/tests/end2end/features/test_misc_bdd.py
+++ b/tests/end2end/features/test_misc_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_navigate_bdd.py b/tests/end2end/features/test_navigate_bdd.py
index 03812df83..a78042f67 100644
--- a/tests/end2end/features/test_navigate_bdd.py
+++ b/tests/end2end/features/test_navigate_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_open_bdd.py b/tests/end2end/features/test_open_bdd.py
index cb2310a07..8081e1fb0 100644
--- a/tests/end2end/features/test_open_bdd.py
+++ b/tests/end2end/features/test_open_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_private_bdd.py b/tests/end2end/features/test_private_bdd.py
index 6e591a2e0..f02602d0f 100644
--- a/tests/end2end/features/test_private_bdd.py
+++ b/tests/end2end/features/test_private_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_prompts_bdd.py b/tests/end2end/features/test_prompts_bdd.py
index 7a95d48c8..12d9cbeec 100644
--- a/tests/end2end/features/test_prompts_bdd.py
+++ b/tests/end2end/features/test_prompts_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_qutescheme_bdd.py b/tests/end2end/features/test_qutescheme_bdd.py
index 1269d10ed..8706a1a9c 100644
--- a/tests/end2end/features/test_qutescheme_bdd.py
+++ b/tests/end2end/features/test_qutescheme_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_scroll_bdd.py b/tests/end2end/features/test_scroll_bdd.py
index 966d5c9bb..99de7e8e6 100644
--- a/tests/end2end/features/test_scroll_bdd.py
+++ b/tests/end2end/features/test_scroll_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_search_bdd.py b/tests/end2end/features/test_search_bdd.py
index 73a4af131..9a4e33208 100644
--- a/tests/end2end/features/test_search_bdd.py
+++ b/tests/end2end/features/test_search_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_sessions_bdd.py b/tests/end2end/features/test_sessions_bdd.py
index b4f5dcf2c..942a16425 100644
--- a/tests/end2end/features/test_sessions_bdd.py
+++ b/tests/end2end/features/test_sessions_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_spawn_bdd.py b/tests/end2end/features/test_spawn_bdd.py
index 432f95a53..d7f72acde 100644
--- a/tests/end2end/features/test_spawn_bdd.py
+++ b/tests/end2end/features/test_spawn_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_tabs_bdd.py b/tests/end2end/features/test_tabs_bdd.py
index e86204ba9..962a41b5b 100644
--- a/tests/end2end/features/test_tabs_bdd.py
+++ b/tests/end2end/features/test_tabs_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_urlmarks_bdd.py b/tests/end2end/features/test_urlmarks_bdd.py
index 554ede3ec..20364cebd 100644
--- a/tests/end2end/features/test_urlmarks_bdd.py
+++ b/tests/end2end/features/test_urlmarks_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_utilcmds_bdd.py b/tests/end2end/features/test_utilcmds_bdd.py
index 01bfb1440..338c500ca 100644
--- a/tests/end2end/features/test_utilcmds_bdd.py
+++ b/tests/end2end/features/test_utilcmds_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_yankpaste_bdd.py b/tests/end2end/features/test_yankpaste_bdd.py
index c891bf7b4..364044085 100644
--- a/tests/end2end/features/test_yankpaste_bdd.py
+++ b/tests/end2end/features/test_yankpaste_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/features/test_zoom_bdd.py b/tests/end2end/features/test_zoom_bdd.py
index f16b2d12f..c397fd715 100644
--- a/tests/end2end/features/test_zoom_bdd.py
+++ b/tests/end2end/features/test_zoom_bdd.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index a2947e5af..c62de1dc9 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/test_quteprocess.py b/tests/end2end/fixtures/test_quteprocess.py
index aa3fb5857..9aab0aa0f 100644
--- a/tests/end2end/fixtures/test_quteprocess.py
+++ b/tests/end2end/fixtures/test_quteprocess.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/test_testprocess.py b/tests/end2end/fixtures/test_testprocess.py
index 6ceb032af..5b9979f85 100644
--- a/tests/end2end/fixtures/test_testprocess.py
+++ b/tests/end2end/fixtures/test_testprocess.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/test_webserver.py b/tests/end2end/fixtures/test_webserver.py
index 331c0906d..a59d425e2 100644
--- a/tests/end2end/fixtures/test_webserver.py
+++ b/tests/end2end/fixtures/test_webserver.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index 99ea81337..d0af5bebc 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py
index 93ef04f03..2beb6fb95 100644
--- a/tests/end2end/fixtures/webserver.py
+++ b/tests/end2end/fixtures/webserver.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/webserver_sub.py b/tests/end2end/fixtures/webserver_sub.py
index 6e0b740ba..4ec4619f7 100644
--- a/tests/end2end/fixtures/webserver_sub.py
+++ b/tests/end2end/fixtures/webserver_sub.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/fixtures/webserver_sub_ssl.py b/tests/end2end/fixtures/webserver_sub_ssl.py
index d8a8f1025..41a9c5ace 100644
--- a/tests/end2end/fixtures/webserver_sub_ssl.py
+++ b/tests/end2end/fixtures/webserver_sub_ssl.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/test_dirbrowser.py b/tests/end2end/test_dirbrowser.py
index ea92e2ca2..3702c4ee7 100644
--- a/tests/end2end/test_dirbrowser.py
+++ b/tests/end2end/test_dirbrowser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Daniel Schadt
+# Copyright 2015-2018 Daniel Schadt
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/test_hints_html.py b/tests/end2end/test_hints_html.py
index fb30abefe..abc94d70d 100644
--- a/tests/end2end/test_hints_html.py
+++ b/tests/end2end/test_hints_html.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/test_insert_mode.py b/tests/end2end/test_insert_mode.py
index 746fde50f..690b5d38b 100644
--- a/tests/end2end/test_insert_mode.py
+++ b/tests/end2end/test_insert_mode.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/test_invocations.py b/tests/end2end/test_invocations.py
index ef4808718..4cc8f1b59 100644
--- a/tests/end2end/test_invocations.py
+++ b/tests/end2end/test_invocations.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/end2end/test_mhtml_e2e.py b/tests/end2end/test_mhtml_e2e.py
index 012c2ea2a..78cc9eb81 100644
--- a/tests/end2end/test_mhtml_e2e.py
+++ b/tests/end2end/test_mhtml_e2e.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index 715e0168d..686db4125 100644
--- a/tests/helpers/fixtures.py
+++ b/tests/helpers/fixtures.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/logfail.py b/tests/helpers/logfail.py
index ba7ed24b8..8eee34911 100644
--- a/tests/helpers/logfail.py
+++ b/tests/helpers/logfail.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/messagemock.py b/tests/helpers/messagemock.py
index 6fad75281..39e653719 100644
--- a/tests/helpers/messagemock.py
+++ b/tests/helpers/messagemock.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py
index 3f6a23958..711b1105f 100644
--- a/tests/helpers/stubs.py
+++ b/tests/helpers/stubs.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/test_helper_utils.py b/tests/helpers/test_helper_utils.py
index a783d98f8..a0f3a0885 100644
--- a/tests/helpers/test_helper_utils.py
+++ b/tests/helpers/test_helper_utils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/test_logfail.py b/tests/helpers/test_logfail.py
index 48aaaa201..d84ee4a14 100644
--- a/tests/helpers/test_logfail.py
+++ b/tests/helpers/test_logfail.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/test_stubs.py b/tests/helpers/test_stubs.py
index a5c1d27fb..197148b0c 100644
--- a/tests/helpers/test_stubs.py
+++ b/tests/helpers/test_stubs.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/helpers/utils.py b/tests/helpers/utils.py
index 82c07fbd2..834803f61 100644
--- a/tests/helpers/utils.py
+++ b/tests/helpers/utils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/test_conftest.py b/tests/test_conftest.py
index 74db4bf78..2d94add22 100644
--- a/tests/test_conftest.py
+++ b/tests/test_conftest.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/test_hints.py b/tests/unit/browser/test_hints.py
index 6792d1754..69be5c420 100644
--- a/tests/unit/browser/test_hints.py
+++ b/tests/unit/browser/test_hints.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/test_history.py b/tests/unit/browser/test_history.py
index c5734d34a..43476d7e0 100644
--- a/tests/unit/browser/test_history.py
+++ b/tests/unit/browser/test_history.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/test_qutescheme.py b/tests/unit/browser/test_qutescheme.py
index e7c6cc9eb..39df01389 100644
--- a/tests/unit/browser/test_qutescheme.py
+++ b/tests/unit/browser/test_qutescheme.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Imran Sobir
+# Copyright 2017-2018 Imran Sobir
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/test_shared.py b/tests/unit/browser/test_shared.py
index 7d7da1d13..f24f7ad97 100644
--- a/tests/unit/browser/test_shared.py
+++ b/tests/unit/browser/test_shared.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/test_signalfilter.py b/tests/unit/browser/test_signalfilter.py
index fb4ed474c..18f52a32a 100644
--- a/tests/unit/browser/test_signalfilter.py
+++ b/tests/unit/browser/test_signalfilter.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/test_tab.py b/tests/unit/browser/test_tab.py
index 3fc923b1f..05a178b81 100644
--- a/tests/unit/browser/test_tab.py
+++ b/tests/unit/browser/test_tab.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webengine/test_spell.py b/tests/unit/browser/webengine/test_spell.py
index 9e38c1883..efe62fb20 100644
--- a/tests/unit/browser/webengine/test_spell.py
+++ b/tests/unit/browser/webengine/test_spell.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Michal Siedlaczek <michal.siedlaczek@gmail.com>
+# Copyright 2017-2018 Michal Siedlaczek <michal.siedlaczek@gmail.com>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webengine/test_webenginedownloads.py b/tests/unit/browser/webengine/test_webenginedownloads.py
index 043bed1a5..a34962522 100644
--- a/tests/unit/browser/webengine/test_webenginedownloads.py
+++ b/tests/unit/browser/webengine/test_webenginedownloads.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webengine/test_webenginesettings.py b/tests/unit/browser/webengine/test_webenginesettings.py
index 6c58e29af..995dec44a 100644
--- a/tests/unit/browser/webengine/test_webenginesettings.py
+++ b/tests/unit/browser/webengine/test_webenginesettings.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/http/test_content_disposition.py b/tests/unit/browser/webkit/http/test_content_disposition.py
index 5aa25166e..c85174b6a 100644
--- a/tests/unit/browser/webkit/http/test_content_disposition.py
+++ b/tests/unit/browser/webkit/http/test_content_disposition.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/http/test_http.py b/tests/unit/browser/webkit/http/test_http.py
index 1f9b7d75d..161efd482 100644
--- a/tests/unit/browser/webkit/http/test_http.py
+++ b/tests/unit/browser/webkit/http/test_http.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/http/test_http_hypothesis.py b/tests/unit/browser/webkit/http/test_http_hypothesis.py
index 42290a8f4..ec8ee4aff 100644
--- a/tests/unit/browser/webkit/http/test_http_hypothesis.py
+++ b/tests/unit/browser/webkit/http/test_http_hypothesis.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/network/test_filescheme.py b/tests/unit/browser/webkit/network/test_filescheme.py
index a3f546628..8b3287830 100644
--- a/tests/unit/browser/webkit/network/test_filescheme.py
+++ b/tests/unit/browser/webkit/network/test_filescheme.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Antoni Boucher (antoyo) <bouanto@zoho.com>
+# Copyright 2015-2018 Antoni Boucher (antoyo) <bouanto@zoho.com>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/network/test_networkmanager.py b/tests/unit/browser/webkit/network/test_networkmanager.py
index a8301dde1..cfc268406 100644
--- a/tests/unit/browser/webkit/network/test_networkmanager.py
+++ b/tests/unit/browser/webkit/network/test_networkmanager.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/network/test_networkreply.py b/tests/unit/browser/webkit/network/test_networkreply.py
index 8d24ebab8..6dffa87cf 100644
--- a/tests/unit/browser/webkit/network/test_networkreply.py
+++ b/tests/unit/browser/webkit/network/test_networkreply.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/network/test_pac.py b/tests/unit/browser/webkit/network/test_pac.py
index ea8a7acaf..ff0346411 100644
--- a/tests/unit/browser/webkit/network/test_pac.py
+++ b/tests/unit/browser/webkit/network/test_pac.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/network/test_schemehandler.py b/tests/unit/browser/webkit/network/test_schemehandler.py
index 1f5464a85..24e54e0d9 100644
--- a/tests/unit/browser/webkit/network/test_schemehandler.py
+++ b/tests/unit/browser/webkit/network/test_schemehandler.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/network/test_webkitqutescheme.py b/tests/unit/browser/webkit/network/test_webkitqutescheme.py
index 769ecc751..c1775121e 100644
--- a/tests/unit/browser/webkit/network/test_webkitqutescheme.py
+++ b/tests/unit/browser/webkit/network/test_webkitqutescheme.py
@@ -1,7 +1,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Daniel Schadt
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Daniel Schadt
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_cache.py b/tests/unit/browser/webkit/test_cache.py
index 6a7357eb7..3fcc833d8 100644
--- a/tests/unit/browser/webkit/test_cache.py
+++ b/tests/unit/browser/webkit/test_cache.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 lamarpavel
+# Copyright 2015-2018 lamarpavel
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_cookies.py b/tests/unit/browser/webkit/test_cookies.py
index d8f95ad11..99e6d9edc 100644
--- a/tests/unit/browser/webkit/test_cookies.py
+++ b/tests/unit/browser/webkit/test_cookies.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Alexander Cogneau (acogneau) <alexander.cogneau@gmail.com>:
+# Copyright 2015-2018 Alexander Cogneau (acogneau) <alexander.cogneau@gmail.com>:
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_downloads.py b/tests/unit/browser/webkit/test_downloads.py
index 77a1b0298..da1fcb424 100644
--- a/tests/unit/browser/webkit/test_downloads.py
+++ b/tests/unit/browser/webkit/test_downloads.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_mhtml.py b/tests/unit/browser/webkit/test_mhtml.py
index 230565680..015e90b3f 100644
--- a/tests/unit/browser/webkit/test_mhtml.py
+++ b/tests/unit/browser/webkit/test_mhtml.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Daniel Schadt
+# Copyright 2015-2018 Daniel Schadt
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_qt_javascript.py b/tests/unit/browser/webkit/test_qt_javascript.py
index 72d1f4ce0..901c373c4 100644
--- a/tests/unit/browser/webkit/test_qt_javascript.py
+++ b/tests/unit/browser/webkit/test_qt_javascript.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_tabhistory.py b/tests/unit/browser/webkit/test_tabhistory.py
index 67602db4c..84a535fa0 100644
--- a/tests/unit/browser/webkit/test_tabhistory.py
+++ b/tests/unit/browser/webkit/test_tabhistory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/browser/webkit/test_webkitelem.py b/tests/unit/browser/webkit/test_webkitelem.py
index 35b9c354b..df3de6310 100644
--- a/tests/unit/browser/webkit/test_webkitelem.py
+++ b/tests/unit/browser/webkit/test_webkitelem.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/commands/test_argparser.py b/tests/unit/commands/test_argparser.py
index 00f000acb..624306ded 100644
--- a/tests/unit/commands/test_argparser.py
+++ b/tests/unit/commands/test_argparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/commands/test_cmdutils.py b/tests/unit/commands/test_cmdutils.py
index ca751074d..66233c052 100644
--- a/tests/unit/commands/test_cmdutils.py
+++ b/tests/unit/commands/test_cmdutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/commands/test_runners.py b/tests/unit/commands/test_runners.py
index 0cbcd37a5..db831bd7e 100644
--- a/tests/unit/commands/test_runners.py
+++ b/tests/unit/commands/test_runners.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/commands/test_userscripts.py b/tests/unit/commands/test_userscripts.py
index 3b6a69710..cfbfa0a86 100644
--- a/tests/unit/commands/test_userscripts.py
+++ b/tests/unit/commands/test_userscripts.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/completion/test_completer.py b/tests/unit/completion/test_completer.py
index 4b39b7032..ecb58f3ec 100644
--- a/tests/unit/completion/test_completer.py
+++ b/tests/unit/completion/test_completer.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/completion/test_completionmodel.py b/tests/unit/completion/test_completionmodel.py
index b0775428f..e0e044ffb 100644
--- a/tests/unit/completion/test_completionmodel.py
+++ b/tests/unit/completion/test_completionmodel.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2017-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/completion/test_completionwidget.py b/tests/unit/completion/test_completionwidget.py
index ba6e40e4a..01bd3ec03 100644
--- a/tests/unit/completion/test_completionwidget.py
+++ b/tests/unit/completion/test_completionwidget.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/completion/test_histcategory.py b/tests/unit/completion/test_histcategory.py
index e42f9b91f..d03098090 100644
--- a/tests/unit/completion/test_histcategory.py
+++ b/tests/unit/completion/test_histcategory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/completion/test_listcategory.py b/tests/unit/completion/test_listcategory.py
index 10cde7a60..36ea74e41 100644
--- a/tests/unit/completion/test_listcategory.py
+++ b/tests/unit/completion/test_listcategory.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2017-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/completion/test_models.py b/tests/unit/completion/test_models.py
index 1a0fe57b0..ff9a24112 100644
--- a/tests/unit/completion/test_models.py
+++ b/tests/unit/completion/test_models.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index d8bf73700..1d1e1fc70 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py
index 92796e8e5..f98f09ca8 100644
--- a/tests/unit/config/test_configcommands.py
+++ b/tests/unit/config/test_configcommands.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_configdata.py b/tests/unit/config/test_configdata.py
index b7e960ac6..595dbb90b 100644
--- a/tests/unit/config/test_configdata.py
+++ b/tests/unit/config/test_configdata.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_configexc.py b/tests/unit/config/test_configexc.py
index 8fd99a9c7..f415ed2fb 100644
--- a/tests/unit/config/test_configexc.py
+++ b/tests/unit/config/test_configexc.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index e195f720c..d0f1ff0ee 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_configinit.py b/tests/unit/config/test_configinit.py
index 79ac43219..a845f84f2 100644
--- a/tests/unit/config/test_configinit.py
+++ b/tests/unit/config/test_configinit.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/config/test_configtypes.py b/tests/unit/config/test_configtypes.py
index 556b3f9e2..81a7d53e1 100644
--- a/tests/unit/config/test_configtypes.py
+++ b/tests/unit/config/test_configtypes.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/javascript/conftest.py b/tests/unit/javascript/conftest.py
index c5c384c26..254ead335 100644
--- a/tests/unit/javascript/conftest.py
+++ b/tests/unit/javascript/conftest.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/javascript/position_caret/test_position_caret.py b/tests/unit/javascript/position_caret/test_position_caret.py
index fcfa5cf5d..c47f94e30 100644
--- a/tests/unit/javascript/position_caret/test_position_caret.py
+++ b/tests/unit/javascript/position_caret/test_position_caret.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/javascript/stylesheet/test_stylesheet.py b/tests/unit/javascript/stylesheet/test_stylesheet.py
index 083265db7..d640e8a19 100644
--- a/tests/unit/javascript/stylesheet/test_stylesheet.py
+++ b/tests/unit/javascript/stylesheet/test_stylesheet.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Jay Kamat
+# Copyright 2017-2018 Jay Kamat
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/javascript/test_greasemonkey.py b/tests/unit/javascript/test_greasemonkey.py
index 1aaa3380f..52af51a4b 100644
--- a/tests/unit/javascript/test_greasemonkey.py
+++ b/tests/unit/javascript/test_greasemonkey.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/keyinput/conftest.py b/tests/unit/keyinput/conftest.py
index 684e5792e..0713c5d26 100644
--- a/tests/unit/keyinput/conftest.py
+++ b/tests/unit/keyinput/conftest.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>:
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>:
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/keyinput/test_basekeyparser.py b/tests/unit/keyinput/test_basekeyparser.py
index c4ce838da..423076bdd 100644
--- a/tests/unit/keyinput/test_basekeyparser.py
+++ b/tests/unit/keyinput/test_basekeyparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>:
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>:
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/keyinput/test_modeman.py b/tests/unit/keyinput/test_modeman.py
index 5185636a6..221b675be 100644
--- a/tests/unit/keyinput/test_modeman.py
+++ b/tests/unit/keyinput/test_modeman.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/keyinput/test_modeparsers.py b/tests/unit/keyinput/test_modeparsers.py
index 4d2024eac..ade8c15cc 100644
--- a/tests/unit/keyinput/test_modeparsers.py
+++ b/tests/unit/keyinput/test_modeparsers.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>:
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>:
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/statusbar/test_backforward.py b/tests/unit/mainwindow/statusbar/test_backforward.py
index 6a3df1947..b355fcfdf 100644
--- a/tests/unit/mainwindow/statusbar/test_backforward.py
+++ b/tests/unit/mainwindow/statusbar/test_backforward.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/statusbar/test_percentage.py b/tests/unit/mainwindow/statusbar/test_percentage.py
index 6622b06f4..91de051d1 100644
--- a/tests/unit/mainwindow/statusbar/test_percentage.py
+++ b/tests/unit/mainwindow/statusbar/test_percentage.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/statusbar/test_progress.py b/tests/unit/mainwindow/statusbar/test_progress.py
index bada52c12..763ea1059 100644
--- a/tests/unit/mainwindow/statusbar/test_progress.py
+++ b/tests/unit/mainwindow/statusbar/test_progress.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/statusbar/test_tabindex.py b/tests/unit/mainwindow/statusbar/test_tabindex.py
index 99b5d9114..352089099 100644
--- a/tests/unit/mainwindow/statusbar/test_tabindex.py
+++ b/tests/unit/mainwindow/statusbar/test_tabindex.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/statusbar/test_textbase.py b/tests/unit/mainwindow/statusbar/test_textbase.py
index b976f5c6f..c73a87831 100644
--- a/tests/unit/mainwindow/statusbar/test_textbase.py
+++ b/tests/unit/mainwindow/statusbar/test_textbase.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/statusbar/test_url.py b/tests/unit/mainwindow/statusbar/test_url.py
index 096cb3fee..bda51b504 100644
--- a/tests/unit/mainwindow/statusbar/test_url.py
+++ b/tests/unit/mainwindow/statusbar/test_url.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Clayton Craft (craftyguy) <craftyguy@gmail.com>
+# Copyright 2016-2018 Clayton Craft (craftyguy) <craftyguy@gmail.com>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/test_messageview.py b/tests/unit/mainwindow/test_messageview.py
index 6c9d767c5..64468bcfb 100644
--- a/tests/unit/mainwindow/test_messageview.py
+++ b/tests/unit/mainwindow/test_messageview.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/test_prompt.py b/tests/unit/mainwindow/test_prompt.py
index 76886d340..eb0ba9e69 100644
--- a/tests/unit/mainwindow/test_prompt.py
+++ b/tests/unit/mainwindow/test_prompt.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/mainwindow/test_tabwidget.py b/tests/unit/mainwindow/test_tabwidget.py
index dd87c7ce2..1f0ff55d5 100644
--- a/tests/unit/mainwindow/test_tabwidget.py
+++ b/tests/unit/mainwindow/test_tabwidget.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Daniel Schadt
+# Copyright 2015-2018 Daniel Schadt
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_autoupdate.py b/tests/unit/misc/test_autoupdate.py
index d803e4877..4f5a9dc0e 100644
--- a/tests/unit/misc/test_autoupdate.py
+++ b/tests/unit/misc/test_autoupdate.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Alexander Cogneau (acogneau) <alexander.cogneau@gmail.com>:
+# Copyright 2015-2018 Alexander Cogneau (acogneau) <alexander.cogneau@gmail.com>:
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_checkpyver.py b/tests/unit/misc/test_checkpyver.py
index b61fadc59..17e910a5f 100644
--- a/tests/unit/misc/test_checkpyver.py
+++ b/tests/unit/misc/test_checkpyver.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 # This file is part of qutebrowser.
diff --git a/tests/unit/misc/test_cmdhistory.py b/tests/unit/misc/test_cmdhistory.py
index 0e6f9748e..8204feb0e 100644
--- a/tests/unit/misc/test_cmdhistory.py
+++ b/tests/unit/misc/test_cmdhistory.py
@@ -1,7 +1,7 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Alexander Cogneau (acogneau) <alexander.cogneau@gmail.com>
-# Copyright 2015-2017 Florian Bruhin (The-Compiler) <me@the-compiler.org>
+# Copyright 2015-2018 Alexander Cogneau (acogneau) <alexander.cogneau@gmail.com>
+# Copyright 2015-2018 Florian Bruhin (The-Compiler) <me@the-compiler.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_crashdialog.py b/tests/unit/misc/test_crashdialog.py
index f8768e806..ccaf6dac5 100644
--- a/tests/unit/misc/test_crashdialog.py
+++ b/tests/unit/misc/test_crashdialog.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_earlyinit.py b/tests/unit/misc/test_earlyinit.py
index fa63dc5b0..0882e610f 100644
--- a/tests/unit/misc/test_earlyinit.py
+++ b/tests/unit/misc/test_earlyinit.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The-Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The-Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 7dea6e069..e334b2645 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py
index 78c55bf98..329dc2ae0 100644
--- a/tests/unit/misc/test_guiprocess.py
+++ b/tests/unit/misc/test_guiprocess.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py
index fdb03cfd9..73a9b4f12 100644
--- a/tests/unit/misc/test_ipc.py
+++ b/tests/unit/misc/test_ipc.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_keyhints.py b/tests/unit/misc/test_keyhints.py
index 3e94f1271..c45913a2a 100644
--- a/tests/unit/misc/test_keyhints.py
+++ b/tests/unit/misc/test_keyhints.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_lineparser.py b/tests/unit/misc/test_lineparser.py
index 0c78035b7..c3624cc1d 100644
--- a/tests/unit/misc/test_lineparser.py
+++ b/tests/unit/misc/test_lineparser.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_miscwidgets.py b/tests/unit/misc/test_miscwidgets.py
index 1ee351a81..ccf3b5593 100644
--- a/tests/unit/misc/test_miscwidgets.py
+++ b/tests/unit/misc/test_miscwidgets.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_msgbox.py b/tests/unit/misc/test_msgbox.py
index 783816011..e2fd7bffe 100644
--- a/tests/unit/misc/test_msgbox.py
+++ b/tests/unit/misc/test_msgbox.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 # This file is part of qutebrowser.
diff --git a/tests/unit/misc/test_objects.py b/tests/unit/misc/test_objects.py
index 7de92b12d..8d3c934c8 100644
--- a/tests/unit/misc/test_objects.py
+++ b/tests/unit/misc/test_objects.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_pastebin.py b/tests/unit/misc/test_pastebin.py
index a0be9eb39..b352f52c8 100644
--- a/tests/unit/misc/test_pastebin.py
+++ b/tests/unit/misc/test_pastebin.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Anna Kobak (avk) <awerk@onet.eu>:
+# Copyright 2016-2018 Anna Kobak (avk) <awerk@onet.eu>:
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_readline.py b/tests/unit/misc/test_readline.py
index 4b58cccec..6aedc0951 100644
--- a/tests/unit/misc/test_readline.py
+++ b/tests/unit/misc/test_readline.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_sessions.py b/tests/unit/misc/test_sessions.py
index b2cb8a3dd..b9fcaf571 100644
--- a/tests/unit/misc/test_sessions.py
+++ b/tests/unit/misc/test_sessions.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_split.py b/tests/unit/misc/test_split.py
index eff6d2269..fa26e94e8 100644
--- a/tests/unit/misc/test_split.py
+++ b/tests/unit/misc/test_split.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_split_hypothesis.py b/tests/unit/misc/test_split_hypothesis.py
index c63ddff09..c8d6d5147 100644
--- a/tests/unit/misc/test_split_hypothesis.py
+++ b/tests/unit/misc/test_split_hypothesis.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_sql.py b/tests/unit/misc/test_sql.py
index 048826513..050359b47 100644
--- a/tests/unit/misc/test_sql.py
+++ b/tests/unit/misc/test_sql.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
+# Copyright 2016-2018 Ryan Roden-Corrent (rcorre) <ryan@rcorre.net>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/misc/test_utilcmds.py b/tests/unit/misc/test_utilcmds.py
index 9c679774a..c63c7bf86 100644
--- a/tests/unit/misc/test_utilcmds.py
+++ b/tests/unit/misc/test_utilcmds.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/scripts/test_check_coverage.py b/tests/unit/scripts/test_check_coverage.py
index d7183111f..026479e38 100644
--- a/tests/unit/scripts/test_check_coverage.py
+++ b/tests/unit/scripts/test_check_coverage.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/scripts/test_dictcli.py b/tests/unit/scripts/test_dictcli.py
index 3471251ba..4df65ead6 100644
--- a/tests/unit/scripts/test_dictcli.py
+++ b/tests/unit/scripts/test_dictcli.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Michal Siedlaczek <michal.siedlaczek@gmail.com>
+# Copyright 2017-2018 Michal Siedlaczek <michal.siedlaczek@gmail.com>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/scripts/test_importer.py b/tests/unit/scripts/test_importer.py
index 7c9ada1c4..ada0d886c 100644
--- a/tests/unit/scripts/test_importer.py
+++ b/tests/unit/scripts/test_importer.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2017-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/scripts/test_run_vulture.py b/tests/unit/scripts/test_run_vulture.py
index 2d66d185d..c33a7f616 100644
--- a/tests/unit/scripts/test_run_vulture.py
+++ b/tests/unit/scripts/test_run_vulture.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/test_app.py b/tests/unit/test_app.py
index 080399ecc..1c2341d2b 100644
--- a/tests/unit/test_app.py
+++ b/tests/unit/test_app.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/overflow_test_cases.py b/tests/unit/utils/overflow_test_cases.py
index 450522d6b..c13f3da5c 100644
--- a/tests/unit/utils/overflow_test_cases.py
+++ b/tests/unit/utils/overflow_test_cases.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_debug.py b/tests/unit/utils/test_debug.py
index b7b5cf3ca..518bf9b4a 100644
--- a/tests/unit/utils/test_debug.py
+++ b/tests/unit/utils/test_debug.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 #
diff --git a/tests/unit/utils/test_error.py b/tests/unit/utils/test_error.py
index 43ebc01b7..951aa21f6 100644
--- a/tests/unit/utils/test_error.py
+++ b/tests/unit/utils/test_error.py
@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 # This file is part of qutebrowser.
diff --git a/tests/unit/utils/test_javascript.py b/tests/unit/utils/test_javascript.py
index 82974876f..864483bf0 100644
--- a/tests/unit/utils/test_javascript.py
+++ b/tests/unit/utils/test_javascript.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py
index 1278d7bc1..f47155f91 100644
--- a/tests/unit/utils/test_jinja.py
+++ b/tests/unit/utils/test_jinja.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
 #
diff --git a/tests/unit/utils/test_log.py b/tests/unit/utils/test_log.py
index fb2723cc6..f7b954052 100644
--- a/tests/unit/utils/test_log.py
+++ b/tests/unit/utils/test_log.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_qtutils.py b/tests/unit/utils/test_qtutils.py
index b817eeed0..6de085b25 100644
--- a/tests/unit/utils/test_qtutils.py
+++ b/tests/unit/utils/test_qtutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py
index e13b5e917..c95e83c41 100644
--- a/tests/unit/utils/test_standarddir.py
+++ b/tests/unit/utils/test_standarddir.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_urlutils.py b/tests/unit/utils/test_urlutils.py
index d7f009a37..6621edfed 100644
--- a/tests/unit/utils/test_urlutils.py
+++ b/tests/unit/utils/test_urlutils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py
index 28837e93c..4b8c50813 100644
--- a/tests/unit/utils/test_utils.py
+++ b/tests/unit/utils/test_utils.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index aa9df5419..da65422a7 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/usertypes/test_misc.py b/tests/unit/utils/usertypes/test_misc.py
index d21816ace..631321278 100644
--- a/tests/unit/utils/usertypes/test_misc.py
+++ b/tests/unit/utils/usertypes/test_misc.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2016-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/usertypes/test_neighborlist.py b/tests/unit/utils/usertypes/test_neighborlist.py
index 804ed51ed..7ee1725c2 100644
--- a/tests/unit/utils/usertypes/test_neighborlist.py
+++ b/tests/unit/utils/usertypes/test_neighborlist.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/usertypes/test_question.py b/tests/unit/utils/usertypes/test_question.py
index ebb209326..20569aab1 100644
--- a/tests/unit/utils/usertypes/test_question.py
+++ b/tests/unit/utils/usertypes/test_question.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
diff --git a/tests/unit/utils/usertypes/test_timer.py b/tests/unit/utils/usertypes/test_timer.py
index 81ea6feae..2ead0dc60 100644
--- a/tests/unit/utils/usertypes/test_timer.py
+++ b/tests/unit/utils/usertypes/test_timer.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2015-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2015-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #

From 8fc88a68fb4dc28efca19d40de5eac9879f5f72a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:13 +0100
Subject: [PATCH 146/229] Update codecov from 2.0.14 to 2.0.15

---
 misc/requirements/requirements-codecov.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt
index 26008b77b..d0b277af5 100644
--- a/misc/requirements/requirements-codecov.txt
+++ b/misc/requirements/requirements-codecov.txt
@@ -2,7 +2,7 @@
 
 certifi==2018.1.18
 chardet==3.0.4
-codecov==2.0.14
+codecov==2.0.15
 coverage==4.4.2
 idna==2.6
 requests==2.18.4

From 075dd8e0a45fdbf5a434742680784820796a1436 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:15 +0100
Subject: [PATCH 147/229] Update coverage from 4.4.2 to 4.5

---
 misc/requirements/requirements-codecov.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt
index d0b277af5..df27fc428 100644
--- a/misc/requirements/requirements-codecov.txt
+++ b/misc/requirements/requirements-codecov.txt
@@ -3,7 +3,7 @@
 certifi==2018.1.18
 chardet==3.0.4
 codecov==2.0.15
-coverage==4.4.2
+coverage==4.5
 idna==2.6
 requests==2.18.4
 urllib3==1.22

From cfcd1bba1e00e9a22e83539258a7f7ca90c89e0e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:16 +0100
Subject: [PATCH 148/229] Update coverage from 4.4.2 to 4.5

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 0bd38e349..874d5ef06 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -5,7 +5,7 @@ beautifulsoup4==4.6.0
 cheroot==6.0.0
 click==6.7
 # colorama==0.3.9
-coverage==4.4.2
+coverage==4.5
 EasyProcess==0.2.3
 fields==5.0.0
 Flask==0.12.2

From 46b85c11f130831baf3dbc5c63072c784d247f7c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:18 +0100
Subject: [PATCH 149/229] Update flake8-bugbear from 17.12.0 to 18.2.0

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 0ae43d663..5a43e66d1 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -2,7 +2,7 @@
 
 attrs==17.4.0
 flake8==3.5.0
-flake8-bugbear==17.12.0
+flake8-bugbear==18.2.0
 flake8-builtins==1.0.post0
 flake8-comprehensions==1.4.1
 flake8-copyright==0.2.0

From d3050d73ba16d799debdbe6a1f6404b980db0066 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:19 +0100
Subject: [PATCH 150/229] Update setuptools from 38.4.0 to 38.5.0

---
 misc/requirements/requirements-pip.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt
index 54cacc3c3..bd9654b1b 100644
--- a/misc/requirements/requirements-pip.txt
+++ b/misc/requirements/requirements-pip.txt
@@ -3,6 +3,6 @@
 appdirs==1.4.3
 packaging==16.8
 pyparsing==2.2.0
-setuptools==38.4.0
+setuptools==38.5.0
 six==1.11.0
 wheel==0.30.0

From 417a114a94e9ed427f9d561409c22eec1595e290 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:21 +0100
Subject: [PATCH 151/229] Update isort from 4.2.15 to 4.3.2

---
 misc/requirements/requirements-pylint-master.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint-master.txt b/misc/requirements/requirements-pylint-master.txt
index 5a414b3db..d23d2ea57 100644
--- a/misc/requirements/requirements-pylint-master.txt
+++ b/misc/requirements/requirements-pylint-master.txt
@@ -5,7 +5,7 @@ certifi==2018.1.18
 chardet==3.0.4
 github3.py==0.9.6
 idna==2.6
-isort==4.2.15
+isort==4.3.2
 lazy-object-proxy==1.3.1
 mccabe==0.6.1
 -e git+https://github.com/PyCQA/pylint.git#egg=pylint

From 8579616fea8a88375057c2332a78e36b30a76205 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:23 +0100
Subject: [PATCH 152/229] Update isort from 4.2.15 to 4.3.2

---
 misc/requirements/requirements-pylint.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index b5aab6354..cc9d099f3 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -5,7 +5,7 @@ certifi==2018.1.18
 chardet==3.0.4
 github3.py==0.9.6
 idna==2.6
-isort==4.2.15
+isort==4.3.2
 lazy-object-proxy==1.3.1
 mccabe==0.6.1
 pylint==1.8.1

From 08ea34174cb3b114bc0f9e70f57ae94c6cf1ebd6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:24 +0100
Subject: [PATCH 153/229] Update astroid from 1.6.0 to 1.6.1

---
 misc/requirements/requirements-pylint.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index cc9d099f3..756a19047 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-astroid==1.6.0
+astroid==1.6.1
 certifi==2018.1.18
 chardet==3.0.4
 github3.py==0.9.6

From 4a9cbf8930fe8ab2bf644bb897ccbb08b7443749 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:26 +0100
Subject: [PATCH 154/229] Update pylint from 1.8.1 to 1.8.2

---
 misc/requirements/requirements-pylint.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index 756a19047..e86be34e2 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -8,7 +8,7 @@ idna==2.6
 isort==4.3.2
 lazy-object-proxy==1.3.1
 mccabe==0.6.1
-pylint==1.8.1
+pylint==1.8.2
 ./scripts/dev/pylint_checkers
 requests==2.18.4
 six==1.11.0

From 67623930dd98d8f850596e86d731ebb32f7b2741 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:27 +0100
Subject: [PATCH 155/229] Update pyqt5 from 5.9.2 to 5.10

---
 misc/requirements/requirements-pyqt.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 5a08f2f73..49d240f95 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.9.2
+PyQt5==5.10
 sip==4.19.6

From fac666e607666b6d09019b8feb4efea65b01a3db Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:29 +0100
Subject: [PATCH 156/229] Update sip from 4.19.6 to 4.19.7

---
 misc/requirements/requirements-pyqt.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 49d240f95..99ba1b7cc 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
 PyQt5==5.10
-sip==4.19.6
+sip==4.19.7

From 8ee3c743e4d784204f2262495bcd789c6f95e8a8 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:30 +0100
Subject: [PATCH 157/229] Update hypothesis from 3.44.21 to 3.44.25

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 874d5ef06..a638c4b19 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==0.12.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.44.21
+hypothesis==3.44.25
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7

From 782ec573ab429ae348355f0e213c33992f99a263 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:32 +0100
Subject: [PATCH 158/229] Update pytest from 3.3.1 to 3.4.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index a638c4b19..8b5dce6d2 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -21,7 +21,7 @@ parse-type==0.4.2
 pluggy==0.6.0
 py==1.5.2
 py-cpuinfo==3.3.0
-pytest==3.3.1  # rq.filter: != 3.3.2
+pytest==3.4.0  # rq.filter: != 3.3.2
 pytest-bdd==2.19.0
 pytest-benchmark==3.1.1
 pytest-cov==2.5.1

From 9eefbf24a25a96fcd50c0bf9268eea381e391c2a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Feb 2018 16:59:33 +0100
Subject: [PATCH 159/229] Update pytest-bdd from 2.19.0 to 2.20.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 8b5dce6d2..1752f08c7 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -22,7 +22,7 @@ pluggy==0.6.0
 py==1.5.2
 py-cpuinfo==3.3.0
 pytest==3.4.0  # rq.filter: != 3.3.2
-pytest-bdd==2.19.0
+pytest-bdd==2.20.0
 pytest-benchmark==3.1.1
 pytest-cov==2.5.1
 pytest-faulthandler==1.3.1

From 8c39e8f7649e703eaf8f12ed204df3623bbbbe7d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 6 Feb 2018 14:13:06 +0100
Subject: [PATCH 160/229] Update changelog

[ci skip]
---
 doc/changelog.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 8e943d2c7..3f3b53287 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -36,7 +36,7 @@ Changed
 - `:tab-only` with pinned tabs now still closes unpinned tabs.
 - GreaseMonkey `@include` and `@exclude` now support
   regex matches. With QtWebEngine and Qt 5.8 and newer, Qt handles the matching,
-  but similar functionality will likely land in Qt 5.11.
+  but similar functionality was added in Qt 5.11.
 - The sqlite history now uses write-ahead logging which should be
   a performance and stability improvement.
 - The `url.incdec_segments` option now also can take `port` as possible segment.

From 26810e02c1b36a904e9bff55856b820c80c3eb04 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 6 Feb 2018 17:22:59 +0000
Subject: [PATCH 161/229] Add a way to view source in editor

---
 qutebrowser/browser/commands.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 0ebcf3240..08bbdedf0 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1505,7 +1505,7 @@ class CommandDispatcher:
             )
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
-    def view_source(self):
+    def view_source(self, edit=False):
         """Show the source of the current page in a new tab."""
         tab = self._current_widget()
         try:
@@ -1515,8 +1515,12 @@ class CommandDispatcher:
             return
         if current_url.scheme() == 'view-source':
             raise cmdexc.CommandError("Already viewing source!")
+        if editor:
+            ed = editor.ExternalEditor(self._tabbed_browser)
 
-        tab.action.show_source()
+            tab._widget.page().toHtml(ed.edit)
+        else:
+            tab.action.show_source()
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        debug=True)

From 0893e3a03813a71677930e0af69ddab7cf276c18 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 6 Feb 2018 17:35:24 +0000
Subject: [PATCH 162/229] Fix boolean variable name

---
 qutebrowser/browser/commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 08bbdedf0..1c08cede6 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1515,7 +1515,7 @@ class CommandDispatcher:
             return
         if current_url.scheme() == 'view-source':
             raise cmdexc.CommandError("Already viewing source!")
-        if editor:
+        if edit:
             ed = editor.ExternalEditor(self._tabbed_browser)
 
             tab._widget.page().toHtml(ed.edit)

From 9c471287998ec4ea3f1665dfaec1c56b1a0edfc3 Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 6 Feb 2018 18:25:15 +0000
Subject: [PATCH 163/229] Use provided methods instead of protected members

---
 qutebrowser/browser/browsertab.py | 2 +-
 qutebrowser/browser/commands.py   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 1a514f4a3..02048473d 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -806,7 +806,7 @@ class AbstractTab(QWidget):
         raise NotImplementedError
 
     def dump_async(self, callback, *, plain=False):
-        """Dump the current page to a file ascync.
+        """Dump the current page's html asynchronously.
 
         The given callback will be called with the result when dumping is
         complete.
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 1c08cede6..3063c8cda 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1515,10 +1515,10 @@ class CommandDispatcher:
             return
         if current_url.scheme() == 'view-source':
             raise cmdexc.CommandError("Already viewing source!")
+
         if edit:
             ed = editor.ExternalEditor(self._tabbed_browser)
-
-            tab._widget.page().toHtml(ed.edit)
+            tab.dump_async(ed.edit)
         else:
             tab.action.show_source()
 

From 5ceecc2b045c40f0ce2f0fcfd7c37409b73ac64a Mon Sep 17 00:00:00 2001
From: George Edward Bulmer <gebulmer@googlemail.com>
Date: Tue, 6 Feb 2018 18:53:45 +0000
Subject: [PATCH 164/229] Add docstring for new argument

---
 qutebrowser/browser/commands.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 3063c8cda..460467848 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1506,7 +1506,10 @@ class CommandDispatcher:
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
     def view_source(self, edit=False):
-        """Show the source of the current page in a new tab."""
+        """Show the source of the current page in a new tab.
+
+        Args:
+            edit: Open source in editor instead of tab."""
         tab = self._current_widget()
         try:
             current_url = self._current_url()

From 16375f20d560f2d1fcccc00153168148f1e99a19 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 6 Feb 2018 21:25:08 +0100
Subject: [PATCH 165/229] Always use JavaScript to get selection

It looks like getting the selection via the widget has issues even with Qt 5.10.

On Windows, we always get wrong results.

On Linux, it seems to be flaky. I first thought this was because of a race
between JavaScript setting the selection and Qt getting it, as now we don't use
JS to get the selection anymore, so it's possible that we get it before the
older JS code finished running. However, even calling selectedText() from a JS
callback didn't seem to help...

Since has_selection also is flawed and it taking a callback would make code more
complex as well, let's just assume there is a selection if the text is not
empty. In fact, that is exactly what QtWebEngine does for hasSelection anyways!

Fixes #3523
---
 qutebrowser/browser/browsertab.py             |  3 ---
 qutebrowser/browser/commands.py               |  4 ++--
 qutebrowser/browser/webengine/webenginetab.py | 21 ++++++-------------
 qutebrowser/browser/webkit/webkittab.py       |  7 ++-----
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 1a514f4a3..add08e66f 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -392,9 +392,6 @@ class AbstractCaret(QObject):
     def drop_selection(self):
         raise NotImplementedError
 
-    def has_selection(self):
-        raise NotImplementedError
-
     def selection(self, html=False, callback=None):
         raise NotImplementedError
 
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 0ebcf3240..57f6cce47 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -853,7 +853,7 @@ class CommandDispatcher:
             what = 'URL'  # For printing
         elif what == 'selection':
             def _selection_callback(s):
-                if not self._current_widget().caret.has_selection() or not s:
+                if not s:
                     message.info("Nothing to yank")
                     return
                 self._yank_to_target(s, sel, what, keep)
@@ -1267,7 +1267,7 @@ class CommandDispatcher:
             env['QUTE_TITLE'] = self._tabbed_browser.page_title(idx)
 
         tab = self._tabbed_browser.currentWidget()
-        if tab is not None and tab.caret.has_selection():
+        if tab is not None:
             env['QUTE_SELECTED_TEXT'] = selection
             try:
                 env['QUTE_SELECTED_HTML'] = tab.caret.selection(html=True)
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index ecbe81922..c90481c21 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -289,24 +289,15 @@ class WebEngineCaret(browsertab.AbstractCaret):
     def drop_selection(self):
         self._js_call('dropSelection')
 
-    def has_selection(self):
-        if qtutils.version_check('5.10'):
-            return self._widget.hasSelection()
-        else:
-            # WORKAROUND for
-            # https://bugreports.qt.io/browse/QTBUG-53134
-            return True
-
     def selection(self, html=False, callback=None):
         if html:
             raise browsertab.UnsupportedOperationError
-        if qtutils.version_check('5.10'):
-            callback(self._widget.selectedText())
-        else:
-            # WORKAROUND for
-            # https://bugreports.qt.io/browse/QTBUG-53134
-            self._tab.run_js_async(
-                javascript.assemble('caret', 'getSelection'), callback)
+        # Not using selectedText() as WORKAROUND for
+        # https://bugreports.qt.io/browse/QTBUG-53134
+        # Even on Qt 5.10 selectedText() seems to work poorly, see
+        # https://github.com/qutebrowser/qutebrowser/issues/3523
+        self._tab.run_js_async(javascript.assemble('caret', 'getSelection'),
+                               callback)
 
     def _follow_selected_cb(self, js_elem, tab=False):
         """Callback for javascript which clicks the selected element.
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 4ad177a2a..a493ce495 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -360,9 +360,6 @@ class WebKitCaret(browsertab.AbstractCaret):
     def drop_selection(self):
         self._widget.triggerPageAction(QWebPage.MoveToNextChar)
 
-    def has_selection(self):
-        return self._widget.hasSelection()
-
     def selection(self, html=False, callback=False):
         callback(self._selection(html))
 
@@ -373,8 +370,6 @@ class WebKitCaret(browsertab.AbstractCaret):
             return self._widget.selectedText()
 
     def follow_selected(self, *, tab=False):
-        if not self.has_selection():
-            return
         if QWebSettings.globalSettings().testAttribute(
                 QWebSettings.JavascriptEnabled):
             if tab:
@@ -383,6 +378,8 @@ class WebKitCaret(browsertab.AbstractCaret):
                 'window.getSelection().anchorNode.parentNode.click()')
         else:
             selection = self._selection(html=True)
+            if not selection:
+                return
             try:
                 selected_element = xml.etree.ElementTree.fromstring(
                     '<html>{}</html>'.format(selection)).find('a')

From ce8d15d2b01d1df0c0f291b10828eab4aa142511 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 6 Feb 2018 22:48:00 +0100
Subject: [PATCH 166/229] Simplify selection handling and remove
 QUTE_SELECTED_HTML

It was broken at least since caret support was introduced and it was only
available for QtWebKit anyways, so let's just drop it. This also makes the tab
API a bit simpler.
---
 doc/changelog.asciidoc                        |  6 ++++++
 doc/userscripts.asciidoc                      |  2 --
 qutebrowser/browser/browsertab.py             |  2 +-
 qutebrowser/browser/commands.py               | 10 ++--------
 qutebrowser/browser/webengine/webenginetab.py |  4 +---
 qutebrowser/browser/webkit/webkittab.py       | 14 ++++----------
 6 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 3f3b53287..448aa1be3 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -55,6 +55,12 @@ Fixed
 - `:bookmark-add "" foo` can now be used to save the current URL with a custom
   title.
 
+Removed
+~~~~~~~
+
+- `QUTE_SELECTED_HTML` is now not set for userscripts anymore except when called
+  via hints.
+
 v1.1.1
 ------
 
diff --git a/doc/userscripts.asciidoc b/doc/userscripts.asciidoc
index 7f43e969b..c2f35b026 100644
--- a/doc/userscripts.asciidoc
+++ b/doc/userscripts.asciidoc
@@ -45,8 +45,6 @@ In `command` mode:
 - `QUTE_URL`: The current URL.
 - `QUTE_TITLE`: The title of the current page.
 - `QUTE_SELECTED_TEXT`: The text currently selected on the page.
-- `QUTE_SELECTED_HTML` The HTML currently selected on the page (not supported
-  with QtWebEngine).
 
 In `hints` mode:
 
diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index add08e66f..e0435587e 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -392,7 +392,7 @@ class AbstractCaret(QObject):
     def drop_selection(self):
         raise NotImplementedError
 
-    def selection(self, html=False, callback=None):
+    def selection(self, callback=None):
         raise NotImplementedError
 
     def follow_selected(self, *, tab=False):
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 57f6cce47..7be7937a0 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1260,21 +1260,15 @@ class CommandDispatcher:
         """
         env = {
             'QUTE_MODE': 'command',
+            'QUTE_SELECTED_TEXT': selection,
         }
 
         idx = self._current_index()
         if idx != -1:
             env['QUTE_TITLE'] = self._tabbed_browser.page_title(idx)
 
-        tab = self._tabbed_browser.currentWidget()
-        if tab is not None:
-            env['QUTE_SELECTED_TEXT'] = selection
-            try:
-                env['QUTE_SELECTED_HTML'] = tab.caret.selection(html=True)
-            except browsertab.UnsupportedOperationError:
-                pass
-
         # FIXME:qtwebengine: If tab is None, run_async will fail!
+        tab = self._tabbed_browser.currentWidget()
 
         try:
             url = self._tabbed_browser.current_url()
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index c90481c21..f42f01c24 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -289,9 +289,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
     def drop_selection(self):
         self._js_call('dropSelection')
 
-    def selection(self, html=False, callback=None):
-        if html:
-            raise browsertab.UnsupportedOperationError
+    def selection(self, callback=None):
         # Not using selectedText() as WORKAROUND for
         # https://bugreports.qt.io/browse/QTBUG-53134
         # Even on Qt 5.10 selectedText() seems to work poorly, see
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index a493ce495..6c1698c85 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -188,7 +188,7 @@ class WebKitCaret(browsertab.AbstractCaret):
 
         settings = self._widget.settings()
         settings.setAttribute(QWebSettings.CaretBrowsingEnabled, True)
-        self.selection_enabled = bool(self._selection())
+        self.selection_enabled = self._widget.hasSelection()
 
         if self._widget.isVisible():
             # Sometimes the caret isn't immediately visible, but unfocusing
@@ -360,14 +360,8 @@ class WebKitCaret(browsertab.AbstractCaret):
     def drop_selection(self):
         self._widget.triggerPageAction(QWebPage.MoveToNextChar)
 
-    def selection(self, html=False, callback=False):
-        callback(self._selection(html))
-
-    def _selection(self, html=False):
-        if html:
-            return self._widget.selectedHtml()
-        else:
-            return self._widget.selectedText()
+    def selection(self, callback):
+        callback(self._widget.selectedText())
 
     def follow_selected(self, *, tab=False):
         if QWebSettings.globalSettings().testAttribute(
@@ -377,7 +371,7 @@ class WebKitCaret(browsertab.AbstractCaret):
             self._tab.run_js_async(
                 'window.getSelection().anchorNode.parentNode.click()')
         else:
-            selection = self._selection(html=True)
+            selection = self._widget.selectedHtml()
             if not selection:
                 return
             try:

From 20d5b4e384e812a64b547220f7341c6004c602e5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 6 Feb 2018 23:17:40 +0100
Subject: [PATCH 167/229] Update pytest log handling

In pytest 3.4, we now need to explicitly set the log level and caplog.at_level
now sets the level of the root handler.
---
 pytest.ini               |  1 +
 tests/helpers/logfail.py | 12 +-----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index 4fefa0f77..56cd808ad 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,5 @@
 [pytest]
+log_level = NOTSET
 addopts = --strict -rfEw --faulthandler-timeout=90 --instafail --pythonwarnings error --benchmark-columns=Min,Max,Median
 testpaths = tests
 markers =
diff --git a/tests/helpers/logfail.py b/tests/helpers/logfail.py
index 8eee34911..740dd4333 100644
--- a/tests/helpers/logfail.py
+++ b/tests/helpers/logfail.py
@@ -22,7 +22,6 @@
 import logging
 
 import pytest
-import _pytest.logging
 
 
 class LogFailHandler(logging.Handler):
@@ -40,17 +39,8 @@ class LogFailHandler(logging.Handler):
         if logger.name == 'messagemock':
             return
 
-        for h in root_logger.handlers:
-            if isinstance(h, _pytest.logging.LogCaptureHandler):
-                capture_handler = h
-                break
-        else:
-            # The LogCaptureHandler is not available anymore during fixture
-            # teardown, so we ignore logging messages emitted there..
-            return
-
         if (logger.level == record.levelno or
-                capture_handler.level == record.levelno):
+                root_logger.level == record.levelno):
             # caplog.at_level(...) was used with the level of this message,
             # i.e.  it was expected.
             return

From c987a94596751a033326177c6860a1171de580bf Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 6 Feb 2018 23:18:53 +0100
Subject: [PATCH 168/229] Downgrade PyQt again

Upgrading PyQt in a separate branch.
---
 misc/requirements/requirements-pyqt.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 99ba1b7cc..58f51d203 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.10
-sip==4.19.7
+PyQt5==5.9
+sip==4.19.6

From 5fd3943ebcc2b1f5ebf91f9253f854fe07ffe96e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 6 Feb 2018 23:32:50 +0100
Subject: [PATCH 169/229] Make callback mandatory for tab.selection()

---
 qutebrowser/browser/browsertab.py             | 2 +-
 qutebrowser/browser/webengine/webenginetab.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index e0435587e..2c0aa6722 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -392,7 +392,7 @@ class AbstractCaret(QObject):
     def drop_selection(self):
         raise NotImplementedError
 
-    def selection(self, callback=None):
+    def selection(self, callback):
         raise NotImplementedError
 
     def follow_selected(self, *, tab=False):
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index f42f01c24..dfb4d898c 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -289,7 +289,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
     def drop_selection(self):
         self._js_call('dropSelection')
 
-    def selection(self, callback=None):
+    def selection(self, callback):
         # Not using selectedText() as WORKAROUND for
         # https://bugreports.qt.io/browse/QTBUG-53134
         # Even on Qt 5.10 selectedText() seems to work poorly, see

From ec7583eb97e9d73371e7c3ca8fefacd1a3de89ef Mon Sep 17 00:00:00 2001
From: Perry Thompson <contact@ryper.org>
Date: Tue, 6 Feb 2018 17:23:09 -0600
Subject: [PATCH 170/229] Add troubleshooting info for widevine to FAQ

---
 doc/faq.asciidoc | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/doc/faq.asciidoc b/doc/faq.asciidoc
index 0d94796a4..9c8c51f16 100644
--- a/doc/faq.asciidoc
+++ b/doc/faq.asciidoc
@@ -216,6 +216,29 @@ And then re-emerging qtwebengine with: +
     
     emerge -1 qtwebengine
 
+Unable to view DRM content (Netflix, Spotify, etc.).::
+    You will need to install `widevine` and set `qt.args` to point to it.
+    QT5.9 currently only supports widevine up to Chrome version 61.
++
+On Arch, simply install `qt5-webengine-widevine` from the AUR and run:
++
+----
+:set qt.args '["ppapi-widevine-path=/usr/lib/qt/plugins/ppapi/libwidevinecdmadapter.so"]'
+:restart
+----
++
+For other distributions, download the chromium tarball and widevine-cdm zip from
+https://aur.archlinux.org/packages/qt5-webengine-widevine/[the AUR page],
+extract `libwidevinecdmadapter.so` and `libwidevinecdm.so` files, respectively,
+and move them to the `ppapi` plugin directory in your QT library directory (create it if it does not exist).
++
+Lastly, set your `qt.args` to point to that directory and restart qutebrowser:
++
+----
+:set qt.args '["ppapi-widevine-path=/usr/lib64/qt5/plugins/ppapi/libwidevinecdmadapter.so"]'
+:restart
+----
+
 My issue is not listed.::
     If you experience any segfaults or crashes, you can report the issue in
     https://github.com/qutebrowser/qutebrowser/issues[the issue tracker] or

From d9e095f7cf73a77379e27602257f2c9a55b72a24 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 10:52:10 +0100
Subject: [PATCH 171/229] Add PyQt 5.10 to Travis CI

See #3522
---
 .travis.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 251842d06..d5ebb1dec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,17 @@ matrix:
       env: TESTENV=py35-pyqt59
     - os: linux
       env: TESTENV=py36-pyqt59-cov
+    - os: linux
+      env: TESTENV=py36-pyqt510
+      # We need a newer Xvfb as a WORKAROUND for:
+      # https://bugreports.qt.io/browse/QTBUG-64928
+      sudo: required
+      addons:
+         apt:
+           sources:
+           - sourceline: "deb http://us.archive.ubuntu.com/ubuntu/ xenial main universe"
+           packages:
+           - xvfb
     - os: osx
       env: TESTENV=py36 OSX=sierra
       osx_image: xcode9.2

From 7537acfd5db1457c36a8e15e08bb13bcf7f2800c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 10:52:26 +0100
Subject: [PATCH 172/229] Use PyQt 5.10 on AppVeyor

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 837ebb1d4..f2424fc94 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,7 +7,7 @@ environment:
     PYTHONUNBUFFERED: 1
     PYTHON: C:\Python36\python.exe
     matrix:
-    - TESTENV: py36-pyqt59
+    - TESTENV: py36-pyqt510
     - TESTENV: pylint
 
 install:

From 054b92bbe8417dbabc75bb1e662da73ff1af5266 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 11:19:41 +0100
Subject: [PATCH 173/229] Support retrying downloads with Qt 5.10

Fixes #2787
---
 doc/changelog.asciidoc                           |  1 +
 .../browser/webengine/webenginedownloads.py      | 12 +++++++++---
 tests/end2end/features/downloads.feature         | 16 +++++++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 448aa1be3..da814e2ce 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -25,6 +25,7 @@ Added
 - A new `qute://bindings` page, opened by `:bind`, shows all keybindings.
 - `:session-load` has a new `--delete` flag which deletes the
   session after loading it.
+- QtWebEngine: Retrying downloads is now supported with Qt 5.10 or newer.
 
 Changed
 ~~~~~~~
diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py
index fac04686a..ca18d7df8 100644
--- a/qutebrowser/browser/webengine/webenginedownloads.py
+++ b/qutebrowser/browser/webengine/webenginedownloads.py
@@ -96,9 +96,15 @@ class DownloadItem(downloads.AbstractDownloadItem):
         self._qt_item.cancel()
 
     def retry(self):
-        # https://bugreports.qt.io/browse/QTBUG-56840
-        raise downloads.UnsupportedOperationError(
-            "Retrying downloads is unsupported with QtWebEngine")
+        state = self._qt_item.state()
+        assert state == QWebEngineDownloadItem.DownloadInterrupted, state
+
+        try:
+            self._qt_item.resume()
+        except AttributeError:
+            raise downloads.UnsupportedOperationError(
+                "Retrying downloads is unsupported with QtWebEngine on "
+                "Qt/PyQt < 5.10")
 
     def _get_open_filename(self):
         return self._filename
diff --git a/tests/end2end/features/downloads.feature b/tests/end2end/features/downloads.feature
index 26e3421a1..da5b0b5ae 100644
--- a/tests/end2end/features/downloads.feature
+++ b/tests/end2end/features/downloads.feature
@@ -193,13 +193,23 @@ Feature: Downloading things from a website.
             does-not-exist
             does-not-exist
 
-    @qtwebkit_skip
-    Scenario: Retrying a failed download with QtWebEngine
+    @qtwebkit_skip @qt<5.10
+    Scenario: Retrying a failed download with QtWebEngine (Qt < 5.10)
         When I open data/downloads/issue2298.html
         And I run :click-element id download
         And I wait for "Download error: *" in the log
         And I run :download-retry
-        Then the error "Retrying downloads is unsupported with QtWebEngine" should be shown
+        Then the error "Retrying downloads is unsupported *" should be shown
+
+    @qtwebkit_skip @qt>=5.10
+    Scenario: Retrying a failed download with QtWebEngine (Qt >= 5.10)
+        When I open data/downloads/issue2298.html
+        And I run :click-element id download
+        And I wait for "Download error: *" in the log
+        And I run :download-retry
+        # For some reason it doesn't actually try again here, but let's hope it
+        # works e.g. on a connection loss, which we can't test automatically.
+        Then "Retrying downloads is unsupported *" should not be logged
 
     Scenario: Retrying with count
         When I run :download http://localhost:(port)/data/downloads/download.bin

From e6a4237e1b88e4039582a401fa6c4b309820cb63 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 11:53:47 +0100
Subject: [PATCH 174/229] Revert "Downgrade PyQt again"

This reverts commit c987a94596751a033326177c6860a1171de580bf.
---
 misc/requirements/requirements-pyqt.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 58f51d203..99ba1b7cc 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.9
-sip==4.19.6
+PyQt5==5.10
+sip==4.19.7

From 6d1e3fb2b7b9c96307394fdf3e7924f7d43e3558 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 12:04:09 +0100
Subject: [PATCH 175/229] Add missing more-itertools requirements

---
 misc/requirements/requirements-tests.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 1752f08c7..658fc1580 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -16,6 +16,7 @@ itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7
 # MarkupSafe==1.0
+more-itertools==4.1.0
 parse==1.8.2
 parse-type==0.4.2
 pluggy==0.6.0

From 5135e0f35d913ef79d094820fa1098a98d1a6240 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 12:04:42 +0100
Subject: [PATCH 176/229] Add .pytest_cache to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 54a0dcae6..85233aa2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ __pycache__
 /.tox
 /testresults.html
 /.cache
+/.pytest_cache
 /.testmondata
 /.hypothesis
 /.mypy_cache

From e874db9ce3ac759b2028eb7e624e04f910c2f521 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 12:05:13 +0100
Subject: [PATCH 177/229] Remove pytest version filter

---
 misc/requirements/requirements-tests.txt     | 2 +-
 misc/requirements/requirements-tests.txt-raw | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 658fc1580..eebd2945b 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -22,7 +22,7 @@ parse-type==0.4.2
 pluggy==0.6.0
 py==1.5.2
 py-cpuinfo==3.3.0
-pytest==3.4.0  # rq.filter: != 3.3.2
+pytest==3.4.0
 pytest-bdd==2.20.0
 pytest-benchmark==3.1.1
 pytest-cov==2.5.1
diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw
index 174eeb7df..121689980 100644
--- a/misc/requirements/requirements-tests.txt-raw
+++ b/misc/requirements/requirements-tests.txt-raw
@@ -4,7 +4,7 @@ coverage
 Flask
 hunter
 hypothesis
-pytest==3.3.1
+pytest
 pytest-bdd
 pytest-benchmark
 pytest-cov
@@ -19,4 +19,3 @@ pytest-xvfb
 vulture
 
 #@ ignore: Jinja2, MarkupSafe, colorama
-#@ filter: pytest != 3.3.2

From 0bdee1e2920b3a905205b5cf5f4ee4f0cc83f46f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 18:05:15 +0100
Subject: [PATCH 178/229] Stabilize the flaky iframe test

The test above this one loads hello.txt, but we don't wait for the "load
finished" message, so it can arrive after the previous test already finished and
make this test not wait properly.

However, we also can't easily wait for the load finished message in the
previous test as it only appears with QtWebEngine, not QtWebKit.

As a workaround, we simply load another file in that test, to circumvent this
kind of cross-interaction.
---
 tests/end2end/data/hints/iframe_target.html | 1 +
 tests/end2end/features/hints.feature        | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/end2end/data/hints/iframe_target.html b/tests/end2end/data/hints/iframe_target.html
index db8afad27..bd1e281c2 100644
--- a/tests/end2end/data/hints/iframe_target.html
+++ b/tests/end2end/data/hints/iframe_target.html
@@ -9,6 +9,7 @@
         <iframe id="my-iframe"></iframe>
         <p>
             A <a href="/data/hello.txt" target="my-iframe">link</a> to be opened in the iframe above.
+            A <a href="/data/hello2.txt" target="my-iframe">second link</a> for the iframe.
         </p>
     </body>
 </html>
diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 5da03a085..909eeaf07 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -239,12 +239,11 @@ Feature: Using hints
     Scenario: Opening a link with specific target frame in a new tab
         When I open data/hints/iframe_target.html
         And I run :tab-only
-        And I hint with args "links tab" and follow a
-        And I wait until data/hello.txt is loaded
-        And I wait 0.5s
+        And I hint with args "links tab" and follow s
+        And I wait until data/hello2.txt is loaded
         Then the following tabs should be open:
             - data/hints/iframe_target.html
-            - data/hello.txt (active)
+            - data/hello2.txt (active)
 
     Scenario: Clicking on iframe with :hint all current
         When I open data/hints/iframe.html

From 1c662ae94c53ad7337c396d704b8482df9bd74cf Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 18:25:25 +0100
Subject: [PATCH 179/229] Revive iframe test as flaky

See #1525
---
 tests/end2end/features/hints.feature | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index 909eeaf07..dc14750e1 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -222,13 +222,12 @@ Feature: Using hints
         # The actual check is already done above
         Then no crash should happen
 
-    ### FIXME currenly skipped, see https://github.com/qutebrowser/qutebrowser/issues/1525
-    @xfail_norun
+    @flaky  # FIXME https://github.com/qutebrowser/qutebrowser/issues/1525
     Scenario: Using :follow-hint inside a scrolled iframe
         When I open data/hints/iframe_scroll.html
         And I hint with args "all normal" and follow a
         And I run :scroll bottom
-        And I hint wht args "links normal" and follow a
+        And I hint with args "links normal" and follow a
         Then "navigation request: url http://localhost:*/data/hello2.txt, type NavigationTypeLinkClicked, *" should be logged
 
     Scenario: Opening a link inside a specific iframe

From 7dbe9a59e8039a16f42602affcc89624d8becb1c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 18:26:43 +0100
Subject: [PATCH 180/229] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index da814e2ce..2262927de 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -26,6 +26,8 @@ Added
 - `:session-load` has a new `--delete` flag which deletes the
   session after loading it.
 - QtWebEngine: Retrying downloads is now supported with Qt 5.10 or newer.
+- QtWebEngine: Hinting and other features inside same-origin frames is now
+  supported.
 
 Changed
 ~~~~~~~

From abd56a5abd21613697b1933624d2d23abe027bb4 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 21:40:03 +0100
Subject: [PATCH 181/229] Wait until the mtime changed

---
 tests/unit/misc/test_editor.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 58f6edae7..3a60aaff7 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -19,6 +19,7 @@
 
 """Tests for qutebrowser.misc.editor."""
 
+import time
 import os
 import os.path
 import logging
@@ -179,19 +180,31 @@ def test_modify(qtbot, editor, initial_text, edited_text):
     assert blocker.args == [edited_text]
 
 
+def _update_file(filename, contents):
+    """Update the given file and make sure its mtime changed.
+
+    This might write the file multiple times, but different systems have
+    different mtime's, so we can't be sure how long to wait otherwise.
+    """
+    old_mtime = new_mtime = os.stat(filename).st_mtime
+    while old_mtime == new_mtime:
+        time.sleep(0.1)
+        with open(filename, 'w', encoding='utf-8') as f:
+            f.write(contents)
+        new_mtime = os.stat(filename).st_mtime
+
+
 def test_modify_watch(qtbot):
     """Test that saving triggers file_updated when watch=True."""
     editor = editormod.ExternalEditor(watch=True)
     editor.edit('foo')
 
     with qtbot.wait_signal(editor.file_updated, timeout=3000) as blocker:
-        with open(editor._filename, 'w', encoding='utf-8') as f:
-            f.write('bar')
+        _update_file(editor._filename, 'bar')
     assert blocker.args == ['bar']
 
     with qtbot.wait_signal(editor.file_updated) as blocker:
-        with open(editor._filename, 'w', encoding='utf-8') as f:
-            f.write('baz')
+        _update_file(editor._filename, 'baz')
     assert blocker.args == ['baz']
 
     with qtbot.assert_not_emitted(editor.file_updated):

From 01ccbc679d05adf9fd193f1688d76c1170865a17 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 22:26:32 +0100
Subject: [PATCH 182/229] Fix lint

---
 qutebrowser/browser/commands.py           | 2 +-
 qutebrowser/misc/editor.py                | 9 +++------
 tests/end2end/features/test_editor_bdd.py | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 094563bcc..da5ccbc89 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1639,7 +1639,7 @@ class CommandDispatcher:
     def on_file_updated(self, elem, text):
         """Write the editor text into the form field and clean up tempfile.
 
-        Callback for GUIProcess when the editor was closed.
+        Callback for GUIProcess when the edited text was updated.
 
         Args:
             elem: The WebElementWrapper which was modified.
diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 9565ce28b..db7d3e3e2 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -51,10 +51,7 @@ class ExternalEditor(QObject):
         self._filename = None
         self._proc = None
         self._remove_file = None
-        if watch:
-            self._watcher = QFileSystemWatcher(parent=self)
-        else:
-            self._watcher = None
+        self._watcher = QFileSystemWatcher(parent=self) if watch else None
         self._content = None
 
     def _cleanup(self):
@@ -125,10 +122,10 @@ class ExternalEditor(QObject):
         line, column = self._calc_line_and_column(text, caret_position)
         self._start_editor(line=line, column=column)
 
+    @pyqtSlot(str)
     def _on_file_changed(self, path):
-        encoding = config.val.editor.encoding
         try:
-            with open(path, 'r', encoding=encoding) as f:
+            with open(path, 'r', encoding=config.val.editor.encoding) as f:
                 text = f.read()
         except OSError as e:
             # NOTE: Do not replace this with "raise CommandError" as it's
diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index 4e480b85d..12de7c92c 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -84,7 +84,7 @@ def set_up_editor_wait(quteproc, tmpdir, text):
         import time
         import signal
 
-        def handle(sig, frame):
+        def handle(sig, _frame):
             with open(sys.argv[1], 'w', encoding='utf-8') as f:
                 f.write({text!r})
             if sig == signal.SIGUSR1:

From cd97d5e6e2b78c570f19eda91720b9d95b7eed81 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 22:31:28 +0100
Subject: [PATCH 183/229] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index c9cb327b3..56f3a4b30 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -41,6 +41,8 @@ Changed
   a performance and stability improvement.
 - The `url.incdec_segments` option now also can take `port` as possible segment.
 - QtWebEngine: `:view-source` now uses Chromium's `view-source:` scheme.
+- When an editor is spawned with `:open-editor` and `:config-edit`, the changes
+  are now applied as soon as the file is saved in the editor.
 
 Fixed
 ~~~~~

From 37a9691e295938b53a6b746967f7356ef587bdf6 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 7 Feb 2018 23:13:13 +0100
Subject: [PATCH 184/229] Only focus qutebrowser again after editing finished

See #3431, #3432
---
 qutebrowser/browser/commands.py | 4 ++--
 qutebrowser/misc/editor.py      | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 97f631df9..2267f9e41 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1619,6 +1619,8 @@ class CommandDispatcher:
         ed = editor.ExternalEditor(watch=True, parent=self._tabbed_browser)
         ed.file_updated.connect(functools.partial(
             self.on_file_updated, elem))
+        ed.editing_finished.connect(lambda: mainwindow.raise_window(
+            objreg.last_focused_window(), alert=False))
         ed.edit(text, caret_position)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
@@ -1647,8 +1649,6 @@ class CommandDispatcher:
         except webelem.Error as e:
             raise cmdexc.CommandError(str(e))
 
-        mainwindow.raise_window(objreg.last_focused_window(), alert=False)
-
     @cmdutils.register(instance='command-dispatcher', maxsplit=0,
                        scope='window')
     def insert_text(self, text):
diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index c562a1d67..4fd6ab3b6 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -42,9 +42,15 @@ class ExternalEditor(QObject):
         _proc: The GUIProcess of the editor.
         _watcher: A QFileSystemWatcher to watch the edited file for changes.
                   Only set if watch=True.
+
+    Signals:
+        file_updated: The text in the edited file was updated.
+                      arg: The new text.
+        editing_finished: The editor process was closed.
     """
 
     file_updated = pyqtSignal(str)
+    editing_finished = pyqtSignal()
 
     def __init__(self, parent=None, watch=False):
         super().__init__(parent)
@@ -84,6 +90,7 @@ class ExternalEditor(QObject):
             return
         # do a final read to make sure we don't miss the last signal
         self._on_file_changed(self._filename)
+        self.editing_finished.emit()
         self._cleanup()
 
     @pyqtSlot(QProcess.ProcessError)

From f51ac8ab6e7ffdc95a3e8ac91098764f79302a15 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 00:32:02 +0100
Subject: [PATCH 185/229] Log QFileSystemWatcher errors

---
 qutebrowser/misc/editor.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 4fd6ab3b6..abb37819b 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -64,7 +64,9 @@ class ExternalEditor(QObject):
         """Clean up temporary files after the editor closed."""
         assert self._remove_file is not None
         if self._watcher:
-            self._watcher.removePaths(self._watcher.files())
+            failed = self._watcher.removePaths(self._watcher.files())
+            if failed:
+                log.procs.error("Failed to unwatch paths: {}".format(failed))
         if self._filename is None or not self._remove_file:
             # Could not create initial file.
             return
@@ -164,7 +166,9 @@ class ExternalEditor(QObject):
         executable = editor[0]
 
         if self._watcher:
-            self._watcher.addPath(self._filename)
+            ok = self._watcher.addPath(self._filename)
+            if not ok:
+                log.procs.error("Failed to watch path: {}".format(self._filename))
             self._watcher.fileChanged.connect(self._on_file_changed)
 
         args = [self._sub_placeholder(arg, line, column) for arg in editor[1:]]

From 35b56f265958c2141eb59313a7b244fc24c3e8b0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 09:51:06 +0100
Subject: [PATCH 186/229] Remove eslint max-lines suppression

We already turn that off globally now.
---
 qutebrowser/javascript/caret.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index 3a7bb5bde..5088c3e2f 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines, max-len, max-statements, complexity,
+/* eslint-disable max-len, max-statements, complexity,
 max-params, default-case, valid-jsdoc */
 
 // Copyright 2014 The Chromium Authors. All rights reserved.

From b6f311f4b223b345c2e1c976eee0a4b408014718 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 09:52:14 +0100
Subject: [PATCH 187/229] Remove workaround for old pylint issue

---
 qutebrowser/mainwindow/mainwindow.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 0e6b64936..e5257e558 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -105,8 +105,7 @@ def raise_window(window, alert=True):
         QApplication.instance().alert(window)
 
 
-# WORKAROUND for https://github.com/PyCQA/pylint/issues/1770
-def get_target_window():  # pylint: disable=inconsistent-return-statements
+def get_target_window():
     """Get the target window for new tabs, or None if none exist."""
     try:
         win_mode = config.val.new_instance_open_target_window

From 1da58b6a4cbbf455d5d92bea4a8812a8661d8ce0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 09:54:20 +0100
Subject: [PATCH 188/229] Break long line

---
 qutebrowser/misc/editor.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index abb37819b..80bf9cd16 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -168,7 +168,8 @@ class ExternalEditor(QObject):
         if self._watcher:
             ok = self._watcher.addPath(self._filename)
             if not ok:
-                log.procs.error("Failed to watch path: {}".format(self._filename))
+                log.procs.error("Failed to watch path: {}"
+                                .format(self._filename))
             self._watcher.fileChanged.connect(self._on_file_changed)
 
         args = [self._sub_placeholder(arg, line, column) for arg in editor[1:]]

From 9d32807e3333630bac025d18354958ae2a721348 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 10:20:30 +0100
Subject: [PATCH 189/229] Don't try to remove watched files if none exist

If we try to remove watched files but we couldn't actually watch any earlier,
we'd get a Qt warning message:

QtWarningMsg: QFileSystemWatcher::removePaths: list is empty
---
 qutebrowser/misc/editor.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index 80bf9cd16..154660001 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -63,10 +63,13 @@ class ExternalEditor(QObject):
     def _cleanup(self):
         """Clean up temporary files after the editor closed."""
         assert self._remove_file is not None
-        if self._watcher:
-            failed = self._watcher.removePaths(self._watcher.files())
+
+        watched_files = self._watcher.files() if self._watcher else []
+        if watched_files:
+            failed = self._watcher.removePaths(watched_files)
             if failed:
                 log.procs.error("Failed to unwatch paths: {}".format(failed))
+
         if self._filename is None or not self._remove_file:
             # Could not create initial file.
             return

From c520130389e1aee793532467d9c1cd634a5c6441 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 10:18:08 +0100
Subject: [PATCH 190/229] Add tests for a failing watch/unwatch

---
 tests/unit/misc/test_editor.py | 39 ++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index c9842cc7a..38d0808e9 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -211,6 +211,45 @@ def test_modify_watch(qtbot):
         editor._proc.finished.emit(0, QProcess.NormalExit)
 
 
+def test_failing_watch(qtbot, caplog, monkeypatch):
+    """When watching failed, an error should be logged.
+
+    Also, updating should still work when closing the process.
+    """
+    editor = editormod.ExternalEditor(watch=True)
+    monkeypatch.setattr(editor._watcher, 'addPath', lambda _path: False)
+
+    with caplog.at_level(logging.ERROR):
+        editor.edit('foo')
+
+    with qtbot.assert_not_emitted(editor.file_updated):
+        _update_file(editor._filename, 'bar')
+
+    with qtbot.wait_signal(editor.file_updated) as blocker:
+        editor._proc.finished.emit(0, QProcess.NormalExit)
+    assert blocker.args == ['bar']
+
+    message = 'Failed to watch path: {}'.format(editor._filename)
+    assert caplog.records[0].msg == message
+
+
+def test_failing_unwatch(qtbot, caplog, monkeypatch):
+    """When unwatching failed, an error should be logged."""
+    editor = editormod.ExternalEditor(watch=True)
+    monkeypatch.setattr(editor._watcher, 'addPath', lambda _path: True)
+    monkeypatch.setattr(editor._watcher, 'files', lambda: [editor._filename])
+    monkeypatch.setattr(editor._watcher, 'removePaths', lambda paths: paths)
+
+    editor.edit('foo')
+
+    with caplog.at_level(logging.ERROR):
+        editor._proc.finished.emit(0, QProcess.NormalExit)
+
+    message = 'Failed to unwatch paths: [{!r}]'.format(editor._filename)
+    assert caplog.records[-1].msg == message
+
+
+
 @pytest.mark.parametrize('text, caret_position, result', [
     ('', 0, (1, 1)),
     ('a', 0, (1, 1)),

From 53e7d13c2d35c083bf820fbfbcd8271f8001f52e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 10:42:55 +0100
Subject: [PATCH 191/229] Skip failing scrolling tests on Qt 5.10 on Travis

See #3572
---
 pytest.ini                            | 1 +
 tests/conftest.py                     | 4 ++++
 tests/end2end/features/scroll.feature | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/pytest.ini b/pytest.ini
index 56cd808ad..89571aebc 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -26,6 +26,7 @@ markers =
     this: Used to mark tests during development
     no_invalid_lines: Don't fail on unparseable lines in end2end tests
     issue2478: Tests which are broken on Windows with QtWebEngine, https://github.com/qutebrowser/qutebrowser/issues/2478
+    issue3572: Tests which are broken with QtWebEngine and Qt 5.10, https://github.com/qutebrowser/qutebrowser/issues/3572
     fake_os: Fake utils.is_* to a fake operating system
     unicode_locale: Tests which need an unicode locale to work
 qt_log_level_fail = WARNING
diff --git a/tests/conftest.py b/tests/conftest.py
index 7d6a0da09..d9d5fc034 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -64,6 +64,10 @@ def _apply_platform_markers(config, item):
         ('no_ci', 'CI' in os.environ, "Skipped on CI."),
         ('issue2478', utils.is_windows and config.webengine,
          "Broken with QtWebEngine on Windows"),
+        ('issue3572',
+         qtutils.version_check('5.10', compiled=False, exact=True) and
+         config.webengine and 'TRAVIS' in os.environ,
+         "Broken with QtWebEngine with Qt 5.10 on Travis"),
         ('unicode_locale', sys.getfilesystemencoding() == 'ascii',
          "Skipped because of ASCII locale"),
     ]
diff --git a/tests/end2end/features/scroll.feature b/tests/end2end/features/scroll.feature
index e77b57dc8..f73eb352b 100644
--- a/tests/end2end/features/scroll.feature
+++ b/tests/end2end/features/scroll.feature
@@ -233,6 +233,7 @@ Feature: Scrolling
         Then the page should be scrolled vertically
         
     # https://github.com/qutebrowser/qutebrowser/issues/1821
+    @issue3572
     Scenario: :scroll-to-perc without doctype
         When I open data/scroll/no_doctype.html
         And I run :scroll-to-perc 100
@@ -315,6 +316,7 @@ Feature: Scrolling
 
     ## issues
 
+    @issue3572
     Scenario: Relative scroll position with a position:absolute page
         When I open data/scroll/position_absolute.html
         And I run :scroll-to-perc 100

From 15fecc962d1c8b5ea88e2692cf473d872cc12cd3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 11:41:58 +0100
Subject: [PATCH 192/229] Fix lint

---
 tests/unit/misc/test_editor.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py
index 38d0808e9..8cf778d89 100644
--- a/tests/unit/misc/test_editor.py
+++ b/tests/unit/misc/test_editor.py
@@ -249,7 +249,6 @@ def test_failing_unwatch(qtbot, caplog, monkeypatch):
     assert caplog.records[-1].msg == message
 
 
-
 @pytest.mark.parametrize('text, caret_position, result', [
     ('', 0, (1, 1)),
     ('a', 0, (1, 1)),

From ea80ded8d5057e7a8ad92315cae4a5e9088069ea Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 20:21:25 +0100
Subject: [PATCH 193/229] Try to stabilize editor end2end test

Let's also wait until we're sure the mtime changed here.
---
 tests/end2end/features/test_editor_bdd.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py
index 2f425c41b..bc1397bf7 100644
--- a/tests/end2end/features/test_editor_bdd.py
+++ b/tests/end2end/features/test_editor_bdd.py
@@ -85,8 +85,13 @@ def set_up_editor_wait(quteproc, tmpdir, text):
         import signal
 
         def handle(sig, _frame):
-            with open(sys.argv[1], 'w', encoding='utf-8') as f:
-                f.write({text!r})
+            filename = sys.argv[1]
+            old_mtime = new_mtime = os.stat(filename).st_mtime
+            while old_mtime == new_mtime:
+                time.sleep(0.1)
+                with open(filename, 'w', encoding='utf-8') as f:
+                    f.write({text!r})
+                new_mtime = os.stat(filename).st_mtime
             if sig == signal.SIGUSR1:
                 sys.exit(0)
 

From e0dd7970d874518fbdbaef117a9cdae2f0b936ea Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 20:23:34 +0100
Subject: [PATCH 194/229] Skip fragment test

Looks like this now XPASSes with Qt 5.10 on Windows
---
 tests/end2end/features/marks.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/end2end/features/marks.feature b/tests/end2end/features/marks.feature
index f7da07255..ca05b7fad 100644
--- a/tests/end2end/features/marks.feature
+++ b/tests/end2end/features/marks.feature
@@ -73,7 +73,7 @@ Feature: Setting positional marks
         And I run :jump-mark b
         Then the error "Mark b is not set" should be shown
 
-    @qtwebengine_todo: Does not emit loaded signal for fragments? @flaky
+    @qtwebengine_skip: Does not emit loaded signal for fragments?
     Scenario: Jumping to a local mark after changing fragments
         When I open data/marks.html#top
         And I run :scroll 'top'

From 298dcb4c9057a483ecb125672ca554606fc4e3ec Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 21:46:03 +0100
Subject: [PATCH 195/229] Validate config separately from migrations

It makes for cleaner code, and it makes sure the target of renamed options
actually exists.
---
 qutebrowser/config/configfiles.py     |  9 ++++++---
 tests/unit/config/test_configfiles.py | 19 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 8a5cb6697..400816656 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -166,6 +166,7 @@ class YamlConfig(QObject):
         self._dirty = False
 
         self._handle_migrations()
+        self._validate()
 
     def _handle_migrations(self):
         """Handle unknown/renamed keys."""
@@ -178,9 +179,11 @@ class YamlConfig(QObject):
             elif name in configdata.MIGRATIONS.deleted:
                 log.config.debug("Removing {}".format(name))
                 del self._values[name]
-            elif name in configdata.DATA:
-                pass
-            else:
+
+    def _validate(self):
+        """Make sure all settings exist."""
+        for name in self._values:
+            if name not in configdata.DATA:
                 desc = configexc.ConfigErrorDesc(
                     "While loading options",
                     "Unknown option {}".format(name))
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index d0f1ff0ee..d2f37ec25 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -145,7 +145,8 @@ class TestYaml:
         autoconfig = config_tmpdir / 'autoconfig.yml'
         autoconfig.write_text('global:\n  old: value', encoding='utf-8')
 
-        monkeypatch.setattr(configdata.MIGRATIONS, 'renamed', {'old': 'new'})
+        monkeypatch.setattr(configdata.MIGRATIONS, 'renamed',
+                            {'old': 'tabs.show'})
 
         yaml.load()
         yaml._save()
@@ -154,6 +155,22 @@ class TestYaml:
         assert '  old:' not in lines
         assert '  new:' not in lines
 
+    def test_renamed_key_unknown_target(self, monkeypatch, yaml, config_tmpdir):
+        """A key marked as renamed with invalid name should raise an error."""
+        autoconfig = config_tmpdir / 'autoconfig.yml'
+        autoconfig.write_text('global:\n  old: value', encoding='utf-8')
+
+        monkeypatch.setattr(configdata.MIGRATIONS, 'renamed',
+                            {'old': 'new'})
+
+        with pytest.raises(configexc.ConfigFileErrors) as excinfo:
+            yaml.load()
+
+        assert len(excinfo.value.errors) == 1
+        error = excinfo.value.errors[0]
+        assert error.text == "While loading options"
+        assert str(error.exception) == "Unknown option new"
+
     @pytest.mark.parametrize('old_config', [
         None,
         'global:\n  colors.hints.fg: magenta',

From 1a88b64c67f92ac4befa1eb5a2cc5c2fedfaea11 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 21:53:41 +0100
Subject: [PATCH 196/229] Add a test for keyconfig.get_command(...,
 default=True)

---
 tests/unit/config/test_config.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index 1d1e1fc70..ce6e4e461 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -149,6 +149,14 @@ class TestKeyConfig:
         config_stub.val.bindings.commands = no_bindings
         assert key_config_stub.get_command('foobar', 'normal') is None
 
+    def test_get_command_default(self, key_config_stub, config_stub):
+        config_stub.val.bindings.default = {
+            'normal': {'x': 'message-info default'}}
+        config_stub.val.bindings.commands = {
+            'normal': {'x': 'message-info custom'}}
+        cmd = 'message-info default'
+        assert key_config_stub.get_command('x', 'normal', default=True) == cmd
+
     @pytest.mark.parametrize('bindings, expected', [
         # Simple
         ({'a': 'message-info foo', 'b': 'message-info bar'},

From 1a81f7231b35f22d36cd8dace44e9c2335689e4a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 8 Feb 2018 22:02:22 +0100
Subject: [PATCH 197/229] Make sure multiple wrong keys are reported

---
 qutebrowser/config/configfiles.py     | 12 ++++++------
 tests/unit/config/test_configfiles.py | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 400816656..77b5190ce 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -182,12 +182,12 @@ class YamlConfig(QObject):
 
     def _validate(self):
         """Make sure all settings exist."""
-        for name in self._values:
-            if name not in configdata.DATA:
-                desc = configexc.ConfigErrorDesc(
-                    "While loading options",
-                    "Unknown option {}".format(name))
-                raise configexc.ConfigFileErrors('autoconfig.yml', [desc])
+        unknown = set(self._values) - set(configdata.DATA)
+        if unknown:
+            errors = [configexc.ConfigErrorDesc("While loading options",
+                                                "Unknown option {}".format(e))
+                      for e in sorted(unknown)]
+            raise configexc.ConfigFileErrors('autoconfig.yml', errors)
 
     def unset(self, name):
         """Remove the given option name if it's configured."""
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index d2f37ec25..63f6fbd3f 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -127,6 +127,20 @@ class TestYaml:
         assert error.text == "While loading options"
         assert str(error.exception) == "Unknown option hello"
 
+    def test_multiple_unknown_keys(self, yaml, config_tmpdir):
+        """With multiple unknown settings, all should be shown."""
+        autoconfig = config_tmpdir / 'autoconfig.yml'
+        autoconfig.write_text('global:\n  one: 1\n  two: 2', encoding='utf-8')
+
+        with pytest.raises(configexc.ConfigFileErrors) as excinfo:
+            yaml.load()
+
+        assert len(excinfo.value.errors) == 2
+        error1, error2 = excinfo.value.errors
+        assert error1.text == error2.text == "While loading options"
+        assert str(error1.exception) == "Unknown option one"
+        assert str(error2.exception) == "Unknown option two"
+
     def test_deleted_key(self, monkeypatch, yaml, config_tmpdir):
         """A key marked as deleted should be removed."""
         autoconfig = config_tmpdir / 'autoconfig.yml'

From f92b52b20c1fb13d3763c3493cbee1289c5e2638 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 10:38:42 +0100
Subject: [PATCH 198/229] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index ea9025280..25ddb60ab 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -47,6 +47,8 @@ Changed
 - Tabs now show their full title as tooltip.
 - When an editor is spawned with `:open-editor` and `:config-edit`, the changes
   are now applied as soon as the file is saved in the editor.
+- When there are multiple unknown keys in a autoconfig.yml, they now all get
+  reported in one error.
 
 Fixed
 ~~~~~

From 589605fe92d6a055c5b9b32261aac1dcb81e2221 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 10:39:16 +0100
Subject: [PATCH 199/229] Fix lint

---
 tests/unit/config/test_configfiles.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 63f6fbd3f..8659cf891 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -169,7 +169,8 @@ class TestYaml:
         assert '  old:' not in lines
         assert '  new:' not in lines
 
-    def test_renamed_key_unknown_target(self, monkeypatch, yaml, config_tmpdir):
+    def test_renamed_key_unknown_target(self, monkeypatch, yaml,
+                                        config_tmpdir):
         """A key marked as renamed with invalid name should raise an error."""
         autoconfig = config_tmpdir / 'autoconfig.yml'
         autoconfig.write_text('global:\n  old: value', encoding='utf-8')

From 3e38aab0f62ae936af0b7c1302f277621f6bede3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 11:31:25 +0100
Subject: [PATCH 200/229] Document configdata.Migrations

---
 qutebrowser/config/configdata.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index bcad53e00..3e0a6d8b1 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -54,7 +54,12 @@ class Option:
 @attr.s
 class Migrations:
 
-    """Nigrated options in configdata.yml."""
+    """Nigrated options in configdata.yml.
+
+    Attributes:
+        renamed: A dict mapping old option names to new names.
+        deleted: A list of option names which have been removed.
+    """
 
     renamed = attr.ib(default=attr.Factory(dict))
     deleted = attr.ib(default=attr.Factory(list))

From 7caab75fa4aa2756a4cc5fb2295c21462af7672e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 12:14:07 +0100
Subject: [PATCH 201/229] Clean up cycle-inputs.js

---
 scripts/cycle-inputs.js | 54 ++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/scripts/cycle-inputs.js b/scripts/cycle-inputs.js
index 94c50fb72..bb667bda7 100644
--- a/scripts/cycle-inputs.js
+++ b/scripts/cycle-inputs.js
@@ -9,38 +9,38 @@
  * By dive on freenode <dave@dawoodfall.net>
  */
 
-"use strict";
-var inputs = document.getElementsByTagName("input");
-var types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
-var hidden = /hidden/;
-var found = false;
-var i = 0;
-var k = 0;
+(function() {
+    "use strict";
+    const inputs = document.getElementsByTagName("input");
+    const types = /text|password|date|email|month|number|range|search|tel|time|url|week/;
+    const hidden = /hidden/;
+    let found = false;
 
-function ishidden(el) {
-    return hidden.test(el.attributes.value) || el.offsetParent === null;
-}
-
-for (i = 0; i < inputs.length; i++) {
-    if (inputs[i] === document.activeElement) {
-        for (k = i + 1; k < inputs.length; k++) {
-            if (!ishidden(inputs[k]) && types.test(inputs[k].type)) {
-                inputs[k].focus();
-                found = true;
-                break;
-            }
-        }
-        break;
+    function ishidden(el) {
+        return hidden.test(el.attributes.value) || el.offsetParent === null;
     }
-}
 
-if (!found) {
-    for (i = 0; i < inputs.length; i++) {
-        if (!ishidden(inputs[i]) && types.test(inputs[i].type)) {
-            inputs[i].focus();
+    for (let i = 0; i < inputs.length; i++) {
+        if (inputs[i] === document.activeElement) {
+            for (let k = i + 1; k < inputs.length; k++) {
+                if (!ishidden(inputs[k]) && types.test(inputs[k].type)) {
+                    inputs[k].focus();
+                    found = true;
+                    break;
+                }
+            }
             break;
         }
     }
-}
+
+    if (!found) {
+        for (let i = 0; i < inputs.length; i++) {
+            if (!ishidden(inputs[i]) && types.test(inputs[i].type)) {
+                inputs[i].focus();
+                break;
+            }
+        }
+    }
+})();
 
 // vim: tw=0 expandtab tabstop=4 softtabstop=4 shiftwidth=4

From 89bd723eaaebe21e9f50bdc087aef45d1f812b6d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 13:18:12 +0100
Subject: [PATCH 202/229] Add scripts/*.js to MANIFEST.in

---
 MANIFEST.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index b20c2bc77..9dace6f98 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,7 +8,7 @@ graft icons
 graft doc/img
 graft misc/apparmor
 graft misc/userscripts
-recursive-include scripts *.py *.sh
+recursive-include scripts *.py *.sh *.js
 include qutebrowser/utils/testfile
 include qutebrowser/git-commit-id
 include LICENSE doc/* README.asciidoc

From 5d8b48a2ed82f831cd4a9a04d5e3094c88b30081 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 16:32:59 +0100
Subject: [PATCH 203/229] Show where a command handler is defined

---
 qutebrowser/commands/cmdutils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/commands/cmdutils.py b/qutebrowser/commands/cmdutils.py
index d261e5e86..f9ce91b8f 100644
--- a/qutebrowser/commands/cmdutils.py
+++ b/qutebrowser/commands/cmdutils.py
@@ -105,7 +105,8 @@ class register:  # noqa: N801,N806 pylint: disable=invalid-name
         else:
             assert isinstance(self._name, str), self._name
             name = self._name
-        log.commands.vdebug("Registering command {}".format(name))
+        log.commands.vdebug("Registering command {} (from {}:{})".format(
+            name, func.__module__, func.__qualname__))
         if name in cmd_dict:
             raise ValueError("{} is already registered!".format(name))
         cmd = command.Command(name=name, instance=self._instance,

From 9e524e4be8190ab2c4d90766d5d0633dae858b1c Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 16:57:05 -0500
Subject: [PATCH 204/229] use tabs.mode_on_change to persist or restore mode

---
 qutebrowser/mainwindow/tabbedbrowser.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 824abf25b..4c8a81df3 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -651,17 +651,23 @@ class TabbedBrowser(tabwidget.TabWidget):
             log.webview.debug("on_current_changed got called with invalid "
                               "index {}".format(idx))
             return
+        if self._now_focused and config.val.tabs.mode_on_change == 'restore':
+            current_mode = modeman.instance(self._win_id).mode
+            if not current_mode in (usertypes.KeyMode.insert,usertypes.KeyMode.passthrough):
+                current_mode = usertypes.KeyMode.normal
+            self._now_focused.data.input_mode = current_mode
 
         log.modes.debug("Current tab changed, focusing {!r}".format(tab))
         tab.setFocus()
 
         modes_to_leave = [usertypes.KeyMode.hint, usertypes.KeyMode.caret]
-        if not config.val.tabs.persist_mode_on_change:
+        if not config.val.tabs.mode_on_change == 'persist':
             modes_to_leave += [usertypes.KeyMode.insert,
                                usertypes.KeyMode.passthrough]
         for mode in modes_to_leave:
             modeman.leave(self._win_id, mode, 'tab changed', maybe=True)
-
+        if config.val.tabs.mode_on_change == 'restore':
+            modeman.enter(self._win_id, tab.data.input_mode, 'restore input mode for tab')
         if self._now_focused is not None:
             objreg.register('last-focused-tab', self._now_focused, update=True,
                             scope='window', window=self._win_id)

From eb7e114e5f0064ee9c0b03a782435991bd4bcf85 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 17:02:34 -0500
Subject: [PATCH 205/229] add propery to save tab input mode

---
 qutebrowser/browser/browsertab.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 2c0aa6722..893bbfd38 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -105,6 +105,7 @@ class TabData:
     override_target = attr.ib(None)
     pinned = attr.ib(False)
     fullscreen = attr.ib(False)
+    input_mode = usertypes.KeyMode.normal
 
 
 class AbstractAction:

From a7db197e45d341e4b85def4102d205f09b2d1fb4 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 12 Jan 2018 17:05:47 -0500
Subject: [PATCH 206/229] replace persist_mode_on_change with mode_on_change

supports old persist_mode_on_change functionality or new save/restore mode
---
 qutebrowser/config/configdata.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index e2daefe3b..680210175 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1251,10 +1251,15 @@ tabs.padding:
   type: Padding
   desc: Padding (in pixels) around text for tabs.
 
-tabs.persist_mode_on_change:
-  default: false
-  type: Bool
-  desc: Stay in insert/passthrough mode when switching tabs.
+tabs.mode_on_change:
+  default: normal
+  type:
+    name: String
+    valid_values:
+      - persist: "retain the current mode."
+      - restore: "restore previously saved mode"
+      - normal:  "always revert to normal mode"
+  desc: When switching tabs, what input mode is applied.
 
 tabs.position:
   default: top

From 21fc848839b6ae7502ff97b72fa87edc8013133d Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sun, 14 Jan 2018 13:29:51 -0500
Subject: [PATCH 207/229] document code a bit more

---
 qutebrowser/browser/browsertab.py       | 1 +
 qutebrowser/mainwindow/tabbedbrowser.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index 893bbfd38..a8ffedc01 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -98,6 +98,7 @@ class TabData:
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
         fullscreen: Whether the tab has a video shown fullscreen currently.
+        input_mode: current input mode for the tab. (insert, passthrough, normal)
     """
 
     keep_icon = attr.ib(False)
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 4c8a81df3..59e566a5a 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -653,6 +653,7 @@ class TabbedBrowser(tabwidget.TabWidget):
             return
         if self._now_focused and config.val.tabs.mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
+            # only save insert & passthrough mode. otherwise default to normal
             if not current_mode in (usertypes.KeyMode.insert,usertypes.KeyMode.passthrough):
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode

From f3b52aaf23f37c30f10136b4bd6def5074c99c76 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 09:00:06 -0500
Subject: [PATCH 208/229] fix asciidoc for tabs.mode_on_change

---
 doc/help/settings.asciidoc        | 18 ++++++++++++------
 qutebrowser/config/configdata.yml |  6 +++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index c44dfb9a6..279e7889e 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -242,7 +242,7 @@
 |<<tabs.new_position.related,tabs.new_position.related>>|Position of new tabs opened from another tab.
 |<<tabs.new_position.unrelated,tabs.new_position.unrelated>>|Position of new tabs which aren't opened from another tab.
 |<<tabs.padding,tabs.padding>>|Padding (in pixels) around text for tabs.
-|<<tabs.persist_mode_on_change,tabs.persist_mode_on_change>>|Stay in insert/passthrough mode when switching tabs.
+|<<tabs.mode_on_change,tabs.mode_on_change>>|Set input mode behavior when switching tab.
 |<<tabs.pinned.shrink,tabs.pinned.shrink>>|Shrink pinned tabs down to their contents.
 |<<tabs.position,tabs.position>>|Position of the tab bar.
 |<<tabs.select_on_remove,tabs.select_on_remove>>|Which tab to select when the focused tab is removed.
@@ -2825,13 +2825,19 @@ Default:
 - +pass:[right]+: +pass:[5]+
 - +pass:[top]+: +pass:[0]+
 
-[[tabs.persist_mode_on_change]]
-=== tabs.persist_mode_on_change
-Stay in insert/passthrough mode when switching tabs.
+[[tabs.mode_on_change]]
+=== tabs.mode_on_change
+When switching tabs, what input mode is applied.
 
-Type: <<types,Bool>>
+Type: <<types,String>>
 
-Default: +pass:[false]+
+Valid values:
+
+ * +persist+: Retain the current mode.
+ * +restore+: Restore previously saved mode.
+ * +normal+: Always revert to normal mode.
+
+Default: +pass:[normal]+
 
 [[tabs.pinned.shrink]]
 === tabs.pinned.shrink
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 680210175..5e47eb84e 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1256,9 +1256,9 @@ tabs.mode_on_change:
   type:
     name: String
     valid_values:
-      - persist: "retain the current mode."
-      - restore: "restore previously saved mode"
-      - normal:  "always revert to normal mode"
+      - persist: "Retain the current mode."
+      - restore: "Restore previously saved mode."
+      - normal:  "Always revert to normal mode."
   desc: When switching tabs, what input mode is applied.
 
 tabs.position:

From 91b70fab70e1688d768d2bc16efe73c590e4931a Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 13:39:42 -0500
Subject: [PATCH 209/229] fix pylint/flake8 errors

---
 qutebrowser/mainwindow/tabbedbrowser.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 59e566a5a..617981988 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -654,7 +654,8 @@ class TabbedBrowser(tabwidget.TabWidget):
         if self._now_focused and config.val.tabs.mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
             # only save insert & passthrough mode. otherwise default to normal
-            if not current_mode in (usertypes.KeyMode.insert,usertypes.KeyMode.passthrough):
+            input_modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
+            if current_mode not in input_modes:
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode
 

From fecb551c5ee8912d45c89277a0e0d922b6f549b3 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Mon, 15 Jan 2018 16:19:38 -0500
Subject: [PATCH 210/229] shorten lines

---
 qutebrowser/browser/browsertab.py       | 2 +-
 qutebrowser/mainwindow/tabbedbrowser.py | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index a8ffedc01..e855edac7 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -98,7 +98,7 @@ class TabData:
                          Only used for QtWebKit.
         pinned: Flag to pin the tab.
         fullscreen: Whether the tab has a video shown fullscreen currently.
-        input_mode: current input mode for the tab. (insert, passthrough, normal)
+        input_mode: current input mode for the tab.
     """
 
     keep_icon = attr.ib(False)
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 617981988..3bd95a8e3 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -654,8 +654,8 @@ class TabbedBrowser(tabwidget.TabWidget):
         if self._now_focused and config.val.tabs.mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
             # only save insert & passthrough mode. otherwise default to normal
-            input_modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
-            if current_mode not in input_modes:
+            modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
+            if current_mode not in modes:
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode
 
@@ -669,7 +669,8 @@ class TabbedBrowser(tabwidget.TabWidget):
         for mode in modes_to_leave:
             modeman.leave(self._win_id, mode, 'tab changed', maybe=True)
         if config.val.tabs.mode_on_change == 'restore':
-            modeman.enter(self._win_id, tab.data.input_mode, 'restore input mode for tab')
+            modeman.enter(self._win_id, tab.data.input_mode,
+                          'restore input mode for tab')
         if self._now_focused is not None:
             objreg.register('last-focused-tab', self._now_focused, update=True,
                             scope='window', window=self._win_id)

From a3ce03e0bd8374d63e3d48aff0acf745f9a16eb2 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 10:31:40 -0500
Subject: [PATCH 211/229] address requested changes

- syntax cleanup
- use attr.ib when declaring class attributes
- remove unnecessary comments
- code simplification
---
 qutebrowser/browser/browsertab.py       |  2 +-
 qutebrowser/mainwindow/tabbedbrowser.py | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index e855edac7..d73607929 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -106,7 +106,7 @@ class TabData:
     override_target = attr.ib(None)
     pinned = attr.ib(False)
     fullscreen = attr.ib(False)
-    input_mode = usertypes.KeyMode.normal
+    input_mode = attr.ib(usertypes.KeyMode.normal)
 
 
 class AbstractAction:
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 3bd95a8e3..cd9f52b37 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -643,6 +643,9 @@ class TabbedBrowser(tabwidget.TabWidget):
     @pyqtSlot(int)
     def on_current_changed(self, idx):
         """Set last-focused-tab and leave hinting mode when focus changed."""
+        mode_on_change = config.val.tabs.mode_on_change
+        modes_to_save = [usertypes.KeyMode.insert,
+                         usertypes.KeyMode.passthrough]
         if idx == -1 or self.shutting_down:
             # closing the last tab (before quitting) or shutting down
             return
@@ -651,11 +654,9 @@ class TabbedBrowser(tabwidget.TabWidget):
             log.webview.debug("on_current_changed got called with invalid "
                               "index {}".format(idx))
             return
-        if self._now_focused and config.val.tabs.mode_on_change == 'restore':
+        if self._now_focused is not None and mode_on_change == 'restore':
             current_mode = modeman.instance(self._win_id).mode
-            # only save insert & passthrough mode. otherwise default to normal
-            modes = (usertypes.KeyMode.insert, usertypes.KeyMode.passthrough)
-            if current_mode not in modes:
+            if current_mode not in modes_to_save:
                 current_mode = usertypes.KeyMode.normal
             self._now_focused.data.input_mode = current_mode
 
@@ -663,12 +664,11 @@ class TabbedBrowser(tabwidget.TabWidget):
         tab.setFocus()
 
         modes_to_leave = [usertypes.KeyMode.hint, usertypes.KeyMode.caret]
-        if not config.val.tabs.mode_on_change == 'persist':
-            modes_to_leave += [usertypes.KeyMode.insert,
-                               usertypes.KeyMode.passthrough]
+        if mode_on_change != 'persist':
+            modes_to_leave += modes_to_save
         for mode in modes_to_leave:
             modeman.leave(self._win_id, mode, 'tab changed', maybe=True)
-        if config.val.tabs.mode_on_change == 'restore':
+        if mode_on_change == 'restore':
             modeman.enter(self._win_id, tab.data.input_mode,
                           'restore input mode for tab')
         if self._now_focused is not None:

From 85dfe5c403b3edd8db05d83ec97b0c09a06ea2d0 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 11:28:21 -0500
Subject: [PATCH 212/229] add special code to migrate
 tabs.persist_mode_on_change setting to tabs.mode_on_change.

---
 qutebrowser/config/configfiles.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 77b5190ce..7b1a26e71 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -180,6 +180,14 @@ class YamlConfig(QObject):
                 log.config.debug("Removing {}".format(name))
                 del self._values[name]
 
+        persist = 'tabs.persist_mode_on_change'
+        if persist in self._values:
+            if self._values[persist]:
+                self._values['tabs.mode_on_change'] = 'persist'
+            else:
+                self._values['tabs.mode_on_change'] = 'normal'
+            del self._values[persist]
+
     def _validate(self):
         """Make sure all settings exist."""
         unknown = set(self._values) - set(configdata.DATA)

From 9b7db8ee8a2bdd57cccd2de213a855d36d4da51a Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 14:41:33 -0500
Subject: [PATCH 213/229] Need to mark config as dirty in _handle_migrations()

Add tests for tabs.persist_mode_on_change migration
---
 qutebrowser/config/configfiles.py     |  3 +--
 tests/unit/config/test_configfiles.py | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 7b1a26e71..e19e15695 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -179,14 +179,13 @@ class YamlConfig(QObject):
             elif name in configdata.MIGRATIONS.deleted:
                 log.config.debug("Removing {}".format(name))
                 del self._values[name]
-
         persist = 'tabs.persist_mode_on_change'
         if persist in self._values:
             if self._values[persist]:
                 self._values['tabs.mode_on_change'] = 'persist'
             else:
                 self._values['tabs.mode_on_change'] = 'normal'
-            del self._values[persist]
+            self.unset(persist)
 
     def _validate(self):
         """Make sure all settings exist."""
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 8659cf891..116d305d3 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -169,6 +169,30 @@ class TestYaml:
         assert '  old:' not in lines
         assert '  new:' not in lines
 
+    def test_merge_persist_false(self, monkeypatch, yaml, config_tmpdir):
+        """Migration of tabs.persist_mode_on_change: False."""
+        autoconfig = config_tmpdir / 'autoconfig.yml'
+        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: False', encoding='utf-8')
+
+        yaml.load()
+        yaml._save()
+
+        lines = autoconfig.read_text('utf-8').splitlines()
+        assert '  tabs.persist_mode_on_change:' not in lines
+        assert '  tabs.mode_on_change: normal' in lines
+
+    def test_merge_persist_true(self, monkeypatch, yaml, config_tmpdir):
+        """Migration of tabs.persist_mode_on_change: True."""
+        autoconfig = config_tmpdir / 'autoconfig.yml'
+        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: True', encoding='utf-8')
+
+        yaml.load()
+        yaml._save()
+
+        lines = autoconfig.read_text('utf-8').splitlines()
+        assert '  tabs.persist_mode_on_change:' not in lines
+        assert '  tabs.mode_on_change: persist' in lines
+
     def test_renamed_key_unknown_target(self, monkeypatch, yaml,
                                         config_tmpdir):
         """A key marked as renamed with invalid name should raise an error."""

From 57fe674dc442d8cf8dde9ef077e774c710cf57ea Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 15:22:56 -0500
Subject: [PATCH 214/229] shorten lines

---
 tests/unit/config/test_configfiles.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 116d305d3..101b883cd 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -172,7 +172,8 @@ class TestYaml:
     def test_merge_persist_false(self, monkeypatch, yaml, config_tmpdir):
         """Migration of tabs.persist_mode_on_change: False."""
         autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: False', encoding='utf-8')
+        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: False',
+                              encoding='utf-8')
 
         yaml.load()
         yaml._save()
@@ -184,7 +185,8 @@ class TestYaml:
     def test_merge_persist_true(self, monkeypatch, yaml, config_tmpdir):
         """Migration of tabs.persist_mode_on_change: True."""
         autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: True', encoding='utf-8')
+        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: True',
+                              encoding='utf-8')
 
         yaml.load()
         yaml._save()

From 9f49ac8e59bc7c420f55b36b3b2e02749fa1ca44 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 15:25:20 -0500
Subject: [PATCH 215/229] revert "fix shorten line" from origin/master

---
 qutebrowser/browser/network/proxy.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py
index 9a1f80ae8..96be78742 100644
--- a/qutebrowser/browser/network/proxy.py
+++ b/qutebrowser/browser/network/proxy.py
@@ -1,6 +1,6 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
 
-# Copyright 2014-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# Copyright 2014-2018 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
 #
 # This file is part of qutebrowser.
 #
@@ -61,7 +61,8 @@ class ProxyFactory(QNetworkProxyFactory):
         """
         proxy = config.val.content.proxy
         if proxy is configtypes.SYSTEM_PROXY:
-            # On Linux, use "export http_proxy=socks5://host:port" to manually set system proxy
+            # On Linux, use "export http_proxy=socks5://host:port" to manually
+            # set system proxy.
             # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery
             proxies = QNetworkProxyFactory.systemProxyForQuery(query)
         elif isinstance(proxy, pac.PACFetcher):

From 74759fe04c0fa1d465cb36d3f8b00d6ebd9ef49d Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 15:33:02 -0500
Subject: [PATCH 216/229] add missing decorator to _on_proc_finished

---
 qutebrowser/browser/commands.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 3619affc5..7b67133cb 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1218,6 +1218,7 @@ class CommandDispatcher:
         log.procs.debug("Executing {} with args {}, userscript={}".format(
             cmd, args, userscript))
 
+        @pyqtSlot()
         def _on_proc_finished():
             if output:
                 tb = objreg.get('tabbed-browser', scope='window',

From 0b5ba828db6d06c5aaa317ba4f58ccdd708899d3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:23:07 +0100
Subject: [PATCH 217/229] Add missing test

---
 tests/end2end/features/tabs.feature | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/end2end/features/tabs.feature b/tests/end2end/features/tabs.feature
index 1c670878e..065b92096 100644
--- a/tests/end2end/features/tabs.feature
+++ b/tests/end2end/features/tabs.feature
@@ -248,6 +248,18 @@ Feature: Tab management
             - data/numbers/2.txt
             - data/numbers/3.txt
 
+    Scenario: :tab-focus with current tab number and --no-last
+        When I open data/numbers/1.txt
+        And I open data/numbers/2.txt in a new tab
+        And I open data/numbers/3.txt in a new tab
+        And I run :tab-focus 1
+        And I run :tab-focus 3
+        And I run :tab-focus --no-last 3
+        Then the following tabs should be open:
+            - data/numbers/1.txt
+            - data/numbers/2.txt
+            - data/numbers/3.txt (active)
+
     Scenario: :tab-focus with -1
         When I open data/numbers/1.txt
         And I open data/numbers/2.txt in a new tab

From 7058a3be742257ab6cd28451aaab3838281c58d8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:25:39 +0100
Subject: [PATCH 218/229] Regenerate docs

---
 doc/help/commands.asciidoc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 82c714cdf..97ce1a41f 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -519,7 +519,8 @@ Show help about a command or setting.
 
 [[hint]]
 === hint
-Syntax: +:hint [*--mode* 'mode'] [*--add-history*] [*--rapid*] ['group'] ['target'] ['args' ['args' ...]]+
+Syntax: +:hint [*--mode* 'mode'] [*--add-history*] [*--rapid*]
+     ['group'] ['target'] ['args' ['args' ...]]+
 
 Start hinting.
 
@@ -769,7 +770,8 @@ Do nothing.
 
 [[open]]
 === open
-Syntax: +:open [*--related*] [*--bg*] [*--tab*] [*--window*] [*--secure*] [*--private*] ['url']+
+Syntax: +:open [*--related*] [*--bg*] [*--tab*] [*--window*] [*--secure*] [*--private*]
+     ['url']+
 
 Open a URL in the current/[count]th tab.
 
@@ -1089,7 +1091,9 @@ Load a session.
 
 [[session-save]]
 === session-save
-Syntax: +:session-save [*--current*] [*--quiet*] [*--force*] [*--only-active-window*] [*--with-private*] ['name']+
+Syntax: +:session-save [*--current*] [*--quiet*] [*--force*] [*--only-active-window*]
+             [*--with-private*]
+             ['name']+
 
 Save a session.
 

From 1ed427c3423828dcaffe3b043742e3b6eece3674 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:27:05 +0100
Subject: [PATCH 219/229] Update changelog

---
 doc/changelog.asciidoc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 25ddb60ab..2c34e8005 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -28,6 +28,10 @@ Added
 - QtWebEngine: Retrying downloads is now supported with Qt 5.10 or newer.
 - QtWebEngine: Hinting and other features inside same-origin frames is now
   supported.
+- New `cycle-inputs.js` script in `scripts/` which can be used with `:jseval -f`
+  to cycle through inputs.
+- New `--no-last` flag for `:tab-focus` to not focus the last tab when focusing
+  the currently focused one.
 
 Changed
 ~~~~~~~

From 16a3bece348a4cbcabe9f7a107d6c6c5ab8cf4f6 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:28:14 +0100
Subject: [PATCH 220/229] Add missing import

---
 qutebrowser/browser/commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index ceb3d1c88..12e06d75c 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -26,7 +26,7 @@ import functools
 import typing
 
 from PyQt5.QtWidgets import QApplication, QTabBar, QDialog
-from PyQt5.QtCore import Qt, QUrl, QEvent, QUrlQuery
+from PyQt5.QtCore import pyqtSlot, Qt, QUrl, QEvent, QUrlQuery
 from PyQt5.QtGui import QKeyEvent
 from PyQt5.QtPrintSupport import QPrintDialog, QPrintPreviewDialog
 

From c82be35639f915cc40dcfc27cd0d1eaf9eee2a03 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:29:40 +0100
Subject: [PATCH 221/229] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 2c34e8005..a94f174a4 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -65,6 +65,8 @@ Fixed
   correctly when filtering them in the completion.
 - `:bookmark-add "" foo` can now be used to save the current URL with a custom
   title.
+- `:spawn -o` now waits until the process has finished before trying to show the
+  output. Previously, it incorrectly showed the previous output immediately.
 
 Removed
 ~~~~~~~

From 3779f59a230761d486c29363ac6129641bfeb6ba Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:48:51 +0100
Subject: [PATCH 222/229] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index a94f174a4..6a1037b1b 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -67,6 +67,8 @@ Fixed
   title.
 - `:spawn -o` now waits until the process has finished before trying to show the
   output. Previously, it incorrectly showed the previous output immediately.
+- QtWebEngine: Qt download objects are now cleaned up properly when a download
+  is removed.
 
 Removed
 ~~~~~~~

From b648345bf84ba072ce991d6a8c1913a227e22903 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 9 Feb 2018 22:50:36 +0100
Subject: [PATCH 223/229] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 6a1037b1b..44c4ff39c 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -69,6 +69,7 @@ Fixed
   output. Previously, it incorrectly showed the previous output immediately.
 - QtWebEngine: Qt download objects are now cleaned up properly when a download
   is removed.
+- Suspended pages now should always load the correct page when being un-suspended.
 
 Removed
 ~~~~~~~

From 504e29c004004a96dd9687afbc21e619689d0828 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Fri, 9 Feb 2018 21:25:11 -0500
Subject: [PATCH 224/229] fix configfiles tests

- fix test_renamed_key()
- fix test_deleted_key()
- combine both test_merge_persist tests using @pytest.mark.parametrize
- fix _handle_migrations(): mark data dirty for renamed and deleted
---
 qutebrowser/config/configfiles.py     |  4 ++--
 tests/unit/config/test_configfiles.py | 32 +++++++++------------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index e19e15695..2220de93d 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -175,10 +175,10 @@ class YamlConfig(QObject):
                 new_name = configdata.MIGRATIONS.renamed[name]
                 log.config.debug("Renaming {} to {}".format(name, new_name))
                 self._values[new_name] = self._values[name]
-                del self._values[name]
+                self.unset(name)
             elif name in configdata.MIGRATIONS.deleted:
                 log.config.debug("Removing {}".format(name))
-                del self._values[name]
+                self.unset(name)
         persist = 'tabs.persist_mode_on_change'
         if persist in self._values:
             if self._values[persist]:
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index 101b883cd..341fad689 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -152,7 +152,7 @@ class TestYaml:
         yaml._save()
 
         lines = autoconfig.read_text('utf-8').splitlines()
-        assert '  hello:' not in lines
+        assert '  hello: world' not in lines
 
     def test_renamed_key(self, monkeypatch, yaml, config_tmpdir):
         """A key marked as renamed should be renamed properly."""
@@ -166,34 +166,22 @@ class TestYaml:
         yaml._save()
 
         lines = autoconfig.read_text('utf-8').splitlines()
-        assert '  old:' not in lines
-        assert '  new:' not in lines
+        assert '  old: value' not in lines
+        assert '  tabs.show: value' in lines
 
-    def test_merge_persist_false(self, monkeypatch, yaml, config_tmpdir):
-        """Migration of tabs.persist_mode_on_change: False."""
+    @pytest.mark.parametrize('persist', [True, False])
+    def test_merge_persist(self, yaml, config_tmpdir, persist):
+        """Tests for migration of tabs.persist_mode_on_change."""
         autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: False',
-                              encoding='utf-8')
-
+        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: {}'.
+                              format(persist), encoding='utf-8')
         yaml.load()
         yaml._save()
 
         lines = autoconfig.read_text('utf-8').splitlines()
+        mode = 'persist' if persist else 'normal'
         assert '  tabs.persist_mode_on_change:' not in lines
-        assert '  tabs.mode_on_change: normal' in lines
-
-    def test_merge_persist_true(self, monkeypatch, yaml, config_tmpdir):
-        """Migration of tabs.persist_mode_on_change: True."""
-        autoconfig = config_tmpdir / 'autoconfig.yml'
-        autoconfig.write_text('global:\n  tabs.persist_mode_on_change: True',
-                              encoding='utf-8')
-
-        yaml.load()
-        yaml._save()
-
-        lines = autoconfig.read_text('utf-8').splitlines()
-        assert '  tabs.persist_mode_on_change:' not in lines
-        assert '  tabs.mode_on_change: persist' in lines
+        assert '  tabs.mode_on_change: {}'.format(mode) in lines
 
     def test_renamed_key_unknown_target(self, monkeypatch, yaml,
                                         config_tmpdir):

From 995e5633521d063bcdeb5d07148e5e0984e98012 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 10:36:58 +0100
Subject: [PATCH 225/229] Update docs

---
 doc/changelog.asciidoc          | 3 +++
 doc/help/commands.asciidoc      | 5 +++++
 qutebrowser/browser/commands.py | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 44c4ff39c..b757745a4 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -32,6 +32,7 @@ Added
   to cycle through inputs.
 - New `--no-last` flag for `:tab-focus` to not focus the last tab when focusing
   the currently focused one.
+- New `--edit` flag for `:view-source` to open the source in an external editor.
 
 Changed
 ~~~~~~~
@@ -76,6 +77,8 @@ Removed
 
 - `QUTE_SELECTED_HTML` is now not set for userscripts anymore except when called
   via hints.
+- The `qutebrowser_viewsource` userscript has been removed as `:view-source
+  --edit` can now be used.
 
 v1.1.1
 ------
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 97ce1a41f..bd84417d7 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -1326,8 +1326,13 @@ Show version information.
 
 [[view-source]]
 === view-source
+Syntax: +:view-source [*--edit*]+
+
 Show the source of the current page in a new tab.
 
+==== optional arguments
+* +*-e*+, +*--edit*+: Edit the source in the editor instead of opening a tab.
+
 [[window-only]]
 === window-only
 Close all windows except for the current one.
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index a7f4e8c4d..a59cdac25 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1511,7 +1511,8 @@ class CommandDispatcher:
         """Show the source of the current page in a new tab.
 
         Args:
-            edit: Open source in editor instead of tab."""
+            edit: Edit the source in the editor instead of opening a tab.
+        """
         tab = self._current_widget()
         try:
             current_url = self._current_url()

From 4e4a1d01c4ed258c726fb1920c49d97ccd916eae Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 10:37:05 +0100
Subject: [PATCH 226/229] Remove qutebrowser_viewsource userscript

:view-source --edit can now be used instead.
---
 misc/userscripts/qutebrowser_viewsource | 33 -------------------------
 1 file changed, 33 deletions(-)
 delete mode 100755 misc/userscripts/qutebrowser_viewsource

diff --git a/misc/userscripts/qutebrowser_viewsource b/misc/userscripts/qutebrowser_viewsource
deleted file mode 100755
index a8ad71de3..000000000
--- a/misc/userscripts/qutebrowser_viewsource
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2015 Zach-Button <zachrey.button@gmail.com>
-# Copyright 2016-2017 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
-#
-# This file is part of qutebrowser.
-#
-# qutebrowser is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# qutebrowser is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
-
-#
-# This script fetches the unprocessed HTML source for a page and opens it in vim.
-#	:bind gf spawn --userscript qutebrowser_viewsource
-#
-# Caveat: Does not use authentication of any kind. Add it in if you want it to.
-#
-
-path=$(mktemp --tmpdir qutebrowser_XXXXXXXX.html)
-
-curl "$QUTE_URL" > "$path"
-urxvt -e vim "$path"
-
-rm "$path"

From 11a0580e6431b07f50098f762e605c87e4d3eb30 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 10:41:57 +0100
Subject: [PATCH 227/229] Fix Qt spelling

---
 doc/faq.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/faq.asciidoc b/doc/faq.asciidoc
index 9c8c51f16..8bbc1e5d0 100644
--- a/doc/faq.asciidoc
+++ b/doc/faq.asciidoc
@@ -218,7 +218,7 @@ And then re-emerging qtwebengine with: +
 
 Unable to view DRM content (Netflix, Spotify, etc.).::
     You will need to install `widevine` and set `qt.args` to point to it.
-    QT5.9 currently only supports widevine up to Chrome version 61.
+    Qt 5.9 currently only supports widevine up to Chrome version 61.
 +
 On Arch, simply install `qt5-webengine-widevine` from the AUR and run:
 +
@@ -230,7 +230,7 @@ On Arch, simply install `qt5-webengine-widevine` from the AUR and run:
 For other distributions, download the chromium tarball and widevine-cdm zip from
 https://aur.archlinux.org/packages/qt5-webengine-widevine/[the AUR page],
 extract `libwidevinecdmadapter.so` and `libwidevinecdm.so` files, respectively,
-and move them to the `ppapi` plugin directory in your QT library directory (create it if it does not exist).
+and move them to the `ppapi` plugin directory in your Qt library directory (create it if it does not exist).
 +
 Lastly, set your `qt.args` to point to that directory and restart qutebrowser:
 +

From 4ac4833c9364b8192e65671d4b74d9b7c522e608 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 11:44:18 +0100
Subject: [PATCH 228/229] Clean up YamlConfig._handle_migrations

---
 qutebrowser/config/configfiles.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 2220de93d..692474075 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -169,23 +169,30 @@ class YamlConfig(QObject):
         self._validate()
 
     def _handle_migrations(self):
-        """Handle unknown/renamed keys."""
+        """Migrate older configs to the newest format."""
+        # Simple renamed/deleted options
         for name in list(self._values):
             if name in configdata.MIGRATIONS.renamed:
                 new_name = configdata.MIGRATIONS.renamed[name]
                 log.config.debug("Renaming {} to {}".format(name, new_name))
                 self._values[new_name] = self._values[name]
-                self.unset(name)
+                del self._values[name]
+                self._mark_changed()
             elif name in configdata.MIGRATIONS.deleted:
                 log.config.debug("Removing {}".format(name))
-                self.unset(name)
-        persist = 'tabs.persist_mode_on_change'
-        if persist in self._values:
-            if self._values[persist]:
-                self._values['tabs.mode_on_change'] = 'persist'
+                del self._values[name]
+                self._mark_changed()
+
+        # tabs.persist_mode_on_change got merged into tabs.mode_on_change
+        old = 'tabs.persist_mode_on_change'
+        new = 'tabs.mode_on_change'
+        if old in self._values:
+            if self._values[old]:
+                self._values[new] = 'persist'
             else:
-                self._values['tabs.mode_on_change'] = 'normal'
-            self.unset(persist)
+                self._values[new] = 'normal'
+            del self._values[old]
+            self._mark_changed()
 
     def _validate(self):
         """Make sure all settings exist."""

From 5662407e01f6654d94603596b3d21227bbbedfe2 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 10 Feb 2018 11:51:51 +0100
Subject: [PATCH 229/229] Update docs

---
 doc/changelog.asciidoc     |  5 +++++
 doc/help/settings.asciidoc | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index b757745a4..6fb47ae9d 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -54,6 +54,9 @@ Changed
   are now applied as soon as the file is saved in the editor.
 - When there are multiple unknown keys in a autoconfig.yml, they now all get
   reported in one error.
+- New `tabs.mode_on_change` setting which replaces
+  `tabs.persist_mode_on_change`. It can now be set to `restore` which remembers
+  input modes (input/passthrough) per tab.
 
 Fixed
 ~~~~~
@@ -79,6 +82,8 @@ Removed
   via hints.
 - The `qutebrowser_viewsource` userscript has been removed as `:view-source
   --edit` can now be used.
+- The `tabs.persist_mode_on_change` setting has been removed and replaced by
+  `tabs.mode_on_change`.
 
 v1.1.1
 ------
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 279e7889e..53dce9e8e 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -238,11 +238,11 @@
 |<<tabs.indicator.padding,tabs.indicator.padding>>|Padding (in pixels) for tab indicators.
 |<<tabs.indicator.width,tabs.indicator.width>>|Width (in pixels) of the progress indicator (0 to disable).
 |<<tabs.last_close,tabs.last_close>>|How to behave when the last tab is closed.
+|<<tabs.mode_on_change,tabs.mode_on_change>>|When switching tabs, what input mode is applied.
 |<<tabs.mousewheel_switching,tabs.mousewheel_switching>>|Switch between tabs using the mouse wheel.
 |<<tabs.new_position.related,tabs.new_position.related>>|Position of new tabs opened from another tab.
 |<<tabs.new_position.unrelated,tabs.new_position.unrelated>>|Position of new tabs which aren't opened from another tab.
 |<<tabs.padding,tabs.padding>>|Padding (in pixels) around text for tabs.
-|<<tabs.mode_on_change,tabs.mode_on_change>>|Set input mode behavior when switching tab.
 |<<tabs.pinned.shrink,tabs.pinned.shrink>>|Shrink pinned tabs down to their contents.
 |<<tabs.position,tabs.position>>|Position of the tab bar.
 |<<tabs.select_on_remove,tabs.select_on_remove>>|Which tab to select when the focused tab is removed.
@@ -2774,6 +2774,20 @@ Valid values:
 
 Default: +pass:[ignore]+
 
+[[tabs.mode_on_change]]
+=== tabs.mode_on_change
+When switching tabs, what input mode is applied.
+
+Type: <<types,String>>
+
+Valid values:
+
+ * +persist+: Retain the current mode.
+ * +restore+: Restore previously saved mode.
+ * +normal+: Always revert to normal mode.
+
+Default: +pass:[normal]+
+
 [[tabs.mousewheel_switching]]
 === tabs.mousewheel_switching
 Switch between tabs using the mouse wheel.
@@ -2825,20 +2839,6 @@ Default:
 - +pass:[right]+: +pass:[5]+
 - +pass:[top]+: +pass:[0]+
 
-[[tabs.mode_on_change]]
-=== tabs.mode_on_change
-When switching tabs, what input mode is applied.
-
-Type: <<types,String>>
-
-Valid values:
-
- * +persist+: Retain the current mode.
- * +restore+: Restore previously saved mode.
- * +normal+: Always revert to normal mode.
-
-Default: +pass:[normal]+
-
 [[tabs.pinned.shrink]]
 === tabs.pinned.shrink
 Shrink pinned tabs down to their contents.