From 6ea3338f262b1de044bc516aead2bf4bd822445c Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Sun, 2 Aug 2015 23:49:17 -0400
Subject: [PATCH] code review

---
 src/js/contentscript-end.js   |  5 +++--
 src/js/contentscript-start.js | 15 ++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/js/contentscript-end.js b/src/js/contentscript-end.js
index 88726b406..72de45c68 100644
--- a/src/js/contentscript-end.js
+++ b/src/js/contentscript-end.js
@@ -470,13 +470,14 @@ var uBlockCollapser = (function() {
             if ( shadow !== null && shadow.className === sessionId ) {
                 continue;
             }
+            // https://github.com/w3c/webcomponents/issues/102
             // not all nodes can be shadowed
             try {
                 shadow = elem.createShadowRoot();
+                shadow.className = sessionId;
             } catch (ex) {
-                continue;
+                elem.style.setProperty('display', 'none', 'important');
             }
-            shadow.className = sessionId;
         }
     };
 
diff --git a/src/js/contentscript-start.js b/src/js/contentscript-start.js
index 279d234c2..7b4ca4c18 100644
--- a/src/js/contentscript-start.js
+++ b/src/js/contentscript-start.js
@@ -181,13 +181,14 @@ var hideElements = function(selectors) {
         if ( shadow !== null && shadow.className === sessionId ) {
             continue;
         }
-            // not all nodes can be shadowed
-            try {
-                shadow = elem.createShadowRoot();
-            } catch (ex) {
-                continue;
-            }
-        shadow.className = sessionId;
+        // https://github.com/w3c/webcomponents/issues/102
+        // not all nodes can be shadowed
+        try {
+            shadow = elem.createShadowRoot();
+            shadow.className = sessionId;
+        } catch (ex) {
+            elem.style.setProperty('display', 'none', 'important');
+        }
     }
 };