Skip to content

GitLab

T
tangled
Commit 022d502a authored by hiroshige's avatar hiroshige Committed by Commit bot
Browse files
Options

Remove purgedSize and purgeableSize from TypeStatistic and ResourceTypeStat 

They are unused after https://codereview.chromium.org/2253853002/ and thus this
CL removes them from MemoryCache::TypeStatistic and WebCache::ResourceTypeStat.

This CL also fixes compile errors when MEMORY_CACHE_STATS is enabled.

BUG=603791

Review-Url: https://codereview.chromium.org/2254593003
Cr-Commit-Position: refs/heads/master@{#415602}
parent 4985ab59
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 23 deletions
third_party/WebKit/Source/core/fetch/MemoryCache.cpp
View file @ 022d502a
......@@ -751,23 +751,23 @@ bool MemoryCache::isInSameLRUListForTest(const Resource* x, const Resource* y)
void MemoryCache::dumpStats(TimerBase*)
{
Statistics s = getStatistics();
printf("%-13s %-13s %-13s %-13s %-13s %-13s %-13s\n", "", "Count", "Size", "LiveSize", "DecodedSize", "PurgeableSize", "PurgedSize");
printf("%-13s %-13s %-13s %-13s %-13s %-13s %-13s\n", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------");
printf("%-13s %13d %13d %13d %13d %13d %13d\n", "Images", s.images.count, s.images.size, s.images.liveSize, s.images.decodedSize, s.images.purgeableSize, s.images.purgedSize);
printf("%-13s %13d %13d %13d %13d %13d %13d\n", "CSS", s.cssStyleSheets.count, s.cssStyleSheets.size, s.cssStyleSheets.liveSize, s.cssStyleSheets.decodedSize, s.cssStyleSheets.purgeableSize, s.cssStyleSheets.purgedSize);
printf("%-13s %13d %13d %13d %13d %13d %13d\n", "XSL", s.xslStyleSheets.count, s.xslStyleSheets.size, s.xslStyleSheets.liveSize, s.xslStyleSheets.decodedSize, s.xslStyleSheets.purgeableSize, s.xslStyleSheets.purgedSize);
printf("%-13s %13d %13d %13d %13d %13d %13d\n", "JavaScript", s.scripts.count, s.scripts.size, s.scripts.liveSize, s.scripts.decodedSize, s.scripts.purgeableSize, s.scripts.purgedSize);
printf("%-13s %13d %13d %13d %13d %13d %13d\n", "Fonts", s.fonts.count, s.fonts.size, s.fonts.liveSize, s.fonts.decodedSize, s.fonts.purgeableSize, s.fonts.purgedSize);
printf("%-13s %13d %13d %13d %13d %13d %13d\n", "Other", s.other.count, s.other.size, s.other.liveSize, s.other.decodedSize, s.other.purgeableSize, s.other.purgedSize);
printf("%-13s %-13s %-13s %-13s %-13s %-13s %-13s\n\n", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------");
printf("%-13s %-13s %-13s %-13s %-13s\n", "", "Count", "Size", "LiveSize", "DecodedSize");
printf("%-13s %-13s %-13s %-13s %-13s\n", "-------------", "-------------", "-------------", "-------------", "-------------");
printf("%-13s %13zu %13zu %13zu %13zu\n", "Images", s.images.count, s.images.size, s.images.liveSize, s.images.decodedSize);
printf("%-13s %13zu %13zu %13zu %13zu\n", "CSS", s.cssStyleSheets.count, s.cssStyleSheets.size, s.cssStyleSheets.liveSize, s.cssStyleSheets.decodedSize);
printf("%-13s %13zu %13zu %13zu %13zu\n", "XSL", s.xslStyleSheets.count, s.xslStyleSheets.size, s.xslStyleSheets.liveSize, s.xslStyleSheets.decodedSize);
printf("%-13s %13zu %13zu %13zu %13zu\n", "JavaScript", s.scripts.count, s.scripts.size, s.scripts.liveSize, s.scripts.decodedSize);
printf("%-13s %13zu %13zu %13zu %13zu\n", "Fonts", s.fonts.count, s.fonts.size, s.fonts.liveSize, s.fonts.decodedSize);
printf("%-13s %13zu %13zu %13zu %13zu\n", "Other", s.other.count, s.other.size, s.other.liveSize, s.other.decodedSize);
printf("%-13s %-13s %-13s %-13s %-13s\n\n", "-------------", "-------------", "-------------", "-------------", "-------------");
printf("Duplication of encoded data from data URLs\n");
printf("%-13s %13d of %13d\n", "Images", s.images.encodedSizeDuplicatedInDataURLs, s.images.encodedSize);
printf("%-13s %13d of %13d\n", "CSS", s.cssStyleSheets.encodedSizeDuplicatedInDataURLs, s.cssStyleSheets.encodedSize);
printf("%-13s %13d of %13d\n", "XSL", s.xslStyleSheets.encodedSizeDuplicatedInDataURLs, s.xslStyleSheets.encodedSize);
printf("%-13s %13d of %13d\n", "JavaScript", s.scripts.encodedSizeDuplicatedInDataURLs, s.scripts.encodedSize);
printf("%-13s %13d of %13d\n", "Fonts", s.fonts.encodedSizeDuplicatedInDataURLs, s.fonts.encodedSize);
printf("%-13s %13d of %13d\n", "Other", s.other.encodedSizeDuplicatedInDataURLs, s.other.encodedSize);
printf("%-13s %13zu of %13zu\n", "Images", s.images.encodedSizeDuplicatedInDataURLs, s.images.encodedSize);
printf("%-13s %13zu of %13zu\n", "CSS", s.cssStyleSheets.encodedSizeDuplicatedInDataURLs, s.cssStyleSheets.encodedSize);
printf("%-13s %13zu of %13zu\n", "XSL", s.xslStyleSheets.encodedSizeDuplicatedInDataURLs, s.xslStyleSheets.encodedSize);
printf("%-13s %13zu of %13zu\n", "JavaScript", s.scripts.encodedSizeDuplicatedInDataURLs, s.scripts.encodedSize);
printf("%-13s %13zu of %13zu\n", "Fonts", s.fonts.encodedSizeDuplicatedInDataURLs, s.fonts.encodedSize);
printf("%-13s %13zu of %13zu\n", "Other", s.other.encodedSizeDuplicatedInDataURLs, s.other.encodedSize);
}
void MemoryCache::dumpLRULists(bool includeLive) const
......
third_party/WebKit/Source/core/fetch/MemoryCache.h
View file @ 022d502a
......@@ -139,8 +139,6 @@ public:
size_t decodedSize;
size_t encodedSize;
size_t encodedSizeDuplicatedInDataURLs;
size_t purgeableSize;
size_t purgedSize;
TypeStatistic()
: count(0)
......@@ -149,8 +147,6 @@ public:
, decodedSize(0)
, encodedSize(0)
, encodedSizeDuplicatedInDataURLs(0)
, purgeableSize(0)
, purgedSize(0)
{
}
......
third_party/WebKit/Source/web/WebCache.cpp
View file @ 022d502a
......@@ -43,8 +43,6 @@ static void ToResourceTypeStat(const MemoryCache::TypeStatistic& from,
to.size = from.size;
to.liveSize = from.liveSize;
to.decodedSize = from.decodedSize;
to.purgeableSize = from.purgeableSize;
to.purgedSize = from.purgedSize;
}
void WebCache::setCapacities(
......
third_party/WebKit/public/web/WebCache.h
View file @ 022d502a
......@@ -54,8 +54,6 @@ public:
size_t size;
size_t liveSize;
size_t decodedSize;
size_t purgedSize;
size_t purgeableSize;
};
// A struct mirroring blink::MemoryCache::Statistics.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment