Chromium Code Reviews| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 77 // We lie a it here and claim that script counts as encoded data (even t hough it's really decoded data). | 77 // We lie a it here and claim that script counts as encoded data (even t hough it's really decoded data). |
| 78 // That's because the MemoryCache thinks that it can clear out decoded d ata by calling destroyDecodedData(), | 78 // That's because the MemoryCache thinks that it can clear out decoded d ata by calling destroyDecodedData(), |
| 79 // but we can't destroy script in destroyDecodedData because that's our only copy of the data! | 79 // but we can't destroy script in destroyDecodedData because that's our only copy of the data! |
| 80 setEncodedSize(script.sizeInBytes()); | 80 setEncodedSize(script.sizeInBytes()); |
| 81 m_script = script; | 81 m_script = script; |
| 82 } | 82 } |
| 83 | 83 |
| 84 return m_script.string(); | 84 return m_script.string(); |
| 85 } | 85 } |
| 86 | 86 |
| 87 const KURL& ScriptResource::scriptURL() | |
| 88 { | |
| 89 if (!response().url().isEmpty() && m_url.isEmpty()) { | |
| 90 m_url = response().url(); | |
| 91 m_url.removeFragmentIdentifier(); | |
| 92 } | |
| 93 return m_url; | |
|
abarth-chromium
2013/10/17 01:06:55
Why do we need to store this data? Is it really t
johnjbarton
2013/10/17 02:30:11
I believe we need to store this data so the const
abarth-chromium
2013/10/17 02:39:05
We can return a KURL rather than a const KURL&
| |
| 94 } | |
| 95 | |
| 87 bool ScriptResource::mimeTypeAllowedByNosniff() const | 96 bool ScriptResource::mimeTypeAllowedByNosniff() const |
| 88 { | 97 { |
| 89 return parseContentTypeOptionsHeader(m_response.httpHeaderField("X-Content-T ype-Options")) != ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJava ScriptMIMEType(mimeType()); | 98 return parseContentTypeOptionsHeader(m_response.httpHeaderField("X-Content-T ype-Options")) != ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJava ScriptMIMEType(mimeType()); |
| 90 } | 99 } |
| 91 | 100 |
| 92 } // namespace WebCore | 101 } // namespace WebCore |
| OLD | NEW |