Title: [110114] trunk/Source
- Revision
- 110114
- Author
- aba...@webkit.org
- Date
- 2012-03-07 15:13:27 -0800 (Wed, 07 Mar 2012)
Log Message
Remove #define private public from WebCache.cpp
https://bugs.webkit.org/show_bug.cgi?id=80520
Reviewed by Eric Seidel.
Source/WebCore:
Add some accessors for state used by WebCache.cpp.
* loader/cache/MemoryCache.h:
(WebCore::MemoryCache::minDeadCapacity):
(WebCore::MemoryCache::maxDeadCapacity):
(WebCore::MemoryCache::capacity):
(WebCore::MemoryCache::liveSize):
(WebCore::MemoryCache::deadSize):
(MemoryCache):
Source/WebKit/chromium:
This patch removes a hack we added long ago when Chromium used a forked
copy of WebKit and editing WebCore caused merge pain. Now that we're
on trunk, we can unwind this hack.
* src/WebCache.cpp:
(WebKit::WebCache::getUsageStats):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110113 => 110114)
--- trunk/Source/WebCore/ChangeLog 2012-03-07 23:01:49 UTC (rev 110113)
+++ trunk/Source/WebCore/ChangeLog 2012-03-07 23:13:27 UTC (rev 110114)
@@ -1,3 +1,20 @@
+2012-03-07 Adam Barth <aba...@webkit.org>
+
+ Remove #define private public from WebCache.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=80520
+
+ Reviewed by Eric Seidel.
+
+ Add some accessors for state used by WebCache.cpp.
+
+ * loader/cache/MemoryCache.h:
+ (WebCore::MemoryCache::minDeadCapacity):
+ (WebCore::MemoryCache::maxDeadCapacity):
+ (WebCore::MemoryCache::capacity):
+ (WebCore::MemoryCache::liveSize):
+ (WebCore::MemoryCache::deadSize):
+ (MemoryCache):
+
2012-03-07 Kentaro Hara <hara...@chromium.org>
[V8][Performance] Optimize Element.firstElementChild, Element.lastElementChild,
Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (110113 => 110114)
--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2012-03-07 23:01:49 UTC (rev 110113)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2012-03-07 23:13:27 UTC (rev 110114)
@@ -162,6 +162,12 @@
void removeResourcesWithOrigin(SecurityOrigin*);
void getOriginsWithCache(SecurityOriginSet& origins);
+ unsigned minDeadCapacity() const { return m_minDeadCapacity; }
+ unsigned maxDeadCapacity() const { return m_maxDeadCapacity; }
+ unsigned capacity() const { return m_capacity; }
+ unsigned liveSize() const { return m_liveSize; }
+ unsigned deadSize() const { return m_deadSize; }
+
private:
MemoryCache();
~MemoryCache(); // Not implemented to make sure nobody accidentally calls delete -- WebCore does not delete singletons.
Modified: trunk/Source/WebKit/chromium/ChangeLog (110113 => 110114)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-07 23:01:49 UTC (rev 110113)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-07 23:13:27 UTC (rev 110114)
@@ -1,3 +1,17 @@
+2012-03-07 Adam Barth <aba...@webkit.org>
+
+ Remove #define private public from WebCache.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=80520
+
+ Reviewed by Eric Seidel.
+
+ This patch removes a hack we added long ago when Chromium used a forked
+ copy of WebKit and editing WebCore caused merge pain. Now that we're
+ on trunk, we can unwind this hack.
+
+ * src/WebCache.cpp:
+ (WebKit::WebCache::getUsageStats):
+
2012-03-07 Joshua Bell <jsb...@chromium.org>
[Chromium] IndexedDB: V8LocalContext creation in IDBKey extraction/injection is slow
Modified: trunk/Source/WebKit/chromium/src/WebCache.cpp (110113 => 110114)
--- trunk/Source/WebKit/chromium/src/WebCache.cpp 2012-03-07 23:01:49 UTC (rev 110113)
+++ trunk/Source/WebKit/chromium/src/WebCache.cpp 2012-03-07 23:13:27 UTC (rev 110114)
@@ -31,14 +31,9 @@
#include "config.h"
#include "WebCache.h"
-// Instead of providing accessors, we make all members of MemoryCache public.
-// This will make it easier to track WebCore changes to the MemoryCache class.
-// FIXME: We should introduce public getters on the MemoryCache class.
-#define private public
#include "MemoryCache.h"
-#undef private
-using namespace WebCore;
+using WebCore::MemoryCache;
namespace WebKit {
@@ -83,11 +78,11 @@
MemoryCache* cache = WebCore::memoryCache();
if (cache) {
- result->minDeadCapacity = cache->m_minDeadCapacity;
- result->maxDeadCapacity = cache->m_maxDeadCapacity;
- result->capacity = cache->m_capacity;
- result->liveSize = cache->m_liveSize;
- result->deadSize = cache->m_deadSize;
+ result->minDeadCapacity = cache->minDeadCapacity();
+ result->maxDeadCapacity = cache->maxDeadCapacity();
+ result->capacity = cache->capacity();
+ result->liveSize = cache->liveSize();
+ result->deadSize = cache->deadSize();
} else
memset(result, 0, sizeof(UsageStats));
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
