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

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

Issue 1576423005: Revert of Fix null dereference on MemoryCache. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2564
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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 void willProcessTask() override; 230 void willProcessTask() override;
231 void didProcessTask() override; 231 void didProcessTask() override;
232 232
233 void pruneAll(); 233 void pruneAll();
234 234
235 void updateFramePaintTimestamp(); 235 void updateFramePaintTimestamp();
236 236
237 // Take memory usage snapshot for tracing. 237 // Take memory usage snapshot for tracing.
238 void onMemoryDump(WebMemoryDumpLevelOfDetail, WebProcessMemoryDump*); 238 void onMemoryDump(WebMemoryDumpLevelOfDetail, WebProcessMemoryDump*);
239 239
240 bool isInSameLRUListForTest(const Resource*, const Resource*);
241 private: 240 private:
242 enum PruneStrategy { 241 enum PruneStrategy {
243 // Automatically decide how much to prune. 242 // Automatically decide how much to prune.
244 AutomaticPrune, 243 AutomaticPrune,
245 // Maximally prune resources. 244 // Maximally prune resources.
246 MaximalPrune 245 MaximalPrune
247 }; 246 };
248 247
249 MemoryCache(); 248 MemoryCache();
250 249
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 // Returns the global cache. 329 // Returns the global cache.
331 CORE_EXPORT MemoryCache* memoryCache(); 330 CORE_EXPORT MemoryCache* memoryCache();
332 331
333 // Sets the global cache, used to swap in a test instance. Returns the old 332 // Sets the global cache, used to swap in a test instance. Returns the old
334 // MemoryCache object. 333 // MemoryCache object.
335 CORE_EXPORT MemoryCache* replaceMemoryCacheForTesting(MemoryCache*); 334 CORE_EXPORT MemoryCache* replaceMemoryCacheForTesting(MemoryCache*);
336 335
337 } 336 }
338 337
339 #endif 338 #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