Backed out changeset 8e9d1223d391 (bug 1572349) for causing build bustages in Document.cpp CLOSED TREE
authorNoemi Erli <nerli@mozilla.com>
Thu, 15 Aug 2019 20:29:35 +0300
changeset 488289 8b8878633443587a44118fad8f247c6b9cd6adb9
parent 488288 e9611b9cff9a7a9bf7ce21a1384d017bf9c02fbe
child 488290 7f41e2dd2f998cbb4f533a8fec9046e7b8aeb147
push id113906
push userncsoregi@mozilla.com
push dateFri, 16 Aug 2019 04:07:24 +0000
treeherdermozilla-inbound@d887276421d3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1572349
milestone70.0a1
backs out8e9d1223d391da60c16ea3e4087123f6c3b9f3a4
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 8e9d1223d391 (bug 1572349) for causing build bustages in Document.cpp CLOSED TREE
dom/base/Document.cpp
dom/base/Document.h
--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
@@ -326,17 +326,16 @@
 #include "mozilla/MediaManager.h"
 
 #include "AutoplayPolicy.h"
 #include "nsIURIMutator.h"
 #include "mozilla/DocumentStyleRootIterator.h"
 #include "mozilla/PendingFullscreenEvent.h"
 #include "mozilla/RestyleManager.h"
 #include "mozilla/ClearOnShutdown.h"
-#include "mozilla/ResultExtensions.h"
 #include "nsHTMLTags.h"
 #include "MobileViewportManager.h"
 #include "NodeUbiReporting.h"
 #include "nsICookieService.h"
 #include "mozilla/net/ChannelEventQueue.h"
 #include "mozilla/net/RequestContextService.h"
 #include "StorageAccessPermissionRequest.h"
 #include "mozilla/dom/WindowProxyHolder.h"
@@ -5746,24 +5745,16 @@ void Document::SetBaseURI(nsIURI* aURI) 
       return;
     }
   }
 
   mDocumentBaseURI = aURI;
   RefreshLinkHrefs();
 }
 
-Result<nsCOMPtr<nsIURI>, nsresult> Document::ResolveWithBaseURI(
-    const nsAString& aURI) {
-  nsCOMPtr<nsIURI> resolvedUri;
-  MOZ_TRY(
-      NS_NewURI(getter_AddRefs(resolvedUri), aURI, nullptr, GetDocBaseURI()));
-  return std::move(resolvedURI);
-}
-
 URLExtraData* Document::DefaultStyleAttrURLData() {
   MOZ_ASSERT(NS_IsMainThread());
   nsIURI* baseURI = GetDocBaseURI();
   nsIPrincipal* principal = NodePrincipal();
   bool equals;
   if (!mCachedURLData || mCachedURLData->BaseURI() != baseURI ||
       mCachedURLData->Principal() != principal || !mCachedReferrerInfo ||
       NS_FAILED(mCachedURLData->ReferrerInfo()->Equals(mCachedReferrerInfo,
--- a/dom/base/Document.h
+++ b/dom/base/Document.h
@@ -906,21 +906,16 @@ class Document : public nsINode,
     return GetFallbackBaseURI();
   }
 
   nsIURI* GetBaseURI(bool aTryUseXHRDocBaseURI = false) const final;
 
   void SetBaseURI(nsIURI* aURI);
 
   /**
-   * Resolves a URI based on the document's base URI.
-   */
-  Result<nsCOMPtr<nsIURI>, nsresult> ResolveWithBaseURI(const nsAString& aURI);
-
-  /**
    * Return the URL data which style system needs for resolving url value.
    * This method attempts to use the cached object in mCachedURLData, but
    * if the base URI, document URI, or principal has changed since last
    * call to this function, or the function is called the first time for
    * the document, a new one is created.
    */
   URLExtraData* DefaultStyleAttrURLData();