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

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

Issue 2253853002: Remove SharedBuffer::unlock() and keep Resource's SharedBuffer always locked (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use hasClientsOrObservers() for live_size Created 4 years, 4 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 { 75 {
76 Resource::onMemoryDump(levelOfDetail, memoryDump); 76 Resource::onMemoryDump(levelOfDetail, memoryDump);
77 const String name = getMemoryDumpName() + "/decoded_script"; 77 const String name = getMemoryDumpName() + "/decoded_script";
78 auto dump = memoryDump->createMemoryAllocatorDump(name); 78 auto dump = memoryDump->createMemoryAllocatorDump(name);
79 dump->addScalar("size", "bytes", m_script.charactersSizeInBytes()); 79 dump->addScalar("size", "bytes", m_script.charactersSizeInBytes());
80 memoryDump->addSuballocation(dump->guid(), String(WTF::Partitions::kAllocate dObjectPoolName)); 80 memoryDump->addSuballocation(dump->guid(), String(WTF::Partitions::kAllocate dObjectPoolName));
81 } 81 }
82 82
83 const String& ScriptResource::script() 83 const String& ScriptResource::script()
84 { 84 {
85 ASSERT(!isPurgeable());
86 ASSERT(isLoaded()); 85 ASSERT(isLoaded());
87 86
88 if (m_script.isNull() && data()) { 87 if (m_script.isNull() && data()) {
89 String script = decodedText(); 88 String script = decodedText();
90 clearData(); 89 clearData();
91 // We lie a it here and claim that script counts as encoded data (even t hough it's really decoded data). 90 // We lie a it here and claim that script counts as encoded data (even t hough it's really decoded data).
92 // That's because the MemoryCache thinks that it can clear out decoded d ata by calling destroyDecodedData(), 91 // That's because the MemoryCache thinks that it can clear out decoded d ata by calling destroyDecodedData(),
93 // but we can't destroy script in destroyDecodedData because that's our only copy of the data! 92 // but we can't destroy script in destroyDecodedData because that's our only copy of the data!
94 setEncodedSize(script.charactersSizeInBytes()); 93 setEncodedSize(script.charactersSizeInBytes());
95 m_script = AtomicString(script); 94 m_script = AtomicString(script);
(...skipping 19 matching lines...) Expand all
115 } 114 }
116 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque st) const 115 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque st) const
117 { 116 {
118 if (request.integrityMetadata().isEmpty()) 117 if (request.integrityMetadata().isEmpty())
119 return false; 118 return false;
120 119
121 return !IntegrityMetadata::setsEqual(m_integrityMetadata, request.integrityM etadata()); 120 return !IntegrityMetadata::setsEqual(m_integrityMetadata, request.integrityM etadata());
122 } 121 }
123 122
124 } // namespace blink 123 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceTest.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698