Bug 1508147 - Re-remove unused CompartmentPrivate::isAddonCompartment, r=bholley
authorTimothy Guan-tin Chien <timdream@gmail.com>
Mon, 19 Nov 2018 18:46:57 +0000
changeset 503476 bd4cebdbed4bcd34d449f67d51f139f9bdf75edc
parent 503475 d68e7e8e1db2c8620d3678897532569fd711667d
child 503477 fb616c66a1fd330cdbdaa8494bbd38b4b18ff1f0
child 503556 81b77c4f014e368ae8fb20bde050ddeef1357195
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley
bugs1508147, 1478275, 1431255
milestone65.0a1
first release with
nightly linux32
bd4cebdbed4b / 65.0a1 / 20181119220031 / files
nightly linux64
bd4cebdbed4b / 65.0a1 / 20181119220031 / files
nightly mac
bd4cebdbed4b / 65.0a1 / 20181119220031 / files
nightly win32
bd4cebdbed4b / 65.0a1 / 20181119220031 / files
nightly win64
bd4cebdbed4b / 65.0a1 / 20181119220031 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1508147 - Re-remove unused CompartmentPrivate::isAddonCompartment, r=bholley It was removed in bug 1478275, but re-introduced because of a false rebase in bug 1431255. Differential Revision: https://phabricator.services.mozilla.com/D12331
js/xpconnect/src/XPCJSRuntime.cpp
js/xpconnect/src/xpcprivate.h
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -190,17 +190,16 @@ CompartmentPrivate::CompartmentPrivate(J
     : originInfo(origin, site)
     , wantXrays(false)
     , allowWaivers(true)
     , isWebExtensionContentScript(false)
     , allowCPOWs(false)
     , isContentXBLCompartment(false)
     , isUAWidgetCompartment(false)
     , isSandboxCompartment(false)
-    , isAddonCompartment(false)
     , universalXPConnectEnabled(false)
     , forcePermissiveCOWs(false)
     , wasNuked(false)
     , mWrappedJSMap(JSObject2WrappedJSMap::newMap(XPC_JS_MAP_LENGTH))
 {
     MOZ_COUNT_CTOR(xpc::CompartmentPrivate);
     mozilla::PodArrayZero(wrapperDenialWarnings);
 }
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -2936,21 +2936,16 @@ public:
     bool isContentXBLCompartment;
 
     // True if this compartment is a UA widget compartment.
     bool isUAWidgetCompartment;
 
     // True if this is a sandbox compartment. See xpc::CreateSandboxObject.
     bool isSandboxCompartment;
 
-    // True if EnsureAddonCompartment has been called for this compartment.
-    // Note that this is false for extensions that ship with the browser, like
-    // browser/extensions/activity-stream.
-    bool isAddonCompartment;
-
     // This is only ever set during mochitest runs when enablePrivilege is called.
     // It's intended as a temporary stopgap measure until we can finish ripping out
     // enablePrivilege. Once set, this value is never unset (i.e., it doesn't follow
     // the old scoping rules of enablePrivilege).
     //
     // Using it in production is inherently unsafe.
     bool universalXPConnectEnabled;