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

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

Issue 1410313002: Revert of Revalidate using the same Resource, attempt #3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 // We lie a it here and claim that script counts as encoded data (even t hough it's really decoded data). 88 // We lie a it here and claim that script counts as encoded data (even t hough it's really decoded data).
89 // That's because the MemoryCache thinks that it can clear out decoded d ata by calling destroyDecodedData(), 89 // That's because the MemoryCache thinks that it can clear out decoded d ata by calling destroyDecodedData(),
90 // but we can't destroy script in destroyDecodedData because that's our only copy of the data! 90 // but we can't destroy script in destroyDecodedData because that's our only copy of the data!
91 setEncodedSize(script.sizeInBytes()); 91 setEncodedSize(script.sizeInBytes());
92 m_script = AtomicString(script); 92 m_script = AtomicString(script);
93 } 93 }
94 94
95 return m_script.string(); 95 return m_script.string();
96 } 96 }
97 97
98 void ScriptResource::destroyDecodedDataForFailedRevalidation()
99 {
100 m_script = AtomicString();
101 }
102
103 bool ScriptResource::mimeTypeAllowedByNosniff() const 98 bool ScriptResource::mimeTypeAllowedByNosniff() const
104 { 99 {
105 return parseContentTypeOptionsHeader(m_response.httpHeaderField("X-Content-T ype-Options")) != ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJava ScriptMIMEType(mimeType()); 100 return parseContentTypeOptionsHeader(m_response.httpHeaderField("X-Content-T ype-Options")) != ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJava ScriptMIMEType(mimeType());
106 } 101 }
107 102
108 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque st) const 103 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque st) const
109 { 104 {
110 if (!m_integrityChecked || request.integrityMetadata().isEmpty()) 105 if (!m_integrityChecked || request.integrityMetadata().isEmpty())
111 return false; 106 return false;
112 107
113 // TODO(jww) this integrity metadata should actually be 108 // TODO(jww) this integrity metadata should actually be
114 // normalized so that order doesn't matter. 109 // normalized so that order doesn't matter.
115 return m_integrityMetadata != request.integrityMetadata(); 110 return m_integrityMetadata != request.integrityMetadata();
116 } 111 }
117 112
118 } // namespace blink 113 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ScriptResource.h ('k') | third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698