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

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

Issue 1839473002: Centralize the setting of Accept headers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again Created 4 years, 8 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 ScriptResource* resource = toScriptResource(fetcher->requestResource(request , ScriptResourceFactory())); 43 ScriptResource* resource = toScriptResource(fetcher->requestResource(request , ScriptResourceFactory()));
44 if (resource && !request.integrityMetadata().isEmpty()) 44 if (resource && !request.integrityMetadata().isEmpty())
45 resource->setIntegrityMetadata(request.integrityMetadata()); 45 resource->setIntegrityMetadata(request.integrityMetadata());
46 return resource; 46 return resource;
47 } 47 }
48 48
49 ScriptResource::ScriptResource(const ResourceRequest& resourceRequest, const Res ourceLoaderOptions& options, const String& charset) 49 ScriptResource::ScriptResource(const ResourceRequest& resourceRequest, const Res ourceLoaderOptions& options, const String& charset)
50 : TextResource(resourceRequest, Script, options, "application/javascript", c harset) 50 : TextResource(resourceRequest, Script, options, "application/javascript", c harset)
51 , m_integrityDisposition(ScriptIntegrityDisposition::NotChecked) 51 , m_integrityDisposition(ScriptIntegrityDisposition::NotChecked)
52 { 52 {
53 DEFINE_STATIC_LOCAL(const AtomicString, acceptScript, ("*/*"));
54
55 // It's javascript we want.
56 // But some websites think their scripts are <some wrong mimetype here>
57 // and refuse to serve them if we only accept application/x-javascript.
58 setAccept(acceptScript);
59 } 53 }
60 54
61 ScriptResource::~ScriptResource() 55 ScriptResource::~ScriptResource()
62 { 56 {
63 } 57 }
64 58
65 void ScriptResource::didAddClient(ResourceClient* client) 59 void ScriptResource::didAddClient(ResourceClient* client)
66 { 60 {
67 ASSERT(ScriptResourceClient::isExpectedType(client)); 61 ASSERT(ScriptResourceClient::isExpectedType(client));
68 Resource::didAddClient(client); 62 Resource::didAddClient(client);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 } 114 }
121 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque st) const 115 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque st) const
122 { 116 {
123 if (request.integrityMetadata().isEmpty()) 117 if (request.integrityMetadata().isEmpty())
124 return false; 118 return false;
125 119
126 return !IntegrityMetadata::setsEqual(m_integrityMetadata, request.integrityM etadata()); 120 return !IntegrityMetadata::setsEqual(m_integrityMetadata, request.integrityM etadata());
127 } 121 }
128 122
129 } // namespace blink 123 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/Resource.cpp ('k') | third_party/WebKit/Source/core/fetch/XSLStyleSheetResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698