Bug 1333990: Follow-up: Use Promise& rather than OwningNonNull<Promise> for binding arguments. draft
authorKris Maglione <maglione.k@gmail.com>
Fri, 17 Mar 2017 13:55:27 -0700
changeset 500870 87195e1dfa56d7b34fed2432e2e4c96da2ac2905
parent 500869 1e3bb68a1f51d9dafbb4afda56f837344e23d490
child 500871 e88619c2913bbe030c15c99b70631d78be45a259
child 500884 6cb19ccf457e2d58347caa69f02af8a2b87de688
push id49820
push usermaglione.k@gmail.com
push dateFri, 17 Mar 2017 21:06:19 +0000
bugs1333990
milestone55.0a1
Bug 1333990: Follow-up: Use Promise& rather than OwningNonNull<Promise> for binding arguments. MozReview-Commit-ID: 23aYwjCPJ6l
dom/base/nsDocument.cpp
dom/base/nsIDocument.h
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -10584,26 +10584,25 @@ NS_IMPL_CYCLE_COLLECTION(UnblockParsingP
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(UnblockParsingPromiseHandler)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(UnblockParsingPromiseHandler)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(UnblockParsingPromiseHandler)
 
 already_AddRefed<Promise>
-nsIDocument::BlockParsing(OwningNonNull<Promise> aPromise,
-                          ErrorResult& aRv)
-{
-  RefPtr<Promise> resultPromise = Promise::Create(aPromise->GetParentObject(), aRv);
+nsIDocument::BlockParsing(Promise& aPromise, ErrorResult& aRv)
+{
+  RefPtr<Promise> resultPromise = Promise::Create(aPromise.GetParentObject(), aRv);
   if (aRv.Failed()) {
     return nullptr;
   }
 
   RefPtr<PromiseNativeHandler> promiseHandler = new UnblockParsingPromiseHandler(this, resultPromise);
-  aPromise->AppendNativeHandler(promiseHandler);
+  aPromise.AppendNativeHandler(promiseHandler);
 
   return resultPromise.forget();
 }
 
 already_AddRefed<nsIURI>
 nsIDocument::GetMozDocumentURIIfNotForErrorPages()
 {
   if (mFailedChannel) {
--- a/dom/base/nsIDocument.h
+++ b/dom/base/nsIDocument.h
@@ -2782,17 +2782,17 @@ public:
   {
     return mStyleSheetChangeEventsEnabled;
   }
 
   void ObsoleteSheet(nsIURI *aSheetURI, mozilla::ErrorResult& rv);
 
   void ObsoleteSheet(const nsAString& aSheetURI, mozilla::ErrorResult& rv);
 
-  already_AddRefed<mozilla::dom::Promise> BlockParsing(mozilla::OwningNonNull<mozilla::dom::Promise> aPromise,
+  already_AddRefed<mozilla::dom::Promise> BlockParsing(mozilla::dom::Promise& aPromise,
                                                        mozilla::ErrorResult& aRv);
 
   already_AddRefed<nsIURI> GetMozDocumentURIIfNotForErrorPages();
 
   // ParentNode
   nsIHTMLCollection* Children();
   uint32_t ChildElementCount();