Modified: branches/safari-534.52-branch/Source/WebCore/ChangeLog (98130 => 98131)
--- branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 19:56:23 UTC (rev 98130)
+++ branches/safari-534.52-branch/Source/WebCore/ChangeLog 2011-10-21 19:58:51 UTC (rev 98131)
@@ -1,3 +1,19 @@
+2011-10-21 Lucas Forschler <lforsch...@apple.com>
+
+ Merge 94371
+
+ 2011-09-01 Ada Chan <adac...@apple.com>
+
+ Cleanup refactoring for https://bugs.webkit.org/show_bug.cgi?id=67160
+
+ Don't ifdef out the data member xslStyleSheets in MemoryCache::Statistics to cut down
+ the ifdefs in getWebCoreMemoryCacheStatistics() in WebKit2/WebProcess/WebProcess.cpp.
+
+ Reviewed by Darin Adler.
+
+ No new tests required. Just small code refactoring.
+
+ * loader/cache/MemoryCache.h:
2011-09-26 Mark Rowe <mr...@apple.com>
Merge r95863.
Modified: branches/safari-534.52-branch/Source/WebCore/loader/cache/MemoryCache.h (98130 => 98131)
--- branches/safari-534.52-branch/Source/WebCore/loader/cache/MemoryCache.h 2011-10-21 19:56:23 UTC (rev 98130)
+++ branches/safari-534.52-branch/Source/WebCore/loader/cache/MemoryCache.h 2011-10-21 19:58:51 UTC (rev 98131)
@@ -99,9 +99,7 @@
TypeStatistic images;
TypeStatistic cssStyleSheets;
TypeStatistic scripts;
-#if ENABLE(XSLT)
TypeStatistic xslStyleSheets;
-#endif
TypeStatistic fonts;
};
Modified: branches/safari-534.52-branch/Source/WebKit2/ChangeLog (98130 => 98131)
--- branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 19:56:23 UTC (rev 98130)
+++ branches/safari-534.52-branch/Source/WebKit2/ChangeLog 2011-10-21 19:58:51 UTC (rev 98131)
@@ -1,5 +1,18 @@
2011-10-21 Lucas Forschler <lforsch...@apple.com>
+ Merge 94371
+
+ 2011-09-01 Ada Chan <adac...@apple.com>
+
+ Cut down the ifdefs in WebKit::getWebCoreMemoryCacheStatistics() now that
+ MemoryCache::Statistics always has the xslStyleSheets field.
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::getWebCoreMemoryCacheStatistics):
+2011-10-21 Lucas Forschler <lforsch...@apple.com>
+
Merge 94340
2011-09-01 Ada Chan <adac...@apple.com>
Modified: branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp (98130 => 98131)
--- branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2011-10-21 19:56:23 UTC (rev 98130)
+++ branches/safari-534.52-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2011-10-21 19:58:51 UTC (rev 98131)
@@ -839,66 +839,42 @@
HashMap<String, uint64_t> counts;
counts.set(imagesString, memoryCacheStatistics.images.count);
counts.set(cssString, memoryCacheStatistics.cssStyleSheets.count);
-#if ENABLE(XSLT)
counts.set(xslString, memoryCacheStatistics.xslStyleSheets.count);
-#else
- counts.set(xslString, 0);
-#endif
counts.set(_javascript_String, memoryCacheStatistics.scripts.count);
result.append(counts);
HashMap<String, uint64_t> sizes;
sizes.set(imagesString, memoryCacheStatistics.images.size);
sizes.set(cssString, memoryCacheStatistics.cssStyleSheets.size);
-#if ENABLE(XSLT)
sizes.set(xslString, memoryCacheStatistics.xslStyleSheets.size);
-#else
- sizes.set(xslString, 0);
-#endif
sizes.set(_javascript_String, memoryCacheStatistics.scripts.size);
result.append(sizes);
HashMap<String, uint64_t> liveSizes;
liveSizes.set(imagesString, memoryCacheStatistics.images.liveSize);
liveSizes.set(cssString, memoryCacheStatistics.cssStyleSheets.liveSize);
-#if ENABLE(XSLT)
liveSizes.set(xslString, memoryCacheStatistics.xslStyleSheets.liveSize);
-#else
- liveSizes.set(xslString, 0);
-#endif
liveSizes.set(_javascript_String, memoryCacheStatistics.scripts.liveSize);
result.append(liveSizes);
HashMap<String, uint64_t> decodedSizes;
decodedSizes.set(imagesString, memoryCacheStatistics.images.decodedSize);
decodedSizes.set(cssString, memoryCacheStatistics.cssStyleSheets.decodedSize);
-#if ENABLE(XSLT)
decodedSizes.set(xslString, memoryCacheStatistics.xslStyleSheets.decodedSize);
-#else
- decodedSizes.set(xslString, 0);
-#endif
decodedSizes.set(_javascript_String, memoryCacheStatistics.scripts.decodedSize);
result.append(decodedSizes);
HashMap<String, uint64_t> purgeableSizes;
purgeableSizes.set(imagesString, memoryCacheStatistics.images.purgeableSize);
purgeableSizes.set(cssString, memoryCacheStatistics.cssStyleSheets.purgeableSize);
-#if ENABLE(XSLT)
purgeableSizes.set(xslString, memoryCacheStatistics.xslStyleSheets.purgeableSize);
-#else
- purgeableSizes.set(xslString, 0);
-#endif
purgeableSizes.set(_javascript_String, memoryCacheStatistics.scripts.purgeableSize);
result.append(purgeableSizes);
HashMap<String, uint64_t> purgedSizes;
purgedSizes.set(imagesString, memoryCacheStatistics.images.purgedSize);
purgedSizes.set(cssString, memoryCacheStatistics.cssStyleSheets.purgedSize);
-#if ENABLE(XSLT)
purgedSizes.set(xslString, memoryCacheStatistics.xslStyleSheets.purgedSize);
-#else
- purgedSizes.set(xslString, 0);
-#endif
purgedSizes.set(_javascript_String, memoryCacheStatistics.scripts.purgedSize);
result.append(purgedSizes);
}
