From 92f05e0b165f7283943137d282d0fc2122a644ef Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Tue, 1 Nov 2016 16:56:21 -0700 Subject: [PATCH] Bug 1312690: Add some stupid microoptimizations. r=aswan MozReview-Commit-ID: 4qoNuG2k0KS --HG-- extra : rebase_source : fff22127b80bb8edc8578c2035d4689452ed4f6e --- toolkit/components/extensions/ExtensionContent.jsm | 6 +++--- toolkit/components/extensions/ExtensionManagement.jsm | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/toolkit/components/extensions/ExtensionContent.jsm b/toolkit/components/extensions/ExtensionContent.jsm index 026b099c84a5..d16ce6166dc3 100644 --- a/toolkit/components/extensions/ExtensionContent.jsm +++ b/toolkit/components/extensions/ExtensionContent.jsm @@ -215,11 +215,11 @@ Script.prototype = { */ tryInject(window, sandbox, shouldRun, when) { if (shouldRun("document_start")) { - let winUtils = window.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIDOMWindowUtils); - let {cssURLs} = this; if (cssURLs.length > 0) { + let winUtils = window.QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDOMWindowUtils); + let method = this.remove_css ? winUtils.removeSheetUsingURIString : winUtils.loadSheetUsingURIString; for (let url of cssURLs) { runSafeSyncWithoutClone(method, url, winUtils.AUTHOR_SHEET); diff --git a/toolkit/components/extensions/ExtensionManagement.jsm b/toolkit/components/extensions/ExtensionManagement.jsm index dca162f4e355..324c5b71b933 100644 --- a/toolkit/components/extensions/ExtensionManagement.jsm +++ b/toolkit/components/extensions/ExtensionManagement.jsm @@ -239,8 +239,7 @@ var Service = { // extensionURIToAddonID, which ensures that we don't inject our // API into webAccessibleResources or remote web pages. function getAddonIdForWindow(window) { - let principal = window.document.nodePrincipal; - return principal.originAttributes.addonId; + return Cu.getObjectPrincipal(window).originAttributes.addonId; } const API_LEVELS = Object.freeze({