Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1285)

Side by Side Diff: third_party/WebKit/Source/core/dom/ScriptLoader.cpp

Issue 2941883003: [ServiceWorker] Fetch event should return integrity value (Closed)
Patch Set: Rebase Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights
6 * reserved. 6 * reserved.
7 * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org> 7 * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 kClientRequestedCredentials); 725 kClientRequestedCredentials);
726 options.initiator_info.name = element_->InitiatorName(); 726 options.initiator_info.name = element_->InitiatorName();
727 FetchParameters params(resource_request, options); 727 FetchParameters params(resource_request, options);
728 728
729 // "... cryptographic nonce, ..." 729 // "... cryptographic nonce, ..."
730 params.SetContentSecurityPolicyNonce(nonce); 730 params.SetContentSecurityPolicyNonce(nonce);
731 731
732 // "... integrity metadata, ..." 732 // "... integrity metadata, ..."
733 params.SetIntegrityMetadata(integrity_metadata); 733 params.SetIntegrityMetadata(integrity_metadata);
734 734
735 // "... integrity value, ..."
736 params.SetIntegrityValue(element_->IntegrityAttributeValue());
shimazu 2017/06/26 06:13:32 How about having the integrity string in Integrity
xiaofengzhang 2017/06/29 02:26:06 integrity string was converted to IntegrityMetadat
737
735 // "... parser state, ..." 738 // "... parser state, ..."
736 params.SetParserDisposition(parser_state); 739 params.SetParserDisposition(parser_state);
737 740
738 // "... CORS setting, ..." 741 // "... CORS setting, ..."
739 if (cross_origin != kCrossOriginAttributeNotSet) { 742 if (cross_origin != kCrossOriginAttributeNotSet) {
740 params.SetCrossOriginAccessControl(security_origin, cross_origin); 743 params.SetCrossOriginAccessControl(security_origin, cross_origin);
741 } 744 }
742 745
743 // "... and encoding." 746 // "... and encoding."
744 params.SetCharset(encoding); 747 params.SetCharset(encoding);
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 // then abort these steps at this point. The script is not executed. 987 // then abort these steps at this point. The script is not executed.
985 return DeprecatedEqualIgnoringCase(event_attribute, "onload") || 988 return DeprecatedEqualIgnoringCase(event_attribute, "onload") ||
986 DeprecatedEqualIgnoringCase(event_attribute, "onload()"); 989 DeprecatedEqualIgnoringCase(event_attribute, "onload()");
987 } 990 }
988 991
989 String ScriptLoader::ScriptContent() const { 992 String ScriptLoader::ScriptContent() const {
990 return element_->TextFromChildren(); 993 return element_->TextFromChildren();
991 } 994 }
992 995
993 } // namespace blink 996 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698