Commit 97429ca9 authored by criss's avatar criss
Browse files

Backed out 3 changesets (bug 1753025, bug 1750515) for causing build bustages... 

Backed out 3 changesets (bug 1753025, bug 1750515) for causing build bustages on Logging.h a=backout

Backed out changeset c07607b89a61 (bug 1750515)
Backed out changeset 09f9724c8c1c (bug 1753025)
Backed out changeset 90e9e803f010 (bug 1753025)
parent cb49d6d8

dom/fetch/FetchLog.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */

/* vim: set ts=8 sts=2 et sw=2 tw=80: */

/* This Source Code Form is subject to the terms of the Mozilla Public

 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



#ifndef _mozilla_dom_FetchLog_h

#define _mozilla_dom_FetchLog_h



#include "mozilla/Logging.h"



namespace mozilla::dom {



extern mozilla::LazyLogModule gFetchLog;



#define FETCH_LOG(args) MOZ_LOG(gFetchLog, LogLevel::Debug, args)



}  // namespace mozilla::dom

#endif

dom/fetch/FetchService.cpp

+38 −71
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



#include "FetchLog.h"

#include "nsILoadGroup.h"

#include "nsILoadInfo.h"

#include "nsIPrincipal.h"
@@ -12,7 +11,6 @@ 
#include "nsNetUtil.h"

#include "nsThreadUtils.h"

#include "nsXULAppAPI.h"

#include "mozilla/BasePrincipal.h"

#include "mozilla/ClearOnShutdown.h"

#include "mozilla/ScopeExit.h"

#include "mozilla/dom/FetchService.h"
@@ -23,8 +21,6 @@ 


namespace mozilla::dom {



mozilla::LazyLogModule gFetchLog("Fetch");



// FetchInstance



FetchService::FetchInstance::FetchInstance(SafeRefPtr<InternalRequest> aRequest)
@@ -36,32 +32,32 @@ nsresult FetchService::FetchInstance::Initialize(nsIChannel* aChannel) { 
  MOZ_ASSERT(XRE_IsParentProcess());

  MOZ_ASSERT(NS_IsMainThread());



  // Setup principal form InternalRequest

  const mozilla::UniquePtr<mozilla::ipc::PrincipalInfo>& principalInfo =

      mRequest->GetPrincipalInfo();

  MOZ_ASSERT(principalInfo);

  auto principalOrErr = PrincipalInfoToPrincipal(*principalInfo);

  if (NS_WARN_IF(principalOrErr.isErr())) {

    return principalOrErr.unwrapErr();

  }

  mPrincipal = principalOrErr.unwrap();



  // Get needed information for FetchDriver from passed-in channel.

  if (aChannel) {

    FETCH_LOG(("FetchInstance::Initialize [%p] aChannel[%p]", this, aChannel));



    nsresult rv;

    nsCOMPtr<nsILoadInfo> loadInfo = aChannel->LoadInfo();

    MOZ_ASSERT(loadInfo);



    rv = loadInfo->GetLoadingPrincipal(getter_AddRefs(mPrincipal));

    if (NS_WARN_IF(NS_FAILED(rv))) {

      return rv;

    }



    // Top level document load has no loadingPrincipal, try to use channel's URI

    if (!mPrincipal) {

      nsCOMPtr<nsIURI> channelURI;

      rv = aChannel->GetURI(getter_AddRefs(channelURI));

    // Principal in the InternalRequest should be the same with the triggering

    // principal in the LoadInfo

    nsCOMPtr<nsIPrincipal> triggeringPrincipal;

    rv = loadInfo->GetTriggeringPrincipal(getter_AddRefs(triggeringPrincipal));

    if (NS_WARN_IF(NS_FAILED(rv))) {

      return rv;

    }

      mPrincipal = BasePrincipal::CreateContentPrincipal(

          channelURI, loadInfo->GetOriginAttributes());

      if (!mPrincipal) {

    if (!mPrincipal->Equals(triggeringPrincipal)) {

      return NS_ERROR_UNEXPECTED;

    }

    }



    // Get loadGroup from channel

    rv = aChannel->GetLoadGroup(getter_AddRefs(mLoadGroup));
@@ -100,13 +96,6 @@ RefPtr<FetchServiceResponsePromise> FetchService::FetchInstance::Fetch() { 
  MOZ_ASSERT(mPrincipal);

  MOZ_ASSERT(mLoadGroup);



  nsAutoCString principalSpec;

  MOZ_ALWAYS_SUCCEEDS(mPrincipal->GetAsciiSpec(principalSpec));

  nsAutoCString requestURL;

  mRequest->GetURL(requestURL);

  FETCH_LOG(("FetchInstance::Fetch [%p], mRequest URL: %s mPrincipal: %s", this,

             requestURL.BeginReading(), principalSpec.BeginReading()));



  nsresult rv;



  // Create a FetchDriver instance
@@ -127,7 +116,6 @@ RefPtr<FetchServiceResponsePromise> FetchService::FetchInstance::Fetch() { 
  // FetchService::CancelFetch() to abort the running fetch.

  rv = mFetchDriver->Fetch(nullptr, this);

  if (NS_WARN_IF(NS_FAILED(rv))) {

    FETCH_LOG(("FetchInstance::Fetch FetchDriver::Fetch failed(0x%X)", rv));

    return FetchServiceResponsePromise::CreateAndResolve(

        InternalResponse::NetworkError(rv), __func__);

  }
@@ -139,14 +127,9 @@ void FetchService::FetchInstance::Cancel() { 
  MOZ_ASSERT(XRE_IsParentProcess());

  MOZ_ASSERT(NS_IsMainThread());



  FETCH_LOG(("FetchInstance::Cancel() [%p]", this));



  if (mFetchDriver) {

    mFetchDriver->RunAbortAlgorithm();

  }



  mResponsePromiseHolder.ResolveIfExists(

      InternalResponse::NetworkError(NS_ERROR_DOM_ABORT_ERR), __func__);

}



void FetchService::FetchInstance::OnResponseEnd(
@@ -159,8 +142,6 @@ void FetchService::FetchInstance::OnResponseEnd( 


void FetchService::FetchInstance::OnResponseAvailableInternal(

    SafeRefPtr<InternalResponse> aResponse) {

  FETCH_LOG(("FetchInstance::OnResponseAvailableInternal [%p]", this));

  if (!mResponsePromiseHolder.IsEmpty()) {

  // Remove the FetchInstance from FetchInstanceTable

  RefPtr<FetchServiceResponsePromise> responsePromise =

      mResponsePromiseHolder.Ensure(__func__);
@@ -169,11 +150,7 @@ void FetchService::FetchInstance::OnResponseAvailableInternal( 
  auto entry = fetchService->mFetchInstanceTable.Lookup(responsePromise);

  MOZ_ASSERT(entry);

  entry.Remove();

    FETCH_LOG(

        ("FetchInstance::OnResponseAvailableInternal entry of "

         "responsePromise[%p] is removed",

         responsePromise.get()));

  }



  // Resolve the FetchServiceResponsePromise

  mResponsePromiseHolder.ResolveIfExists(std::move(aResponse), __func__);

}
@@ -221,9 +198,6 @@ RefPtr<FetchServiceResponsePromise> FetchService::Fetch( 
  MOZ_ASSERT(XRE_IsParentProcess());

  MOZ_ASSERT(NS_IsMainThread());



  FETCH_LOG(("FetchService::Fetch aRequest[%p], aChannel[%p]",

             aRequest.unsafeGetRawPtr(), aChannel));



  // Create FetchInstance

  RefPtr<FetchInstance> fetch = MakeRefPtr<FetchInstance>(aRequest.clonePtr());
@@ -236,23 +210,20 @@ RefPtr<FetchServiceResponsePromise> FetchService::Fetch( 
  // Call FetchInstance::Fetch() to start an asynchronous fetching.

  RefPtr<FetchServiceResponsePromise> responsePromise = fetch->Fetch();



  if (!responsePromise->IsResolved()) {

  // Insert the created FetchInstance into FetchInstanceTable.

    if (!mFetchInstanceTable.WithEntryHandle(responsePromise,

                                             [&](auto&& entry) {

  // TODO: the FetchInstance should be removed from FetchInstanceTable, once the

  //       fetching finishes or be aborted. This should be implemented in

  //       following patches when implementing FetchDriverObserver on

  //       FetchInstance

  if (!mFetchInstanceTable.WithEntryHandle(responsePromise, [&](auto&& entry) {

        if (entry.HasEntry()) {

          return false;

        }

        entry.Insert(fetch);

        return true;

      })) {

      FETCH_LOG(("FetchService::Fetch entry of responsePromise[%p] exists",

                 responsePromise.get()));

    return NetworkErrorResponse(NS_ERROR_UNEXPECTED);

  }

    FETCH_LOG(("FetchService::Fetch responsePromise[%p], fetchInstance[%p]",

               responsePromise.get(), fetch.get()));

  }

  return responsePromise;

}
@@ -261,15 +232,11 @@ void FetchService::CancelFetch( 
  MOZ_ASSERT(XRE_IsParentProcess());

  MOZ_ASSERT(NS_IsMainThread());

  MOZ_ASSERT(aResponsePromise);

  FETCH_LOG(("FetchService::CancelFetch aResponsePromise[%p]",

             aResponsePromise.get()));



  auto entry = mFetchInstanceTable.Lookup(aResponsePromise);

  if (entry) {

    entry.Data()->Cancel();

    entry.Remove();

    FETCH_LOG(("FetchService::CancelFetch aResponsePromise[%p] is removed",

               aResponsePromise.get()));

  }

}

dom/serviceworkers/test/test_serviceworker_interfaces.js

+0 −2
Original line number Diff line number Diff line
@@ -226,8 +226,6 @@ var interfaceNamesInGlobalScope = [ 
  // IMPORTANT: Do not change this list without review from a DOM peer!

  { name: "NetworkInformation", android: true },

  // IMPORTANT: Do not change this list without review from a DOM peer!

  "NavigationPreloadManager",

  // IMPORTANT: Do not change this list without review from a DOM peer!

  "Notification",

  // IMPORTANT: Do not change this list without review from a DOM peer!

  "NotificationEvent",

dom/tests/mochitest/general/test_interfaces.js

+0 −2
Original line number Diff line number Diff line
@@ -797,8 +797,6 @@ var interfaceNamesInGlobalScope = [ 
  // IMPORTANT: Do not change this list without review from a DOM peer!

  { name: "NamedNodeMap", insecureContext: true },

  // IMPORTANT: Do not change this list without review from a DOM peer!

  "NavigationPreloadManager",

  // IMPORTANT: Do not change this list without review from a DOM peer!

  { name: "Navigator", insecureContext: true },

  // IMPORTANT: Do not change this list without review from a DOM peer!

  { name: "NetworkInformation", insecureContext: true, desktop: false },

dom/workers/test/test_worker_interfaces.js

+0 −2
Original line number Diff line number Diff line
@@ -225,8 +225,6 @@ var interfaceNamesInGlobalScope = [ 
  // IMPORTANT: Do not change this list without review from a DOM peer!

  { name: "MessagePort", insecureContext: true },

  // IMPORTANT: Do not change this list without review from a DOM peer!

  "NavigationPreloadManager",

  // IMPORTANT: Do not change this list without review from a DOM peer!

  { name: "NetworkInformation", insecureContext: true, android: true },

  // IMPORTANT: Do not change this list without review from a DOM peer!

  { name: "Notification", insecureContext: true },