Bug 1545699 - Remove a dead Loader::LoadSheet function. r=mats
authorEmilio Cobos Álvarez <emilio@crisal.io>
Fri, 19 Apr 2019 17:09:40 +0200
changeset 471305 c08ca0ff0c98cdec6f6a70bdd9e7c610e5e39f95
parent 471304 9d3956ea78a8ddb36e0ee683e9f4ef7cc604e7c9
child 471306 7a5177cca40350267da21fdd3dd0025a172db51f
push id112913
push useropoprus@mozilla.com
push dateThu, 25 Apr 2019 22:21:16 +0000
treeherdermozilla-inbound@5279ac14ae48 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmats
bugs1545699
milestone68.0a1
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
Bug 1545699 - Remove a dead Loader::LoadSheet function. r=mats Differential Revision: https://phabricator.services.mozilla.com/D28213
layout/style/Loader.cpp
layout/style/Loader.h
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -2164,26 +2164,16 @@ nsresult Loader::LoadSheet(nsIURI* aURL,
   LOG(
       ("css::Loader::LoadSheet(aURL, aParsingMode, aUseSystemPrincipal, "
        "aObserver, aSheet)"));
   return InternalLoadNonDocumentSheet(aURL, false, aParsingMode,
                                       aUseSystemPrincipal, nullptr, nullptr,
                                       aSheet, aObserver);
 }
 
-nsresult Loader::LoadSheet(nsIURI* aURL, nsIPrincipal* aOriginPrincipal,
-                           nsICSSLoaderObserver* aObserver,
-                           RefPtr<StyleSheet>* aSheet) {
-  LOG(("css::Loader::LoadSheet(aURL, aObserver, aSheet) api call"));
-  MOZ_ASSERT(aSheet, "aSheet is null");
-  return InternalLoadNonDocumentSheet(aURL, false, eAuthorSheetFeatures, false,
-                                      aOriginPrincipal, nullptr, aSheet,
-                                      aObserver);
-}
-
 nsresult Loader::LoadSheet(nsIURI* aURL, bool aIsPreload,
                            nsIPrincipal* aOriginPrincipal,
                            const Encoding* aPreloadEncoding,
                            nsICSSLoaderObserver* aObserver, CORSMode aCORSMode,
                            ReferrerPolicy aReferrerPolicy,
                            const nsAString& aIntegrity) {
   LOG(("css::Loader::LoadSheet(aURL, aObserver) api call"));
   return InternalLoadNonDocumentSheet(aURL, aIsPreload, eAuthorSheetFeatures,
--- a/layout/style/Loader.h
+++ b/layout/style/Loader.h
@@ -336,36 +336,16 @@ class Loader final {
    * ideally it would allow arbitrary encodings.  Callers should NOT depend on
    * non-UTF8 sheets being treated as UTF-8 by this method.
    */
   nsresult LoadSheet(nsIURI* aURL, SheetParsingMode aParsingMode,
                      bool aUseSystemPrincipal, nsICSSLoaderObserver* aObserver,
                      RefPtr<StyleSheet>* aSheet);
 
   /**
-   * Asynchronously load the stylesheet at aURL.  If a successful result is
-   * returned, aObserver is guaranteed to be notified asynchronously once the
-   * sheet is loaded and marked complete.  This method can be used to load
-   * sheets not associated with a document.  This method cannot be used to
-   * load user or agent sheets.
-   *
-   * @param aURL the URL of the sheet to load
-   * @param aOriginPrincipal the principal to use for security checks.  This
-   *                         can be null to indicate that these checks should
-   *                         be skipped.
-   * @param aObserver the observer to notify when the load completes.
-   *                  Must not be null.
-   * @param [out] aSheet the sheet to load. Note that the sheet may well
-   *              not be loaded by the time this method returns.
-   */
-  nsresult LoadSheet(nsIURI* aURL, nsIPrincipal* aOriginPrincipal,
-                     nsICSSLoaderObserver* aObserver,
-                     RefPtr<StyleSheet>* aSheet);
-
-  /**
    * Same as above, to be used when the caller doesn't care about the
    * not-yet-loaded sheet.
    */
   nsresult LoadSheet(nsIURI* aURL, bool aIsPreload,
                      nsIPrincipal* aOriginPrincipal,
                      const Encoding* aPreloadEncoding,
                      nsICSSLoaderObserver* aObserver,
                      CORSMode aCORSMode = CORS_NONE,