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

Side by Side Diff: Source/core/loader/cache/CachedScript.cpp

Issue 13973026: remove memoryinstrumentation Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove the rest part of MemoryInstrumentation Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/cache/CachedScript.h ('k') | Source/core/loader/cache/CachedShader.h » ('j') | 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 16 matching lines...) Expand all
27 #include "config.h" 27 #include "config.h"
28 #include "CachedScript.h" 28 #include "CachedScript.h"
29 29
30 #include "CachedResourceClient.h" 30 #include "CachedResourceClient.h"
31 #include "CachedResourceClientWalker.h" 31 #include "CachedResourceClientWalker.h"
32 #include "HTTPParsers.h" 32 #include "HTTPParsers.h"
33 #include "MIMETypeRegistry.h" 33 #include "MIMETypeRegistry.h"
34 #include "MemoryCache.h" 34 #include "MemoryCache.h"
35 #include "SharedBuffer.h" 35 #include "SharedBuffer.h"
36 #include "TextResourceDecoder.h" 36 #include "TextResourceDecoder.h"
37 #include "WebCoreMemoryInstrumentation.h"
38 #include <wtf/Vector.h> 37 #include <wtf/Vector.h>
39 38
40 namespace WebCore { 39 namespace WebCore {
41 40
42 CachedScript::CachedScript(const ResourceRequest& resourceRequest, const String& charset) 41 CachedScript::CachedScript(const ResourceRequest& resourceRequest, const String& charset)
43 : CachedResource(resourceRequest, Script) 42 : CachedResource(resourceRequest, Script)
44 , m_decoder(TextResourceDecoder::create("application/javascript", charset)) 43 , m_decoder(TextResourceDecoder::create("application/javascript", charset))
45 { 44 {
46 // It's javascript we want. 45 // It's javascript we want.
47 // But some websites think their scripts are <some wrong mimetype here> 46 // But some websites think their scripts are <some wrong mimetype here>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 setDecodedSize(0); 87 setDecodedSize(0);
89 if (!MemoryCache::shouldMakeResourcePurgeableOnEviction() && isSafeToMakePur geable()) 88 if (!MemoryCache::shouldMakeResourcePurgeableOnEviction() && isSafeToMakePur geable())
90 makePurgeable(true); 89 makePurgeable(true);
91 } 90 }
92 91
93 bool CachedScript::mimeTypeAllowedByNosniff() const 92 bool CachedScript::mimeTypeAllowedByNosniff() const
94 { 93 {
95 return !parseContentTypeOptionsHeader(m_response.httpHeaderField("X-Content- Type-Options")) == ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJav aScriptMIMEType(mimeType()); 94 return !parseContentTypeOptionsHeader(m_response.httpHeaderField("X-Content- Type-Options")) == ContentTypeOptionsNosniff || MIMETypeRegistry::isSupportedJav aScriptMIMEType(mimeType());
96 } 95 }
97 96
98 void CachedScript::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
99 {
100 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResou rceScript);
101 CachedResource::reportMemoryUsage(memoryObjectInfo);
102 info.addMember(m_script, "script");
103 info.addMember(m_decoder, "decoder");
104 }
105
106 } // namespace WebCore 97 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/cache/CachedScript.h ('k') | Source/core/loader/cache/CachedShader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698