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

Side by Side Diff: third_party/WebKit/Source/core/fetch/ScriptResource.cpp

Issue 1561903002: Fix double resource request for script resources with integrity attr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 4 years, 11 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) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 23 matching lines...) Expand all
34 #include "platform/SharedBuffer.h" 34 #include "platform/SharedBuffer.h"
35 #include "platform/network/HTTPParsers.h" 35 #include "platform/network/HTTPParsers.h"
36 #include "public/platform/WebProcessMemoryDump.h" 36 #include "public/platform/WebProcessMemoryDump.h"
37 37
38 namespace blink { 38 namespace blink {
39 39
40 ResourcePtr<ScriptResource> ScriptResource::fetch(FetchRequest& request, Resourc eFetcher* fetcher) 40 ResourcePtr<ScriptResource> ScriptResource::fetch(FetchRequest& request, Resourc eFetcher* fetcher)
41 { 41 {
42 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone ); 42 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone );
43 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textScript); 43 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textScript);
44 return toScriptResource(fetcher->requestResource(request, ScriptResourceFact ory())); 44 ResourcePtr<ScriptResource> resource = toScriptResource(fetcher->requestReso urce(request, ScriptResourceFactory()));
45 if (resource && !request.integrityMetadata().isEmpty())
46 resource->setIntegrityMetadata(request.integrityMetadata());
47 return resource;
45 } 48 }
46 49
47 ScriptResource::ScriptResource(const ResourceRequest& resourceRequest, const Str ing& charset) 50 ScriptResource::ScriptResource(const ResourceRequest& resourceRequest, const Str ing& charset)
48 : TextResource(resourceRequest, Script, "application/javascript", charset), m_integrityChecked(false) 51 : TextResource(resourceRequest, Script, "application/javascript", charset), m_integrityChecked(false)
49 { 52 {
50 DEFINE_STATIC_LOCAL(const AtomicString, acceptScript, ("*/*", AtomicString:: ConstructFromLiteral)); 53 DEFINE_STATIC_LOCAL(const AtomicString, acceptScript, ("*/*", AtomicString:: ConstructFromLiteral));
51 54
52 // It's javascript we want. 55 // It's javascript we want.
53 // But some websites think their scripts are <some wrong mimetype here> 56 // But some websites think their scripts are <some wrong mimetype here>
54 // and refuse to serve them if we only accept application/x-javascript. 57 // and refuse to serve them if we only accept application/x-javascript.
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 120
118 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque st) const 121 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque st) const
119 { 122 {
120 if (request.integrityMetadata().isEmpty()) 123 if (request.integrityMetadata().isEmpty())
121 return false; 124 return false;
122 125
123 return !IntegrityMetadata::setsEqual(m_integrityMetadata, request.integrityM etadata()); 126 return !IntegrityMetadata::setsEqual(m_integrityMetadata, request.integrityM etadata());
124 } 127 }
125 128
126 } // namespace blink 129 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698