summaryrefslogtreecommitdiff
path: root/src/content
diff options
context:
space:
mode:
authorhackademix2018-07-26 23:23:11 +0200
committerhackademix2018-07-26 23:48:20 +0200
commit21810063d0851fb88623d0458fa4fc2cd054b0db (patch)
tree1fb30dd82c8c82e4cd9e9dd717efcc2b3131b224 /src/content
parent4e62643b33e0f3a7653ae94cda34c7d6ace52097 (diff)
downloadnoscript-21810063d0851fb88623d0458fa4fc2cd054b0db.tar.gz
noscript-21810063d0851fb88623d0458fa4fc2cd054b0db.tar.xz
noscript-21810063d0851fb88623d0458fa4fc2cd054b0db.zip
Disable scripting in HTML-embedding objects where webglHook cannot run, if webgl not allowed.
Diffstat (limited to 'src/content')
-rw-r--r--src/content/content.js4
-rw-r--r--src/content/media.js2
-rw-r--r--src/content/webglHook.js2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/content/content.js b/src/content/content.js
index dd847f0..aea705e 100644
--- a/src/content/content.js
+++ b/src/content/content.js
@@ -100,8 +100,8 @@ async function init(oldPage = false) {
}
queryingCanScript = true;
- debug(`init() called in document %s, contentType %s readyState %s`,
- document.URL, document.contentType, document.readyState);
+ debug(`init() called in document %s, contentType %s readyState %s, frameElement %o`,
+ document.URL, document.contentType, document.readyState, window.frameElement && frameElement.data);
try {
let {canScript, shouldScript} = await browser.runtime.sendMessage({type: "canScript"});
diff --git a/src/content/media.js b/src/content/media.js
index ead6e05..5a6827a 100644
--- a/src/content/media.js
+++ b/src/content/media.js
@@ -1,4 +1,4 @@
-if (correctFrame()) {
+{
debug("Media Hook (blocked %s)", !!window.mediaBlocker, document.URL, document.documentElement && document.documentElement.innerHTML);
(() => {
let unpatched = new Map();
diff --git a/src/content/webglHook.js b/src/content/webglHook.js
index 39637e2..171ce59 100644
--- a/src/content/webglHook.js
+++ b/src/content/webglHook.js
@@ -1,4 +1,4 @@
-if (correctFrame()) {
+{
debug("WebGL Hook", document.URL, document.documentElement && document.documentElement.innerHTML);
let proto = HTMLCanvasElement.prototype;
let getContext = proto.getContext;