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

Side by Side Diff: third_party/WebKit/Source/core/fetch/MemoryCache.h

Issue 1566653002: Revert of Fix null dereference on MemoryCache. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 4 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
5 5
6 This library is free software; you can redistribute it and/or 6 This library is free software; you can redistribute it and/or
7 modify it under the terms of the GNU Library General Public 7 modify it under the terms of the GNU Library General Public
8 License as published by the Free Software Foundation; either 8 License as published by the Free Software Foundation; either
9 version 2 of the License, or (at your option) any later version. 9 version 2 of the License, or (at your option) any later version.
10 10
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 void willProcessTask() override; 229 void willProcessTask() override;
230 void didProcessTask() override; 230 void didProcessTask() override;
231 231
232 void pruneAll(); 232 void pruneAll();
233 233
234 void updateFramePaintTimestamp(); 234 void updateFramePaintTimestamp();
235 235
236 // Take memory usage snapshot for tracing. 236 // Take memory usage snapshot for tracing.
237 void onMemoryDump(WebMemoryDumpLevelOfDetail, WebProcessMemoryDump*); 237 void onMemoryDump(WebMemoryDumpLevelOfDetail, WebProcessMemoryDump*);
238 238
239 bool isInSameLRUListForTest(const Resource*, const Resource*);
240 private: 239 private:
241 enum PruneStrategy { 240 enum PruneStrategy {
242 // Automatically decide how much to prune. 241 // Automatically decide how much to prune.
243 AutomaticPrune, 242 AutomaticPrune,
244 // Maximally prune resources. 243 // Maximally prune resources.
245 MaximalPrune 244 MaximalPrune
246 }; 245 };
247 246
248 MemoryCache(); 247 MemoryCache();
249 248
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 // Returns the global cache. 328 // Returns the global cache.
330 CORE_EXPORT MemoryCache* memoryCache(); 329 CORE_EXPORT MemoryCache* memoryCache();
331 330
332 // Sets the global cache, used to swap in a test instance. Returns the old 331 // Sets the global cache, used to swap in a test instance. Returns the old
333 // MemoryCache object. 332 // MemoryCache object.
334 CORE_EXPORT MemoryCache* replaceMemoryCacheForTesting(MemoryCache*); 333 CORE_EXPORT MemoryCache* replaceMemoryCacheForTesting(MemoryCache*);
335 334
336 } 335 }
337 336
338 #endif 337 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fetch/CSSStyleSheetResource.cpp ('k') | third_party/WebKit/Source/core/fetch/MemoryCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698