Title: [93065] trunk/Source/WebKit/chromium
- Revision
- 93065
- Author
- aba...@webkit.org
- Date
- 2011-08-15 15:43:14 -0700 (Mon, 15 Aug 2011)
Log Message
Unreviewed, rolling out r93060.
http://trac.webkit.org/changeset/93060
https://bugs.webkit.org/show_bug.cgi?id=66259
Does not compile on Chromium Windows (Requested by
abarth|gardener on #webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2011-08-15
* public/WebCache.h:
* public/WebFontCache.h:
* src/WebCache.cpp:
(WebKit::WebCache::clear):
* src/WebFontCache.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (93064 => 93065)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-08-15 22:18:41 UTC (rev 93064)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-08-15 22:43:14 UTC (rev 93065)
@@ -1,3 +1,18 @@
+2011-08-15 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r93060.
+ http://trac.webkit.org/changeset/93060
+ https://bugs.webkit.org/show_bug.cgi?id=66259
+
+ Does not compile on Chromium Windows (Requested by
+ abarth|gardener on #webkit).
+
+ * public/WebCache.h:
+ * public/WebFontCache.h:
+ * src/WebCache.cpp:
+ (WebKit::WebCache::clear):
+ * src/WebFontCache.cpp:
+
2011-08-15 Mikhail Naganov <mnaga...@chromium.org>
Chromium: expose MemoryCache::prune and FontCache::purgeInactiveFontData.
Modified: trunk/Source/WebKit/chromium/public/WebCache.h (93064 => 93065)
--- trunk/Source/WebKit/chromium/public/WebCache.h 2011-08-15 22:18:41 UTC (rev 93064)
+++ trunk/Source/WebKit/chromium/public/WebCache.h 2011-08-15 22:43:14 UTC (rev 93065)
@@ -71,14 +71,9 @@
size_t capacity);
// Clears the cache (as much as possible; some resources may not be
- // cleared if they are actively referenced). Note that this method
- // only removes resources from live list, w/o releasing cache memory.
+ // cleared if they are actively referenced).
WEBKIT_EXPORT static void clear();
- // Prunes resource cache. Destroys decoded images data and returns
- // memory to the system.
- WEBKIT_EXPORT static void prune();
-
// Gets the usage statistics from the resource cache.
WEBKIT_EXPORT static void getUsageStats(UsageStats*);
Modified: trunk/Source/WebKit/chromium/public/WebFontCache.h (93064 => 93065)
--- trunk/Source/WebKit/chromium/public/WebFontCache.h 2011-08-15 22:18:41 UTC (rev 93064)
+++ trunk/Source/WebKit/chromium/public/WebFontCache.h 2011-08-15 22:43:14 UTC (rev 93065)
@@ -47,9 +47,6 @@
// Clears the cache.
WEBKIT_EXPORT static void clear();
- // Purges inactive font data.
- WEBKIT_EXPORT static void prune();
-
private:
WebFontCache(); // Not intended to be instanced.
};
Modified: trunk/Source/WebKit/chromium/src/WebCache.cpp (93064 => 93065)
--- trunk/Source/WebKit/chromium/src/WebCache.cpp 2011-08-15 22:18:41 UTC (rev 93064)
+++ trunk/Source/WebKit/chromium/src/WebCache.cpp 2011-08-15 22:43:14 UTC (rev 93065)
@@ -66,17 +66,12 @@
void WebCache::clear()
{
MemoryCache* cache = WebCore::memoryCache();
- if (cache)
- cache->evictResources();
+ if (cache && !cache->disabled()) {
+ cache->setDisabled(true);
+ cache->setDisabled(false);
+ }
}
-void WebCache::prune()
-{
- MemoryCache* cache = WebCore::memoryCache();
- if (cache)
- cache->prune();
-}
-
void WebCache::getUsageStats(UsageStats* result)
{
ASSERT(result);
Modified: trunk/Source/WebKit/chromium/src/WebFontCache.cpp (93064 => 93065)
--- trunk/Source/WebKit/chromium/src/WebFontCache.cpp 2011-08-15 22:18:41 UTC (rev 93064)
+++ trunk/Source/WebKit/chromium/src/WebFontCache.cpp 2011-08-15 22:43:14 UTC (rev 93065)
@@ -55,10 +55,4 @@
fontCache()->invalidate();
}
-// static
-void WebFontCache::prune()
-{
- fontCache()->purgeInactiveFontData();
-}
-
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
