[ServiceWorker] Fetch event should return integrity value

third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ skipping 794 matching lines @@
   RESOURCE_LOADING_DVLOG(1) << "Loading Resource for "
                             << params.GetResourceRequest().Url().ElidedString();
 
   Resource* resource =
       factory.Create(params.GetResourceRequest(), params.Options(), charset);
   resource->SetLinkPreload(params.IsLinkPreload());
   if (params.IsSpeculativePreload()) {
     resource->SetPreloadDiscoveryTime(params.PreloadDiscoveryTime());
   }
   resource->SetCacheIdentifier(cache_identifier);
+  resource->SetIntegrityMetadata(params.IntegrityMetadata());

[xiaofengzhang, 2017/06/19 03:17:05]

This is not needed, will delete later

+  resource->SetIntegrityValue(params.IntegrityValue());

[shimazu, 2017/06/26 06:13:32]

Also, this won't be needed if you set the value of |integrity_| on
ResourceRequest at FetchParameter::SetIntegrityMetadata.

[xiaofengzhang, 2017/06/29 02:26:06]

Done.

 
   if (ShouldResourceBeAddedToMemoryCache(params, resource))
     GetMemoryCache()->Add(resource);
   return resource;
 }
 
 void ResourceFetcher::StorePerformanceTimingInitiatorInformation(
     Resource* resource) {
   const AtomicString& fetch_initiator = resource->Options().initiator_info.name;
   if (fetch_initiator == FetchInitiatorTypeNames::internal)
@@ skipping 158 matching lines @@
   return true;
 }
 
 ResourceFetcher::RevalidationPolicy
 ResourceFetcher::DetermineRevalidationPolicy(
     Resource::Type type,
     const FetchParameters& fetch_params,
     Resource* existing_resource,
     bool is_static_data) const {
   const ResourceRequest& request = fetch_params.GetResourceRequest();
-
   if (!existing_resource)
     return kLoad;
 
   // If the existing resource is loading and the associated fetcher is not equal
   // to |this|, we must not use the resource. Otherwise, CSP violation may
   // happen in redirect handling.
   if (existing_resource->Loader() &&
       existing_resource->Loader()->Fetcher() != this) {
     return kReload;
   }
@@ skipping 368 matching lines @@
   non_blocking_loaders_.insert(loader);
   loaders_.erase(loader);
 }
 
 bool ResourceFetcher::StartLoad(Resource* resource) {
   DCHECK(resource);
   DCHECK(resource->StillNeedsLoad());
 
   ResourceRequest request(resource->GetResourceRequest());
   ResourceLoader* loader = nullptr;
+  request.SetFetchIntegrity(AtomicString(resource->IntegrityValue()));

[shimazu, 2017/06/26 06:13:32]

You won't be needed if the request returned by resource->GetResourceRequest()
already has the integrity attribute.

[xiaofengzhang, 2017/06/29 02:26:06]

Done.

 
   {
     // Forbids JavaScript/addClient/removeClient/revalidation until start()
     // to prevent unintended state transitions.
     Resource::ProhibitAddRemoveClientInScope
         prohibit_add_remove_client_in_scope(resource);
     Resource::RevalidationStartForbiddenScope
         revalidation_start_forbidden_scope(resource);
     ScriptForbiddenIfMainThreadScope script_forbidden_scope;
 
@@ skipping 274 matching lines @@
   visitor->Trace(archive_);
   visitor->Trace(loaders_);
   visitor->Trace(non_blocking_loaders_);
   visitor->Trace(document_resources_);
   visitor->Trace(preloads_);
   visitor->Trace(matched_preloads_);
   visitor->Trace(resource_timing_info_map_);
 }
 
 }  // namespace blink