OLD | NEW |
---|---|
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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
79 // That's because the MemoryCache thinks that it can clear out decoded d ata by calling destroyDecodedData(), | 79 // That's because the MemoryCache thinks that it can clear out decoded d ata by calling destroyDecodedData(), |
80 // but we can't destroy m_script in destroyDecodedData because that's ou r only copy of the data! | 80 // but we can't destroy m_script in destroyDecodedData because that's ou r only copy of the data! |
81 setEncodedSize(m_script.sizeInBytes()); | 81 setEncodedSize(m_script.sizeInBytes()); |
82 } | 82 } |
83 | 83 |
84 return m_script; | 84 return m_script; |
85 } | 85 } |
86 | 86 |
87 bool CachedScript::mimeTypeAllowedByNosniff() const | 87 bool CachedScript::mimeTypeAllowedByNosniff() const |
88 { | 88 { |
89 return !parseContentTypeOptionsHeader(m_response.httpHeaderField("X-Content- Type-Options")) == ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJav aScriptMIMEType(mimeType()); | 89 return !(parseContentTypeOptionsHeader(m_response.httpHeaderField("X-Content -Type-Options")) == ContentTypeOptionsNosniff) || MIMETypeRegistry::isSupportedJ avaScriptMIMEType(mimeType()); |
jochen (gone - plz use gerrit)
2013/07/05 07:43:12
why not just != ?
| |
90 } | 90 } |
91 | 91 |
92 void CachedScript::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const | 92 void CachedScript::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const |
93 { | 93 { |
94 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResou rceScript); | 94 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResou rceScript); |
95 CachedResource::reportMemoryUsage(memoryObjectInfo); | 95 CachedResource::reportMemoryUsage(memoryObjectInfo); |
96 info.addMember(m_script, "script"); | 96 info.addMember(m_script, "script"); |
97 info.addMember(m_decoder, "decoder"); | 97 info.addMember(m_decoder, "decoder"); |
98 } | 98 } |
99 | 99 |
100 } // namespace WebCore | 100 } // namespace WebCore |
OLD | NEW |