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

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 and address shimazu and yhirano's comments Created 3 years, 5 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 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 ResourceLoaderOptions options; 731 ResourceLoaderOptions options;
732 options.initiator_info.name = element_->InitiatorName(); 732 options.initiator_info.name = element_->InitiatorName();
733 FetchParameters params(resource_request, options); 733 FetchParameters params(resource_request, options);
734 734
735 // "... cryptographic nonce, ..." 735 // "... cryptographic nonce, ..."
736 params.SetContentSecurityPolicyNonce(nonce); 736 params.SetContentSecurityPolicyNonce(nonce);
737 737
738 // "... integrity metadata, ..." 738 // "... integrity metadata, ..."
739 params.SetIntegrityMetadata(integrity_metadata); 739 params.SetIntegrityMetadata(integrity_metadata);
740 740
741 // "... integrity value, ..."
742 params.SetIntegrityValue(element_->IntegrityAttributeValue());
743
741 // "... parser state, ..." 744 // "... parser state, ..."
742 params.SetParserDisposition(parser_state); 745 params.SetParserDisposition(parser_state);
743 746
744 // "... CORS setting, ..." 747 // "... CORS setting, ..."
745 if (cross_origin != kCrossOriginAttributeNotSet) { 748 if (cross_origin != kCrossOriginAttributeNotSet) {
746 params.SetCrossOriginAccessControl(security_origin, cross_origin); 749 params.SetCrossOriginAccessControl(security_origin, cross_origin);
747 } 750 }
748 751
749 // "... and encoding." 752 // "... and encoding."
750 params.SetCharset(encoding); 753 params.SetCharset(encoding);
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 // then abort these steps at this point. The script is not executed. 993 // then abort these steps at this point. The script is not executed.
991 return DeprecatedEqualIgnoringCase(event_attribute, "onload") || 994 return DeprecatedEqualIgnoringCase(event_attribute, "onload") ||
992 DeprecatedEqualIgnoringCase(event_attribute, "onload()"); 995 DeprecatedEqualIgnoringCase(event_attribute, "onload()");
993 } 996 }
994 997
995 String ScriptLoader::ScriptContent() const { 998 String ScriptLoader::ScriptContent() const {
996 return element_->TextFromChildren(); 999 return element_->TextFromChildren();
997 } 1000 }
998 1001
999 } // namespace blink 1002 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698