Title: [111105] trunk/Source/WebCore
- Revision
- 111105
- Author
- le...@chromium.org
- Date
- 2012-03-16 19:01:26 -0700 (Fri, 16 Mar 2012)
Log Message
Fix for test runs for non-chromium platforms.
* loader/cache/MemoryCache.cpp:
(WebCore::memoryCache):
(WebCore::MemoryCache::add):
(WebCore::MemoryCache::revalidationFailed):
(WebCore::MemoryCache::resourceForURL):
(WebCore::MemoryCache::evict):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (111104 => 111105)
--- trunk/Source/WebCore/ChangeLog 2012-03-17 01:55:12 UTC (rev 111104)
+++ trunk/Source/WebCore/ChangeLog 2012-03-17 02:01:26 UTC (rev 111105)
@@ -1,3 +1,14 @@
+2012-03-16 David Levin <le...@chromium.org>
+
+ Fix for test runs for non-chromium platforms.
+
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::memoryCache):
+ (WebCore::MemoryCache::add):
+ (WebCore::MemoryCache::revalidationFailed):
+ (WebCore::MemoryCache::resourceForURL):
+ (WebCore::MemoryCache::evict):
+
2012-03-16 Tony Chang <t...@chromium.org>
Unreviewed, rolling out r111094.
Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (111104 => 111105)
--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2012-03-17 01:55:12 UTC (rev 111104)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2012-03-17 02:01:26 UTC (rev 111105)
@@ -58,7 +58,9 @@
MemoryCache* memoryCache()
{
static MemoryCache* staticCache = new MemoryCache;
+#if PLATFORM(CHROMIUM)
ASSERT(WTF::isMainThread());
+#endif
return staticCache;
}
@@ -93,7 +95,9 @@
{
if (disabled())
return false;
+#if PLATFORM(CHROMIUM)
ASSERT(WTF::isMainThread());
+#endif
m_resources.set(resource->url(), resource);
resource->setInCache(true);
@@ -138,7 +142,9 @@
void MemoryCache::revalidationFailed(CachedResource* revalidatingResource)
{
+#if PLATFORM(CHROMIUM)
ASSERT(WTF::isMainThread());
+#endif
LOG(ResourceLoading, "Revalidation failed for %p", revalidatingResource);
ASSERT(revalidatingResource->resourceToRevalidate());
revalidatingResource->clearResourceToRevalidate();
@@ -146,7 +152,9 @@
CachedResource* MemoryCache::resourceForURL(const KURL& resourceURL)
{
+#if PLATFORM(CHROMIUM)
ASSERT(WTF::isMainThread());
+#endif
KURL url = ""
CachedResource* resource = m_resources.get(url);
bool wasPurgeable = MemoryCache::shouldMakeResourcePurgeableOnEviction() && resource && resource->isPurgeable();
@@ -377,7 +385,9 @@
void MemoryCache::evict(CachedResource* resource)
{
+#if PLATFORM(CHROMIUM)
ASSERT(WTF::isMainThread());
+#endif
LOG(ResourceLoading, "Evicting resource %p for '%s' from cache", resource, resource->url().string().latin1().data());
// The resource may have already been removed by someone other than our caller,
// who needed a fresh copy for a reload. See <http://bugs.webkit.org/show_bug.cgi?id=12479#c6>.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
