Bug 1679997 - Add cssOrigin to declarative contentScripts API. r=robwu.

Differential Revision: https://phabricator.services.mozilla.com/D251173

Author: chrstinalin

dom/chrome-webidl/WebExtensionContentScript.webidl

@@ -182,6 +182,11 @@ enum ContentScriptExecutionWorld {
   "USER_SCRIPT",
 };
 
+enum ContentScriptCssOrigin {
+  "author",
+  "user",
+};
+
 [ChromeOnly, Exposed=Window]
 interface WebExtensionContentScript : MozDocumentMatcher {
   [Throws]
@@ -212,6 +217,12 @@ interface WebExtensionContentScript : MozDocumentMatcher {
   [Constant]
   readonly attribute DOMString? worldId;
 
+  /**
+   * The css origin of the stylesheet to inject.
+   */
+  [Constant]
+  readonly attribute ContentScriptCssOrigin cssOrigin;
+
   /**
    * A set of paths, relative to the extension root, of CSS sheets to inject
    * into matching pages.
@@ -234,6 +245,8 @@ dictionary WebExtensionContentScriptInit : MozDocumentMatcherInit {
 
   DOMString? worldId = null;
 
+  ContentScriptCssOrigin cssOrigin = "author";
+
   sequence<DOMString> cssPaths = [];
 
   sequence<DOMString> jsPaths = [];

toolkit/components/extensions/Extension.sys.mjs

@@ -2163,6 +2163,7 @@ export class ExtensionData {
 
           jsPaths: options.js || [],
           cssPaths: options.css || [],
+          cssOrigin: options.css_origin,
         });
       }
 

toolkit/components/extensions/ExtensionContent.sys.mjs

@@ -360,7 +360,7 @@ class Script {
    *        execution details. This is usually a plain WebExtensionContentScript
    *        except when the script is run via `tabs.executeScript` or
    *        `scripting.executeScript`. In this case, the object may have some
-   *        extra properties: wantReturnValue, removeCSS, cssOrigin
+   *        extra properties: wantReturnValue, removeCSS
    */
   constructor(extension, matcher) {
     this.scriptType = "content_script";
@@ -1455,7 +1455,6 @@ export var ExtensionContent = {
     Object.assign(matcher, {
       wantReturnValue: options.wantReturnValue,
       removeCSS: options.removeCSS,
-      cssOrigin: options.cssOrigin,
     });
     let script = contentScripts.get(matcher);
 

toolkit/components/extensions/ExtensionScriptingStore.sys.mjs

@@ -179,6 +179,7 @@ export const makeInternalContentScript = (
       // upfront.
       checkPermissions: true,
       cssPaths,
+      cssOrigin: options.cssOrigin || "author",
       excludeMatches: options.excludeMatches,
       jsPaths,
       matches: options.matches,
@@ -214,6 +215,7 @@ export const makePublicContentScript = (extension, internalScript) => {
     runAt: internalScript.runAt,
     world: internalScript.world,
     persistAcrossSessions: internalScript.persistAcrossSessions,
+    cssOrigin: internalScript.cssOrigin,
   };
 
   if (internalScript.cssPaths.length) {

toolkit/components/extensions/Schemas.sys.mjs

@@ -445,6 +445,9 @@ class Context {
       localize(value) {
         return value;
       },
+      stringToLowerCase(value) {
+        return value.toLowerCase();
+      },
       ...params.preprocessors,
     };
 

toolkit/components/extensions/WebExtensionContentScript.h

@@ -193,13 +193,15 @@ class WebExtensionContentScript final : public MozDocumentMatcher {
  public:
   using RunAtEnum = dom::ContentScriptRunAt;
   using ExecutionWorld = dom::ContentScriptExecutionWorld;
+  using CSSOrigin = dom::ContentScriptCssOrigin;
 
   static already_AddRefed<WebExtensionContentScript> Constructor(
       dom::GlobalObject& aGlobal, WebExtensionPolicy& aExtension,
       const ContentScriptInit& aInit, ErrorResult& aRv);
 
   RunAtEnum RunAt() const { return mRunAt; }
   ExecutionWorld World() const { return mWorld; }
+  CSSOrigin CssOrigin() const { return mCssOrigin; }
   void GetWorldId(nsAString& aWorldId) const;
 
   void GetCssPaths(nsTArray<nsString>& aPaths) const {
@@ -228,6 +230,7 @@ class WebExtensionContentScript final : public MozDocumentMatcher {
   RunAtEnum mRunAt;
   ExecutionWorld mWorld;
   Nullable<nsString> mWorldId;
+  CSSOrigin mCssOrigin;
 };
 
 }  // namespace extensions

toolkit/components/extensions/WebExtensionPolicy.cpp

@@ -765,7 +765,8 @@ WebExtensionContentScript::WebExtensionContentScript(
                          aRv),
       mRunAt(aInit.mRunAt),
       mWorld(aInit.mWorld),
-      mWorldId(aInit.mWorldId) {
+      mWorldId(aInit.mWorldId),
+      mCssOrigin(aInit.mCssOrigin) {
   mCssPaths.Assign(aInit.mCssPaths);
   mJsPaths.Assign(aInit.mJsPaths);
   mExtension = &aExtension;

toolkit/components/extensions/parent/ext-contentScripts.js

@@ -98,6 +98,7 @@ class ContentScriptParent {
       jsPaths: [],
       cssPaths: [],
       originAttributesPatterns: null,
+      cssOrigin: details.cssOrigin || "author",
     };
 
     if (details.cookieStoreId != null) {

toolkit/components/extensions/schemas/content_scripts.json

@@ -67,6 +67,11 @@
             "optional": true,
             "description": "The JavaScript world for a script to execute within. Defaults to \"ISOLATED\"."
           },
+          "cssOrigin": {
+            "$ref": "extensionTypes.CSSOrigin",
+            "optional": true,
+            "description": "The css origin of the stylesheet to inject. Defaults to \"author\"."
+          },
           "cookieStoreId": {
             "choices": [
               {

toolkit/components/extensions/schemas/extension_types.json

@@ -65,7 +65,8 @@
         "id": "CSSOrigin",
         "type": "string",
         "enum": ["user", "author"],
-        "description": "The origin of the CSS to inject, this affects the cascading order (priority) of the stylesheet."
+        "description": "The origin of the CSS to inject, this affects the cascading order (priority) of the stylesheet.",
+        "preprocess": "stringToLowerCase"
       },
       {
         "id": "InjectDetails",
@@ -107,6 +108,7 @@
           "cssOrigin": {
             "$ref": "CSSOrigin",
             "optional": true,
+            "default": "author",
             "description": "The css origin of the stylesheet to inject. Defaults to \"author\"."
           }
         }