Bug 1419270 part 2. Use getter or setter specific NeedsSubjectPrincipal annotations more. r=qdot

bzbarsky · bzbarsky · commit 887ce3941aaa · 2017-12-05T16:03:18.000-05:00
MozReview-Commit-ID: KBwjFh3TMUg
diff --git a/dom/base/Attr.h b/dom/base/Attr.h
@@ -87,10 +87,7 @@ class Attr final : public nsIAttribute,
 
   // XPCOM GetName() is OK
 
-  void GetValue(nsString& val, nsIPrincipal&)
-  {
-    GetValue(val);
-  }
+  // XPCOM GetValue() is OK
 
   void SetValue(const nsAString& aValue, nsIPrincipal* aTriggeringPrincipal, ErrorResult& aRv);
 
diff --git a/dom/base/Element.h b/dom/base/Element.h
@@ -1220,10 +1220,6 @@ class Element : public FragmentOrElement
                                     nsTArray<RefPtr<Animation>>& aAnimations);
 
   NS_IMETHOD GetInnerHTML(nsAString& aInnerHTML);
-  void GetInnerHTML(nsAString& aInnerHTML, nsIPrincipal& aSubjectPrincipal)
-  {
-    GetInnerHTML(aInnerHTML);
-  }
   virtual void SetInnerHTML(const nsAString& aInnerHTML, nsIPrincipal& aSubjectPrincipal, ErrorResult& aError);
   void GetOuterHTML(nsAString& aOuterHTML);
   void SetOuterHTML(const nsAString& aOuterHTML, ErrorResult& aError);
diff --git a/dom/base/Location.cpp b/dom/base/Location.cpp
@@ -440,7 +440,6 @@ Location::GetHref(nsAString& aHref)
 
 void
 Location::SetHref(const nsAString& aHref,
-                  nsIPrincipal& aSubjectPrincipal,
                   ErrorResult& aRv)
 {
   JSContext *cx = nsContentUtils::GetCurrentJSContext();
diff --git a/dom/base/Location.h b/dom/base/Location.h
@@ -69,7 +69,6 @@ class Location final : public nsISupports
   }
 
   void SetHref(const nsAString& aHref,
-               nsIPrincipal& aSubjectPrincipal,
                ErrorResult& aError);
 
   void GetOrigin(nsAString& aOrigin,
diff --git a/dom/base/nsINode.h b/dom/base/nsINode.h
@@ -1340,12 +1340,6 @@ class nsINode : public mozilla::dom::EventTarget
   // way to ask an element whether it's an HTMLContentElement.
   virtual bool IsHTMLContentElement() const { return false; }
 
-  void GetTextContent(nsAString& aTextContent,
-                      nsIPrincipal& aSubjectPrincipal,
-                      mozilla::OOMReporter& aError)
-  {
-    GetTextContentInternal(aTextContent, aError);
-  }
   void GetTextContent(nsAString& aTextContent,
                       mozilla::OOMReporter& aError)
   {
diff --git a/dom/bindings/GenerateCSS2PropertiesWebIDL.py b/dom/bindings/GenerateCSS2PropertiesWebIDL.py
@@ -29,7 +29,7 @@ def generate(output, idlFilename, preprocessorHeader):
         # Unfortunately, even some of the getters here are fallible
         # (e.g. on nsComputedDOMStyle).
         extendedAttrs = ["Throws", "TreatNullAs=EmptyString",
-                         "NeedsSubjectPrincipal"]
+                         "SetterNeedsSubjectPrincipal"]
         if pref is not "":
             extendedAttrs.append('Pref="%s"' % pref)
 
diff --git a/dom/html/HTMLFrameElement.h b/dom/html/HTMLFrameElement.h
@@ -100,7 +100,7 @@ class HTMLFrameElement final : public nsGenericHTMLFrameElement
     SetHTMLAttr(nsGkAtoms::scrolling, aScrolling, aError);
   }
 
-  void GetSrc(nsString& aSrc, nsIPrincipal&)
+  void GetSrc(nsString& aSrc)
   {
     GetURIAttr(nsGkAtoms::src, nullptr, aSrc);
   }
diff --git a/dom/html/HTMLIFrameElement.h b/dom/html/HTMLIFrameElement.h
@@ -46,7 +46,7 @@ class HTMLIFrameElement final : public nsGenericHTMLFrameElement
   uint32_t GetSandboxFlags();
 
   // Web IDL binding methods
-  void GetSrc(nsString& aSrc, nsIPrincipal&) const
+  void GetSrc(nsString& aSrc) const
   {
     GetURIAttr(nsGkAtoms::src, nullptr, aSrc);
   }
diff --git a/dom/html/HTMLImageElement.h b/dom/html/HTMLImageElement.h
@@ -142,10 +142,6 @@ class HTMLImageElement final : public nsGenericHTMLElement,
   {
     SetHTMLAttr(nsGkAtoms::alt, aAlt, aError);
   }
-  void GetSrc(nsAString& aSrc, nsIPrincipal&)
-  {
-    GetSrc(aSrc);
-  }
   void GetSrc(nsAString& aSrc)
   {
     GetURIAttr(nsGkAtoms::src, nullptr, aSrc);
@@ -158,7 +154,7 @@ class HTMLImageElement final : public nsGenericHTMLElement,
   {
     SetHTMLAttr(nsGkAtoms::src, aSrc, aTriggeringPrincipal, aError);
   }
-  void GetSrcset(nsAString& aSrcset, nsIPrincipal&)
+  void GetSrcset(nsAString& aSrcset)
   {
     GetHTMLAttr(nsGkAtoms::srcset, aSrcset);
   }
diff --git a/dom/html/HTMLInputElement.h b/dom/html/HTMLInputElement.h
@@ -714,7 +714,7 @@ class HTMLInputElement final : public nsGenericHTMLFormElementWithState,
     SetUnsignedIntAttr(nsGkAtoms::size, aValue, DEFAULT_COLS, aRv);
   }
 
-  void GetSrc(nsAString& aValue, nsIPrincipal&)
+  void GetSrc(nsAString& aValue)
   {
     GetURIAttr(nsGkAtoms::src, nullptr, aValue);
   }
diff --git a/dom/html/HTMLLinkElement.h b/dom/html/HTMLLinkElement.h
@@ -88,10 +88,6 @@ class HTMLLinkElement final : public nsGenericHTMLElement,
   {
     GetURIAttr(nsGkAtoms::href, nullptr, aValue);
   }
-  void GetHref(nsString& aValue, nsIPrincipal&)
-  {
-    GetHref(aValue);
-  }
   void SetHref(const nsAString& aHref, nsIPrincipal& aTriggeringPrincipal, ErrorResult& aRv)
   {
     SetHTMLAttr(nsGkAtoms::href, aHref, aTriggeringPrincipal, aRv);
diff --git a/dom/html/HTMLMediaElement.h b/dom/html/HTMLMediaElement.h
@@ -442,10 +442,6 @@ class HTMLMediaElement : public nsGenericHTMLElement,
 
   MediaError* GetError() const;
 
-  void GetSrc(nsString& aSrc, nsIPrincipal&)
-  {
-    GetSrc(aSrc);
-  }
   void SetSrc(const nsAString& aSrc, nsIPrincipal& aTriggeringPrincipal, ErrorResult& aRv)
   {
     SetHTMLAttr(nsGkAtoms::src, aSrc, aTriggeringPrincipal, aRv);
diff --git a/dom/html/HTMLSourceElement.h b/dom/html/HTMLSourceElement.h
@@ -54,7 +54,7 @@ class HTMLSourceElement final : public nsGenericHTMLElement
   MediaSource* GetSrcMediaSource() { return mSrcMediaSource; };
 
   // WebIDL
-  void GetSrc(nsString& aSrc, nsIPrincipal&)
+  void GetSrc(nsString& aSrc)
   {
     GetURIAttr(nsGkAtoms::src, nullptr, aSrc);
   }
@@ -82,7 +82,7 @@ class HTMLSourceElement final : public nsGenericHTMLElement
     SetHTMLAttr(nsGkAtoms::type, aType, rv);
   }
 
-  void GetSrcset(DOMString& aSrcset, nsIPrincipal&)
+  void GetSrcset(DOMString& aSrcset)
   {
     GetHTMLAttr(nsGkAtoms::srcset, aSrcset);
   }
diff --git a/dom/html/nsHTMLDocument.h b/dom/html/nsHTMLDocument.h
@@ -209,11 +209,7 @@ class nsHTMLDocument : public nsDocument,
              mozilla::ErrorResult& rv);
   void Writeln(JSContext* cx, const mozilla::dom::Sequence<nsString>& aText,
                mozilla::ErrorResult& rv);
-  void GetDesignMode(nsAString& aDesignMode,
-                     nsIPrincipal& aSubjectPrincipal)
-  {
-    GetDesignMode(aDesignMode);
-  }
+  // XPCOM GetDesignMode is fine.
   void SetDesignMode(const nsAString& aDesignMode,
                      nsIPrincipal& aSubjectPrincipal,
                      mozilla::ErrorResult& rv);
diff --git a/dom/webidl/Attr.webidl b/dom/webidl/Attr.webidl
@@ -12,7 +12,7 @@
 
 interface Attr : Node {
   readonly attribute DOMString localName;
-           [CEReactions, NeedsSubjectPrincipal, SetterThrows]
+           [CEReactions, SetterNeedsSubjectPrincipal, SetterThrows]
            attribute DOMString value;
 
   [Constant]
diff --git a/dom/webidl/CSSStyleDeclaration.webidl b/dom/webidl/CSSStyleDeclaration.webidl
@@ -8,7 +8,7 @@
  */
 
 interface CSSStyleDeclaration {
-  [CEReactions, NeedsSubjectPrincipal, SetterThrows]
+  [CEReactions, SetterNeedsSubjectPrincipal, SetterThrows]
   attribute DOMString cssText;
 
   readonly attribute unsigned long length;
diff --git a/dom/webidl/Element.webidl b/dom/webidl/Element.webidl
@@ -221,7 +221,7 @@ partial interface Element {
 
 // http://domparsing.spec.whatwg.org/#extensions-to-the-element-interface
 partial interface Element {
-  [CEReactions, NeedsSubjectPrincipal, Pure,SetterThrows,TreatNullAs=EmptyString]
+  [CEReactions, SetterNeedsSubjectPrincipal, Pure, SetterThrows, TreatNullAs=EmptyString]
   attribute DOMString innerHTML;
   [CEReactions, Pure,SetterThrows,TreatNullAs=EmptyString]
   attribute DOMString outerHTML;
diff --git a/dom/webidl/HTMLDocument.webidl b/dom/webidl/HTMLDocument.webidl
@@ -42,7 +42,7 @@ interface HTMLDocument : Document {
   [CEReactions, Throws]
   void writeln(DOMString... text);
 
-  [CEReactions, SetterThrows, NeedsSubjectPrincipal]
+  [CEReactions, SetterThrows, SetterNeedsSubjectPrincipal]
            attribute DOMString designMode;
   [CEReactions, Throws, NeedsSubjectPrincipal]
   boolean execCommand(DOMString commandId, optional boolean showUI = false,
diff --git a/dom/webidl/HTMLFrameElement.webidl b/dom/webidl/HTMLFrameElement.webidl
@@ -17,7 +17,7 @@ interface HTMLFrameElement : HTMLElement {
            attribute DOMString name;
            [CEReactions, SetterThrows]
            attribute DOMString scrolling;
-           [CEReactions, NeedsSubjectPrincipal, SetterThrows]
+           [CEReactions, SetterNeedsSubjectPrincipal, SetterThrows]
            attribute DOMString src;
            [CEReactions, SetterThrows]
            attribute DOMString frameBorder;
diff --git a/dom/webidl/HTMLIFrameElement.webidl b/dom/webidl/HTMLIFrameElement.webidl
@@ -13,7 +13,7 @@
 
 [HTMLConstructor]
 interface HTMLIFrameElement : HTMLElement {
-  [CEReactions, NeedsSubjectPrincipal, SetterThrows, Pure]
+  [CEReactions, SetterNeedsSubjectPrincipal, SetterThrows, Pure]
            attribute DOMString src;
   [CEReactions, SetterThrows, Pure]
            attribute DOMString srcdoc;
diff --git a/dom/webidl/HTMLImageElement.webidl b/dom/webidl/HTMLImageElement.webidl
@@ -21,9 +21,9 @@ interface nsIStreamListener;
 interface HTMLImageElement : HTMLElement {
            [CEReactions, SetterThrows]
            attribute DOMString alt;
-           [CEReactions, NeedsSubjectPrincipal, SetterThrows]
+           [CEReactions, SetterNeedsSubjectPrincipal, SetterThrows]
            attribute DOMString src;
-           [CEReactions, NeedsSubjectPrincipal, SetterThrows]
+           [CEReactions, SetterNeedsSubjectPrincipal, SetterThrows]
            attribute DOMString srcset;
            [CEReactions, SetterThrows]
            attribute DOMString? crossOrigin;
diff --git a/dom/webidl/HTMLInputElement.webidl b/dom/webidl/HTMLInputElement.webidl
@@ -81,7 +81,7 @@ interface HTMLInputElement : HTMLElement {
            attribute boolean required;
   [CEReactions, Pure, SetterThrows]
            attribute unsigned long size;
-  [CEReactions, Pure, NeedsSubjectPrincipal, SetterThrows]
+  [CEReactions, Pure, SetterNeedsSubjectPrincipal, SetterThrows]
            attribute DOMString src;
   [CEReactions, Pure, SetterThrows]
            attribute DOMString step;
diff --git a/dom/webidl/HTMLLinkElement.webidl b/dom/webidl/HTMLLinkElement.webidl
@@ -16,7 +16,7 @@
 interface HTMLLinkElement : HTMLElement {
   [Pure]
            attribute boolean disabled;
-  [CEReactions, NeedsSubjectPrincipal, SetterThrows, Pure]
+  [CEReactions, SetterNeedsSubjectPrincipal, SetterThrows, Pure]
            attribute DOMString href;
   [CEReactions, SetterThrows, Pure]
            attribute DOMString? crossOrigin;
diff --git a/dom/webidl/HTMLMediaElement.webidl b/dom/webidl/HTMLMediaElement.webidl
@@ -17,7 +17,7 @@ interface HTMLMediaElement : HTMLElement {
   readonly attribute MediaError? error;
 
   // network state
-  [CEReactions, NeedsSubjectPrincipal, SetterThrows]
+  [CEReactions, SetterNeedsSubjectPrincipal, SetterThrows]
            attribute DOMString src;
   readonly attribute DOMString currentSrc;
 
diff --git a/dom/webidl/HTMLSourceElement.webidl b/dom/webidl/HTMLSourceElement.webidl
@@ -13,14 +13,14 @@
 
 [HTMLConstructor]
 interface HTMLSourceElement : HTMLElement {
-           [CEReactions, NeedsSubjectPrincipal, SetterThrows]
+           [CEReactions, SetterNeedsSubjectPrincipal, SetterThrows]
            attribute DOMString src;
            [CEReactions, SetterThrows]
            attribute DOMString type;
 };
 
 partial interface HTMLSourceElement {
-           [CEReactions, NeedsSubjectPrincipal, SetterThrows]
+           [CEReactions, SetterNeedsSubjectPrincipal, SetterThrows]
            attribute DOMString srcset;
            [CEReactions, SetterThrows]
            attribute DOMString sizes;
diff --git a/dom/webidl/Location.webidl b/dom/webidl/Location.webidl
@@ -20,7 +20,7 @@ interface Location {
   [Throws, NeedsSubjectPrincipal]
   stringifier;
 
-  [Throws, CrossOriginWritable, NeedsSubjectPrincipal]
+  [Throws, CrossOriginWritable, GetterNeedsSubjectPrincipal]
            attribute USVString href;
   [Throws, NeedsSubjectPrincipal]
   readonly attribute USVString origin;
diff --git a/dom/webidl/Node.webidl b/dom/webidl/Node.webidl
@@ -59,7 +59,7 @@ interface Node : EventTarget {
 
   [CEReactions, SetterThrows, Pure]
            attribute DOMString? nodeValue;
-  [CEReactions, SetterThrows, GetterCanOOM, NeedsSubjectPrincipal, Pure]
+  [CEReactions, SetterThrows, GetterCanOOM, SetterNeedsSubjectPrincipal, Pure]
            attribute DOMString? textContent;
   [CEReactions, Throws]
   Node insertBefore(Node node, Node? child);
diff --git a/layout/style/nsDOMCSSDeclaration.h b/layout/style/nsDOMCSSDeclaration.h
@@ -73,8 +73,7 @@ class nsDOMCSSDeclaration : public nsICSSDeclaration
 #define CSS_PROP(name_, id_, method_, flags_, pref_, parsevariant_,          \
                  kwtable_, stylestruct_, stylestructoffset_, animtype_)      \
   void                                                                       \
-  Get##method_(nsAString& aValue, nsIPrincipal& aSubjectPrincipal,           \
-               mozilla::ErrorResult& rv)                                     \
+  Get##method_(nsAString& aValue, mozilla::ErrorResult& rv)                  \
   {                                                                          \
     rv = GetPropertyValue(eCSSProperty_##id_, aValue);                       \
   }                                                                          \
diff --git a/layout/style/nsICSSDeclaration.h b/layout/style/nsICSSDeclaration.h
@@ -110,7 +110,7 @@ class nsICSSDeclaration : public nsIDOMCSSStyleDeclaration,
                   mozilla::ErrorResult& rv) {
     rv = SetCssText(aString, &aSubjectPrincipal);
   }
-  void GetCssText(nsString& aString, nsIPrincipal& aSubjectPrincipal) {
+  void GetCssText(nsString& aString) {
     // Cast to nsAString& so we end up calling our virtual
     // |GetCssText(nsAString& aCssText)| overload, which does the real work.
     GetCssText(static_cast<nsAString&>(aString));

Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,6 @@ Location::GetHref(nsAString& aHref)`
`440`	`440`
`441`	`441`	`void`
`442`	`442`	`Location::SetHref(const nsAString& aHref,`
`443`		`- nsIPrincipal& aSubjectPrincipal,`
`444`	`443`	`ErrorResult& aRv)`
`445`	`444`	`{`
`446`	`445`	`JSContext *cx = nsContentUtils::GetCurrentJSContext();`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ class Location final : public nsISupports`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`void SetHref(const nsAString& aHref,`
`72`		`- nsIPrincipal& aSubjectPrincipal,`
`73`	`72`	`ErrorResult& aError);`
`74`	`73`
`75`	`74`	`void GetOrigin(nsAString& aOrigin,`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class HTMLFrameElement final : public nsGenericHTMLFrameElement`
`100`	`100`	`SetHTMLAttr(nsGkAtoms::scrolling, aScrolling, aError);`
`101`	`101`	`}`
`102`	`102`
`103`		`- void GetSrc(nsString& aSrc, nsIPrincipal&)`
	`103`	`+ void GetSrc(nsString& aSrc)`
`104`	`104`	`{`
`105`	`105`	`GetURIAttr(nsGkAtoms::src, nullptr, aSrc);`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class HTMLIFrameElement final : public nsGenericHTMLFrameElement`
`46`	`46`	`uint32_t GetSandboxFlags();`
`47`	`47`
`48`	`48`	`// Web IDL binding methods`
`49`		`- void GetSrc(nsString& aSrc, nsIPrincipal&) const`
	`49`	`+ void GetSrc(nsString& aSrc) const`
`50`	`50`	`{`
`51`	`51`	`GetURIAttr(nsGkAtoms::src, nullptr, aSrc);`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,10 +142,6 @@ class HTMLImageElement final : public nsGenericHTMLElement,`
`142`	`142`	`{`
`143`	`143`	`SetHTMLAttr(nsGkAtoms::alt, aAlt, aError);`
`144`	`144`	`}`
`145`		`- void GetSrc(nsAString& aSrc, nsIPrincipal&)`
`146`		`- {`
`147`		`- GetSrc(aSrc);`
`148`		`- }`
`149`	`145`	`void GetSrc(nsAString& aSrc)`
`150`	`146`	`{`
`151`	`147`	`GetURIAttr(nsGkAtoms::src, nullptr, aSrc);`
`@@ -158,7 +154,7 @@ class HTMLImageElement final : public nsGenericHTMLElement,`
`158`	`154`	`{`
`159`	`155`	`SetHTMLAttr(nsGkAtoms::src, aSrc, aTriggeringPrincipal, aError);`
`160`	`156`	`}`
`161`		`- void GetSrcset(nsAString& aSrcset, nsIPrincipal&)`
	`157`	`+ void GetSrcset(nsAString& aSrcset)`
`162`	`158`	`{`
`163`	`159`	`GetHTMLAttr(nsGkAtoms::srcset, aSrcset);`
`164`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -714,7 +714,7 @@ class HTMLInputElement final : public nsGenericHTMLFormElementWithState,`
`714`	`714`	`SetUnsignedIntAttr(nsGkAtoms::size, aValue, DEFAULT_COLS, aRv);`
`715`	`715`	`}`
`716`	`716`
`717`		`- void GetSrc(nsAString& aValue, nsIPrincipal&)`
	`717`	`+ void GetSrc(nsAString& aValue)`
`718`	`718`	`{`
`719`	`719`	`GetURIAttr(nsGkAtoms::src, nullptr, aValue);`
`720`	`720`	`}`