From 7141f9a2be12cedf780c47529920b0e497c97052 Mon Sep 17 00:00:00 2001
From: Jordyn/The Linux Geek <onlinecloud1@gmail.com>
Date: Thu, 3 May 2018 17:54:43 -0500
Subject: [PATCH] Revert "Try to fix intermittent per-domain stylesheets".

This reverts commit 905c863598e7ce08c3e8641921a570fd54275901.
---
 qutebrowser/browser/webengine/webenginetab.py |  5 ++++-
 qutebrowser/utils/javascript.py               | 18 ++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 101ad3611..5f0952bca 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -801,7 +801,7 @@ class _WebEngineScripts(QObject):
     def _update_stylesheet(self, url=None):
         """Update the custom stylesheet in existing tabs."""
         css = shared.get_user_stylesheet(url=url)
-        code = javascript.assemble('stylesheet', 'set_css', css, delay=True)
+        code = javascript.assemble('stylesheet', 'set_css', css)
         self._tab.run_js_async(code)
 
     def _inject_early_js(self, name, js_code, *,
@@ -1226,6 +1226,9 @@ class WebEngineTab(browsertab.AbstractTab):
             # the old icon is still displayed.
             self.icon_changed.emit(QIcon())
 
+        url = self.url(requested=True)
+        self._update_stylesheet(url)
+
     @pyqtSlot(QUrl)
     def _on_predicted_navigation(self, url):
         """If we know we're going to visit an URL soon, change the settings.
diff --git a/qutebrowser/utils/javascript.py b/qutebrowser/utils/javascript.py
index e7053736c..93df8e70f 100644
--- a/qutebrowser/utils/javascript.py
+++ b/qutebrowser/utils/javascript.py
@@ -64,28 +64,14 @@ def _convert_js_arg(arg):
             arg, type(arg).__name__))
 
 
-def assemble(module, function, *args, delay=False):
+def assemble(module, function, *args):
     """Assemble a javascript file and a function call."""
     js_args = ', '.join(_convert_js_arg(arg) for arg in args)
     if module == 'window':
         parts = ['window', function]
     else:
         parts = ['window', '_qutebrowser', module, function]
-    if delay:
-        code = '''
-        "use strict";
-        if (document.readyState !== "loading") {{
-            {parts}({args});
-        }} else {{
-            window.addEventListener("DOMContentLoaded", () => {{
-                {parts}({args});
-            }});
-        }}
-        '''
-        code = code.format(parts='.'.join(parts), args=js_args)
-    else:
-        code = '"use strict";\n{}({});'.format('.'.join(parts), js_args)
-    # print(code)
+    code = '"use strict";\n{}({});'.format('.'.join(parts), js_args)
     return code