summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorPhilip Chimento <philip.chimento@gmail.com>2017-07-06 19:31:51 -0700
committerPhilip Chimento <philip@endlessm.com>2017-08-03 02:44:20 +0100
commit70ac571aadd982077b210dcd805e085cb671e89e (patch)
treeab8cd39d18cff1a0308183c7ed2edb5d026e8a46 /util
parente6cc09ddb4ef8a18bc56afbad9525ddde30ad735 (diff)
downloadgjs-70ac571aadd982077b210dcd805e085cb671e89e.tar.gz
Revert "js: Workaround for function with custom prototype"
This reverts commit 72c0298c5f9df9036ed67fd504db84cbc028daaa. The warning that was the reason for this code in the first place was removed in SpiderMonkey 52. According to https://bugzilla.mozilla.org/show_bug.cgi?id=1049041 the warning was out of date, and there are only performance effects "if the object escapes to somewhere interesting before getting its final __proto__". In addition, client code should move to ES6 classes which do not have this performance problem. Edited to resolve conflicts due to code being moved around in the meantime, and to use Object.setPrototypeOf() instead of the deprecated __proto__ property. https://bugzilla.gnome.org/show_bug.cgi?id=785652
Diffstat (limited to 'util')
-rw-r--r--util/log.cpp3
-rw-r--r--util/log.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/util/log.cpp b/util/log.cpp
index 1f59e14e..afd3aa11 100644
--- a/util/log.cpp
+++ b/util/log.cpp
@@ -238,9 +238,6 @@ _Pragma("GCC diagnostic pop")
case GJS_DEBUG_GERROR:
prefix = "JS G ERR";
break;
- case GJS_DEBUG_PROXY:
- prefix = "JS CPROXY";
- break;
default:
prefix = "???";
break;
diff --git a/util/log.h b/util/log.h
index 4eb56e4c..1d5d298d 100644
--- a/util/log.h
+++ b/util/log.h
@@ -58,7 +58,6 @@ typedef enum {
GJS_DEBUG_BYTE_ARRAY,
GJS_DEBUG_GERROR,
GJS_DEBUG_GFUNDAMENTAL,
- GJS_DEBUG_PROXY,
} GjsDebugTopic;
/* These defines are because we have some pretty expensive and