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

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

Issue 2218013002: Ensure setEncodedSizeMemoryUsage() is called when |m_data| is cleared (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove setEncodedSizeMemoryUsage() Created 4 years, 1 month 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
« no previous file with comments | « third_party/WebKit/Source/core/fetch/Resource.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 memoryDump->addSuballocation( 82 memoryDump->addSuballocation(
83 dump->guid(), String(WTF::Partitions::kAllocatedObjectPoolName)); 83 dump->guid(), String(WTF::Partitions::kAllocatedObjectPoolName));
84 } 84 }
85 85
86 const String& ScriptResource::script() { 86 const String& ScriptResource::script() {
87 DCHECK(isLoaded()); 87 DCHECK(isLoaded());
88 88
89 if (m_script.isNull() && data()) { 89 if (m_script.isNull() && data()) {
90 String script = decodedText(); 90 String script = decodedText();
91 clearData(); 91 clearData();
92 setEncodedSizeMemoryUsage(0);
93 setDecodedSize(script.charactersSizeInBytes()); 92 setDecodedSize(script.charactersSizeInBytes());
94 m_script = AtomicString(script); 93 m_script = AtomicString(script);
95 } 94 }
96 95
97 return m_script; 96 return m_script;
98 } 97 }
99 98
100 void ScriptResource::destroyDecodedDataForFailedRevalidation() { 99 void ScriptResource::destroyDecodedDataForFailedRevalidation() {
101 m_script = AtomicString(); 100 m_script = AtomicString();
102 } 101 }
103 102
104 bool ScriptResource::mimeTypeAllowedByNosniff() const { 103 bool ScriptResource::mimeTypeAllowedByNosniff() const {
105 return parseContentTypeOptionsHeader(response().httpHeaderField( 104 return parseContentTypeOptionsHeader(response().httpHeaderField(
106 HTTPNames::X_Content_Type_Options)) != ContentTypeOptionsNosniff || 105 HTTPNames::X_Content_Type_Options)) != ContentTypeOptionsNosniff ||
107 MIMETypeRegistry::isSupportedJavaScriptMIMEType(httpContentType()); 106 MIMETypeRegistry::isSupportedJavaScriptMIMEType(httpContentType());
108 } 107 }
109 108
110 } // namespace blink 109 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/Resource.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698