[ServiceWorker] Fetch event should return integrity value

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

 /*
  * Copyright (C) 2012 Google, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 72 matching lines @@
   }
   const KURL& Url() const { return resource_request_.Url(); }
 
   void SetRequestContext(WebURLRequest::RequestContext context) {
     resource_request_.SetRequestContext(context);
   }
 
   const String& Charset() const { return charset_; }
   void SetCharset(const String& charset) { charset_ = charset; }
 
+  const String& IntegrityValue() const { return integrity_; }

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

I guess it's not used.

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

Please remove these and use ResourceRequest members / methods instead.

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

Yes, Done.

+  void SetIntegrityValue(const String& integrity) { integrity_ = integrity; }
+
   const ResourceLoaderOptions& Options() const { return options_; }
 
   DeferOption Defer() const { return defer_; }
   void SetDefer(DeferOption defer) { defer_ = defer; }
 
   ResourceWidth GetResourceWidth() const { return resource_width_; }
   void SetResourceWidth(ResourceWidth);
 
   ClientHintsPreferences& GetClientHintsPreferences() {
     return client_hint_preferences_;
@@ skipping 21 matching lines @@
   }
   void SetCrossOriginAccessControl(SecurityOrigin*, CrossOriginAttributeValue);
   OriginRestriction GetOriginRestriction() const { return origin_restriction_; }
   void SetOriginRestriction(OriginRestriction restriction) {
     origin_restriction_ = restriction;
   }
   const IntegrityMetadataSet IntegrityMetadata() const {
     return options_.integrity_metadata;
   }
   void SetIntegrityMetadata(const IntegrityMetadataSet& metadata) {
     options_.integrity_metadata = metadata;

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

You can set the attribute to |resource_request_| here through metadata.

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

As I comment in ScriptLoader.cpp, I think get the original integrity string from
IntegrityMetadataSet is difficult, and cause the confusion? 

because:

using IntegrityMetadataPair = std::pair<WTF::String, HashAlgorithm>;
using IntegrityMetadataSet = WTF::HashSet<IntegrityMetadataPair>;

the String here is only the part of original integrity.

   }
 
   String ContentSecurityPolicyNonce() const {
     return options_.content_security_policy_nonce;
   }
   void SetContentSecurityPolicyNonce(const String& nonce) {
     options_.content_security_policy_nonce = nonce;
   }
 
   void SetParserDisposition(ParserDisposition parser_disposition) {
@@ skipping 13 matching lines @@
 
   // Configures the request to load an image placeholder if the request is
   // eligible (e.g. the url's protocol is HTTP, etc.). If this request is
   // non-eligible, this method doesn't modify the ResourceRequest. Calling this
   // method sets m_placeholderImageRequestType to the appropriate value.
   void SetAllowImagePlaceholder();
 
  private:
   ResourceRequest resource_request_;
   String charset_;
+  String integrity_;

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

I think we don't need to keep the |integrity_| value here because you are
already adding it to ResourceRequest.

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

Done.

   ResourceLoaderOptions options_;
   SpeculativePreloadType speculative_preload_type_;
   double preload_discovery_time_;
   DeferOption defer_;
   OriginRestriction origin_restriction_;
   ResourceWidth resource_width_;
   ClientHintsPreferences client_hint_preferences_;
   PlaceholderImageRequestType placeholder_image_request_type_;
 };
 
 }  // namespace blink
 
 #endif