Bug 1474513 - Simplify CSS::Supports. r?emilio draft
authorCameron McCormack <cam@mcc.id.au>
Tue, 10 Jul 2018 15:51:38 +1000
changeset 815879 5a6c50fad60660a0addff6bd73bec868e79ab3ef
parent 815406 6c4096358e4be4610fd7b8ec16a68dd984c7f7fd
push id115676
push userbmo:cam@mcc.id.au
push dateTue, 10 Jul 2018 06:27:40 +0000
reviewersemilio
bugs1474513
milestone63.0a1
Bug 1474513 - Simplify CSS::Supports. r?emilio MozReview-Commit-ID: Lw9K7uRknfv
layout/style/CSS.cpp
--- a/layout/style/CSS.cpp
+++ b/layout/style/CSS.cpp
@@ -14,75 +14,32 @@
 #include "nsIDocument.h"
 #include "nsIURI.h"
 #include "nsStyleUtil.h"
 #include "xpcpublic.h"
 
 namespace mozilla {
 namespace dom {
 
-struct SupportsParsingInfo
-{
-  nsIURI* mDocURI;
-  nsIURI* mBaseURI;
-  nsIPrincipal* mPrincipal;
-};
-
-static nsresult
-GetParsingInfo(const GlobalObject& aGlobal,
-               SupportsParsingInfo& aInfo)
-{
-  nsGlobalWindowInner* win = xpc::WindowOrNull(aGlobal.Get());
-  if (!win) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsCOMPtr<nsIDocument> doc = win->GetDoc();
-  if (!doc) {
-    return NS_ERROR_FAILURE;
-  }
-
-  aInfo.mDocURI = nsCOMPtr<nsIURI>(doc->GetDocumentURI()).get();
-  aInfo.mBaseURI = nsCOMPtr<nsIURI>(doc->GetBaseURI()).get();
-  aInfo.mPrincipal = win->GetPrincipal();
-  return NS_OK;
-}
-
 /* static */ bool
 CSS::Supports(const GlobalObject& aGlobal,
               const nsAString& aProperty,
               const nsAString& aValue,
               ErrorResult& aRv)
 {
-  SupportsParsingInfo info;
-
-  nsresult rv = GetParsingInfo(aGlobal, info);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
-    return false;
-  }
-
   NS_ConvertUTF16toUTF8 property(aProperty);
   NS_ConvertUTF16toUTF8 value(aValue);
   return Servo_CSSSupports2(&property, &value);
 }
 
 /* static */ bool
 CSS::Supports(const GlobalObject& aGlobal,
               const nsAString& aCondition,
               ErrorResult& aRv)
 {
-  SupportsParsingInfo info;
-
-  nsresult rv = GetParsingInfo(aGlobal, info);
-  if (NS_FAILED(rv)) {
-    aRv.Throw(rv);
-    return false;
-  }
-
   NS_ConvertUTF16toUTF8 cond(aCondition);
   return Servo_CSSSupports(&cond);
 }
 
 /* static */ void
 CSS::Escape(const GlobalObject& aGlobal,
             const nsAString& aIdent,
             nsAString& aReturn)