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

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

Issue 123003002: Make calls to AtomicString(const String&) explicit in loader/ and fetch/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 ASSERT(isLoaded()); 71 ASSERT(isLoaded());
72 72
73 if (!m_script && m_data) { 73 if (!m_script && m_data) {
74 String script = m_decoder->decode(m_data->data(), encodedSize()); 74 String script = m_decoder->decode(m_data->data(), encodedSize());
75 script.append(m_decoder->flush()); 75 script.append(m_decoder->flush());
76 m_data.clear(); 76 m_data.clear();
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 = AtomicString(script);
82 } 82 }
83 83
84 return m_script.string(); 84 return m_script.string();
85 } 85 }
86 86
87 bool ScriptResource::mimeTypeAllowedByNosniff() const 87 bool ScriptResource::mimeTypeAllowedByNosniff() const
88 { 88 {
89 return parseContentTypeOptionsHeader(m_response.httpHeaderField("X-Content-T ype-Options")) != ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJava ScriptMIMEType(mimeType()); 89 return parseContentTypeOptionsHeader(m_response.httpHeaderField("X-Content-T ype-Options")) != ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJava ScriptMIMEType(mimeType());
90 } 90 }
91 91
92 } // namespace WebCore 92 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/fetch/ImageResourceTest.cpp ('k') | Source/core/loader/DocumentThreadableLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698