[ServiceWorker] Fetch event should return integrity value

third_party/WebKit/Source/platform/loader/fetch/Resource.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 263 matching lines @@
   bool MustReloadDueToVaryHeader(const ResourceRequest& new_request) const;
 
   bool IsEligibleForIntegrityCheck(SecurityOrigin*) const;
 
   void SetIntegrityMetadata(const IntegrityMetadataSet& metadata) {
     integrity_metadata_ = metadata;
   }
   const IntegrityMetadataSet& IntegrityMetadata() const {
     return integrity_metadata_;
   }
+  void SetIntegrityValue(const String& integrity) { integrity_ = integrity; }

[yhirano, 2017/06/28 04:55:09]

Please remove these and use ResourceRequet's members / methods instead.

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

Done. Thanks.

+  String IntegrityValue() const { return integrity_; }
   // The argument must never be |NotChecked|.
   void SetIntegrityDisposition(ResourceIntegrityDisposition);
   ResourceIntegrityDisposition IntegrityDisposition() const {
     return integrity_disposition_;
   }
   bool MustRefetchDueToIntegrityMetadata(const FetchParameters&) const;
 
   bool IsAlive() const { return is_alive_; }
 
   void SetCacheIdentifier(const String& cache_identifier) {
@@ skipping 172 matching lines @@
 
   bool needs_synchronous_cache_hit_;
   bool link_preload_;
   bool is_revalidating_;
   bool is_alive_;
   bool is_add_remove_client_prohibited_;
   bool is_revalidation_start_forbidden_ = false;
 
   ResourceIntegrityDisposition integrity_disposition_;
   IntegrityMetadataSet integrity_metadata_;
+  String integrity_;

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

Is this necessary to be kept here?

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

Not necessary, thanks for pointing out!

 
   // Ordered list of all redirects followed while fetching this resource.
   Vector<RedirectPair> redirect_chain_;
 
   HeapHashCountedSet<WeakMember<ResourceClient>> clients_;
   HeapHashCountedSet<WeakMember<ResourceClient>> clients_awaiting_callback_;
   HeapHashCountedSet<WeakMember<ResourceClient>> finished_clients_;
   HeapHashSet<WeakMember<ResourceFinishObserver>> finish_observers_;
 
   ResourceLoaderOptions options_;
@@ skipping 26 matching lines @@
 };
 
 #define DEFINE_RESOURCE_TYPE_CASTS(typeName)                      \
   DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource,       \
                     resource->GetType() == Resource::k##typeName, \
                     resource.GetType() == Resource::k##typeName);
 
 }  // namespace blink
 
 #endif